diff options
95 files changed, 1966 insertions, 190 deletions
@@ -1,3 +1,31 @@ +2017.11, Released November 30, 2017 + + Fixes all over the tree. + + Toolchain: Use github mirror for Glibc. + + Defconfigs: Correct boot.cmd for bananapi-m1. + + Makefiles: Workaround include order issues for certain make + versions by explicitly sorting the result of wildcard where it + matters. + + Download: Ensure subversion runs in non-interactive mode. + + Updated/fixed packages: asterisk, boost, chrony, dovecot, + dvb-apps, exim, feh, freerdp, fwup, google-breakpad, jose, + kvm-unit-test, lftp, libcurl, libevent, libfastjson, libpjsip, + libupnp, linphone, localedef, lttng-tools, mp4v2, mtools, + ndisc6, oracle-mysql, parted, pdbg, qt, qt5connectivity, + qt5declarative, qt5webkit, rauc, runc, samba4, shairport-sync, + systemd-bootchart, webkitgtk, wireguard, xlib_libXcursor, + xlib_libXfont, xlib_libXfont2, + + Issues resolved (http://bugs.buildroot.org): + + 10501: host-localedef fails to compile on Ubuntu 17.10 + 10506: Changed kernel image type (e.g. zImage to uImage)... + 2017.11-rc2, Released November 13th, 2017 Fixes all over the tree. @@ -68,6 +96,41 @@ #10426: uboot-tools' fw_setenv does not update the redundant... #10451: libpcap 1.8.x and 1.7x does not compile on PPC +2017.08.2, Released November 28th, 2017 + + Important / security related fixes. + + Qt: 5.6 version updated to 5.6.3. + + Reproducible: Do not override SOURCE_DATE_EPOCH if already set + in the environment. + + Makefiles: Workaround include order issues for certain make + versions by explicitly sorting the result of wildcard where it + matters. + + Updated/fixed packages: apr, apr-util, arqp-standalone, + azure-iot-sdk-c, collectd, dvb-apps, ffmpeg, go-bootstrap, + google-breakpad, gstreamer, imagemagick, irssi, jimtcl, + kvm-unit-test, libcurl, libfastjson, libglib2, libidn, + libpjsip, libplist, localedef, lttng-tools, luajit, mesa3d, + moarvm, mp4v2, openssh, openssl, oracle-mysql, postgresql, + python3, python-pyqt5, qt, qt5base, qt5canvas3d, + qt5connectivity, qt5declarative, qt5engineio, + qt5graphicaleffects, qt5imageformats, qt5location, + qt5multimedia, qt5quickcontrols, qt5quickcontrols2, qt5script, + qt5sensors, qt5serialbus, qt5serialport, qt5svg, qt5tools, + qt5webchannel, qt5webkit, qt5websockets, qt5x11extras, + qt5xmlpatterns, quagga, redis, ruby, samba4, sdl2, snmppp, + swupdate, ti-gfx, uboot-tools, usb_modeswitch, vboot-utils, + webkitgtk, wget, wireshark, xapp_xdriinfo. + + Issues resolved (http://bugs.buildroot.org): + + 10326: mesa3d package fails to build when BR2_SHARED_STATIC_LIBS=y + 10361: python3 python-config script generates invalid includes + 10501: host-localedef fails to compile on Ubuntu 17.10 + 2017.08.1, Released October 23rd, 2017 Important / security related fixes. @@ -597,6 +660,34 @@ #9846: musl libc not installed correctly in target folder #9856: build libubox failed on ubuntu 17.04 64bit +2017.02.8, Released November 27th, 2017 + + Important / security related fixes. + + Qt: 5.6 version updated to 5.6.3. + + Reproducible: Do not override SOURCE_DATE_EPOCH if already set + in the environment. + + Updated/fixed packages: apr, apr-util, arqp-standalone, + collectd, dvb-apps, ffmpeg, google-breakpad, gstreamer, + imagemagick, libfastjson, libglib2, libpjsip, libplist, + localedef, luajit, mesa3d, openssh, openssl, postgresql, + python3, python-pyqt5, qt5base, qt5canvas3d, qt5connectivity, + qt5declarative, qt5engineio, qt5graphicaleffects, + qt5imageformats, qt5location, qt5multimedia, qt5quickcontrols, + qt5quickcontrols2, qt5script, qt5sensors, qt5serialbus, + qt5serialport, qt5svg, qt5tools, qt5webchannel, qt5webkit, + qt5websockets, qt5x11extras, qt5xmlpatterns, quagga, ruby, + samba4, snmppp, ti-gfx, vboot-utils, webkitgtk, wireshark, + xapp_xdriinfo. + + Issues resolved (http://bugs.buildroot.org): + + 10326: mesa3d package fails to build when BR2_SHARED_STATIC_LIBS=y + 10361: python3 python-config script generates invalid includes + 10501: host-localedef fails to compile on Ubuntu 17.10 + 2017.02.7, Released October 28th, 2017 Important / security related fixes. @@ -106,7 +106,7 @@ config BR2_WGET config BR2_SVN string "Subversion (svn) command" - default "svn" + default "svn --non-interactive" config BR2_BZR string "Bazaar (bzr) command" @@ -539,6 +539,7 @@ config BR2_GOOGLE_BREAKPAD_ENABLE depends on BR2_TOOLCHAIN_HAS_THREADS depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS help This option will enable the use of google breakpad, a library and tool suite that allows you to distribute an application to diff --git a/DEVELOPERS b/DEVELOPERS index 35507de953..0f5847efe0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -57,6 +57,7 @@ F: package/setools/ F: package/sngrep/ N: Adrian Perez de Castro <aperez@igalia.com> +F: package/libepoxy/ F: package/webkitgtk/ N: Aleksander Morgado <aleksander@aleksander.es> @@ -127,6 +128,7 @@ N: Andy Kennedy <andy.kennedy@adtran.com> F: package/libunwind/ N: Angelo Compagnucci <angelo.compagnucci@gmail.com> +F: package/i2c-tools/ F: package/mono/ F: package/mono-gtksharp3/ F: package/monolite/ @@ -617,6 +619,7 @@ F: package/gupnp-dlna/ F: package/gupnp-tools/ F: package/hiredis/ F: package/igd2-for-linux/ +F: package/libupnp/ F: package/libupnp18/ F: package/minissdpd/ F: package/motion/ @@ -978,7 +981,7 @@ F: support/legal-info/ N: Lucas De Marchi <lucas.de.marchi@gmail.com> F: package/fswebcam/ -N: Ludovic Desroches <ludovic.desroches@atmel.com> +N: Ludovic Desroches <ludovic.desroches@microchip.com> F: board/atmel/ F: configs/at91* F: configs/atmel_* @@ -1318,6 +1321,8 @@ N: Petr Vorel <petr.vorel@gmail.com> F: package/connman/ F: package/feh/ F: package/imlib2/ +F: package/iproute2/ +F: package/iputils/ F: package/libmbim/ F: package/libqmi/ F: package/linux-backports/ @@ -1427,6 +1432,7 @@ F: package/physfs/ F: package/solarus/ F: package/stress-ng/ F: package/supertux/ +F: package/supertuxkart/ F: package/terminology/ F: package/upower/ F: package/xenomai/ @@ -1764,8 +1770,11 @@ F: package/fwup/ N: Yann E. MORIN <yann.morin.1998@free.fr> F: fs/squashfs/ +F: package/asterisk/ F: package/cegui06/ F: package/celt051/ +F: package/dahdi-linux/ +F: package/dahdi-tools/ F: package/dtc/ F: package/dtv-scan-tables/ F: package/dvb-apps/ @@ -1776,7 +1785,9 @@ F: package/libedit/ F: package/libgsm/ F: package/libinput/ F: package/libiscsi/ +F: package/libpri/ F: package/libseccomp/ +F: package/libss7/ F: package/linux-tools/ F: package/mesa3d-headers/ F: package/nbd/ @@ -87,9 +87,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2017.11-rc2 +export BR2_VERSION := 2018.02-git # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1510608000 +BR2_VERSION_EPOCH = 1512070000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) @@ -483,13 +483,13 @@ include system/system.mk include package/Makefile.in # arch/arch.mk.* must be after package/Makefile.in because it may need to # complement variables defined therein, like BR_NO_CHECK_HASH_FOR. --include $(wildcard arch/arch.mk.*) +-include $(sort $(wildcard arch/arch.mk.*)) include support/dependencies/dependencies.mk PACKAGES += $(DEPENDENCIES_HOST_PREREQ) -include toolchain/*.mk -include toolchain/*/*.mk +include $(sort $(wildcard toolchain/*.mk)) +include $(sort $(wildcard toolchain/*/*.mk)) # Include the package override file if one has been provided in the # configuration. @@ -1113,7 +1113,7 @@ print-version: ./support/testing/run-tests -l 2>&1 | sed -r -e '/^test_run \((.*)\).*/!d; s//\1: *runtime_test/' | LC_ALL=C sort >> $@ include docs/manual/manual.mk --include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(dir)/docs/*/*.mk) +-include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) .PHONY: $(noconfig_targets) diff --git a/board/bananapi/bananapi-m1/boot.cmd b/board/bananapi/bananapi-m1/boot.cmd index fb7de1d38d..0cf6f4d63e 100644 --- a/board/bananapi/bananapi-m1/boot.cmd +++ b/board/bananapi/bananapi-m1/boot.cmd @@ -2,6 +2,6 @@ setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait mmc dev 0 fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun7i-a20-bananapi.dts +fatload mmc 0 $fdt_addr_r sun7i-a20-bananapi.dtb bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/qemu/ppc64-pseries/readme.txt b/board/qemu/ppc64-pseries/readme.txt index 7cc0c67d61..9de13779d0 100644 --- a/board/qemu/ppc64-pseries/readme.txt +++ b/board/qemu/ppc64-pseries/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append 'console=hvc0 root=/dev/sda' -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses + qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append "console=hvc0 root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses The login prompt will appear in the terminal that started Qemu. diff --git a/board/qemu/x86/readme.txt b/board/qemu/x86/readme.txt index 17500961d3..b003ad5373 100644 --- a/board/qemu/x86/readme.txt +++ b/board/qemu/x86/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append root=/dev/vda -net nic,model=virtio -net user + qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "root=/dev/vda" -net nic,model=virtio -net user Optionally add -smp N to emulate a SMP system with N CPUs. diff --git a/board/qemu/x86_64/readme.txt b/board/qemu/x86_64/readme.txt index ecd7813a1e..ed7b5f5532 100644 --- a/board/qemu/x86_64/readme.txt +++ b/board/qemu/x86_64/readme.txt @@ -1,6 +1,6 @@ Run the emulation with: - qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append root=/dev/vda -net nic,model=virtio -net user + qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "root=/dev/vda" -net nic,model=virtio -net user Optionally add -smp N to emulate a SMP system with N CPUs. diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt index 824f07547d..19577fa821 100644 --- a/docs/manual/adding-packages-tips.txt +++ b/docs/manual/adding-packages-tips.txt @@ -138,7 +138,7 @@ past, the 'github' helper function should be used as shown below. ------------------------ # Use a tag or a full commit ID FOO_VERSION = v1.0 -FOO_SITE = $(call github,<user>,<package>[,<version>]) +FOO_SITE = $(call github,<user>,<package>,$(FOO_VERSION)) ------------------------ .Notes @@ -147,9 +147,6 @@ FOO_SITE = $(call github,<user>,<package>[,<version>]) Buildroot (e.g.: +foo-f6fb6654af62045239caed5950bc6c7971965e60.tar.gz+), so it is not necessary to specify it in the +.mk+ file. - When using a commit ID as version, you should use the full 40 hex characters. -- The +version+ parameter is optional and should only be specified if anything - other than FOO_VERSION needs to be used, e.g. when this function is used to - specify a custom Linux or U-Boot tarball. If the package you wish to add does have a release section on GitHub, the maintainer may have uploaded a release tarball, or the release may just point diff --git a/docs/website/download.html b/docs/website/download.html index a7842b46d4..6f26d67e5e 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,74 +8,74 @@ <div class="panel-heading">Download</div> <div class="panel-body"> - <h3 style="text-align: center;">Latest long term support release: <b>2017.02.7</b></h3> + <h3 style="text-align: center;">Latest long term support release: <b>2017.02.8</b></h3> <div class="row mt centered"> <div class="col-sm-6"> <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');"> <div class="flipper"> <div class="front"> - <a href="/downloads/buildroot-2017.02.7.tar.gz"><img src="images/zip.png" width="180" alt=""></a> + <a href="/downloads/buildroot-2017.02.8.tar.gz"><img src="images/zip.png" width="180" alt=""></a> </div> <div class="back"> - <a href="/downloads/buildroot-2017.02.7.tar.gz"><img src="images/zip.png" width="180" alt=""></a> + <a href="/downloads/buildroot-2017.02.8.tar.gz"><img src="images/zip.png" width="180" alt=""></a> </div> </div> </div> - <h3><a href="/downloads/buildroot-2017.02.7.tar.gz">buildroot-2017.02.7.tar.gz</a></h3> - <p><a href="/downloads/buildroot-2017.02.7.tar.gz.sign">PGP signature</a></p> + <h3><a href="/downloads/buildroot-2017.02.8.tar.gz">buildroot-2017.02.8.tar.gz</a></h3> + <p><a href="/downloads/buildroot-2017.02.8.tar.gz.sign">PGP signature</a></p> </div> <div class="col-sm-6"> <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');"> <div class="flipper"> <div class="front"> - <a href="/downloads/buildroot-2017.02.7.tar.bz2"><img src="images/package.png" width="180" alt=""></a> + <a href="/downloads/buildroot-2017.02.8.tar.bz2"><img src="images/package.png" width="180" alt=""></a> </div> <div class="back"> - <a href="/downloads/buildroot-2017.02.7.tar.bz2"><img src="images/package.png" width="180" alt=""></a> + <a href="/downloads/buildroot-2017.02.8.tar.bz2"><img src="images/package.png" width="180" alt=""></a> </div> </div> </div> - <h3><a href="/downloads/buildroot-2017.02.7.tar.bz2">buildroot-2017.02.7.tar.bz2</a></h3> - <p><a href="/downloads/buildroot-2017.02.7.tar.bz2.sign">PGP signature</a></p> + <h3><a href="/downloads/buildroot-2017.02.8.tar.bz2">buildroot-2017.02.8.tar.bz2</a></h3> + <p><a href="/downloads/buildroot-2017.02.8.tar.bz2.sign">PGP signature</a></p> </div> </div> - <h3 style="text-align: center;">Latest stable release: <b>2017.08.1</b></h3> + <h3 style="text-align: center;">Latest stable release: <b>2017.11</b></h3> <div class="row mt centered"> <div class="col-sm-6"> <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');"> <div class="flipper"> <div class="front"> - <a href="/downloads/buildroot-2017.08.1.tar.gz"><img src="images/zip.png" width="180" alt=""></a> + <a href="/downloads/buildroot-2017.11.tar.gz"><img src="images/zip.png" width="180" alt=""></a> </div> <div class="back"> - <a href="/downloads/buildroot-2017.08.1.tar.gz"><img src="images/zip.png" width="180" alt=""></a> + <a href="/downloads/buildroot-2017.11.tar.gz"><img src="images/zip.png" width="180" alt=""></a> </div> </div> </div> - <h3><a href="/downloads/buildroot-2017.08.1.tar.gz">buildroot-2017.08.1.tar.gz</a></h3> - <p><a href="/downloads/buildroot-2017.08.1.tar.gz.sign">PGP signature</a></p> + <h3><a href="/downloads/buildroot-2017.11.tar.gz">buildroot-2017.11.tar.gz</a></h3> + <p><a href="/downloads/buildroot-2017.11.tar.gz.sign">PGP signature</a></p> </div> <div class="col-sm-6"> <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');"> <div class="flipper"> <div class="front"> - <a href="/downloads/buildroot-2017.08.1.tar.bz2"><img src="images/package.png" width="180" alt=""></a> + <a href="/downloads/buildroot-2017.11.tar.bz2"><img src="images/package.png" width="180" alt=""></a> </div> <div class="back"> - <a href="/downloads/buildroot-2017.08.1.tar.bz2"><img src="images/package.png" width="180" alt=""></a> + <a href="/downloads/buildroot-2017.11.tar.bz2"><img src="images/package.png" width="180" alt=""></a> </div> </div> </div> - <h3><a href="/downloads/buildroot-2017.08.1.tar.bz2">buildroot-2017.08.1.tar.bz2</a></h3> - <p><a href="/downloads/buildroot-2017.08.1.tar.bz2.sign">PGP signature</a></p> + <h3><a href="/downloads/buildroot-2017.11.tar.bz2">buildroot-2017.11.tar.bz2</a></h3> + <p><a href="/downloads/buildroot-2017.11.tar.bz2.sign">PGP signature</a></p> </div> </div> - +<!-- <h3 style="text-align: center;">Latest release candidate: <b>2017.11-rc2</b></h3> <div class="row mt centered"> <div class="col-sm-6"> @@ -109,7 +109,7 @@ <p><a href="/downloads/buildroot-2017.11-rc2.tar.bz2.sign">PGP signature</a></p> </div> </div> - +--> This and earlier releases (and their PGP signatures) can always be downloaded from <a href="/downloads/">http://buildroot.net/downloads/</a>. </div> diff --git a/docs/website/news.html b/docs/website/news.html index f2186f2963..1636d133e0 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,63 @@ <h2>News</h2> <ul class="timeline"> + <li> + <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div> + <div class="timeline-panel"> + <div class="timeline-heading"> + <h4 class="timeline-title">2017.11 released</h4> + <p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>30 November 2017</small></p> + </div> + <div class="timeline-body"> + <p>The stable 2017.11 release is out - Thanks to everyone + contributing and testing the release candidates. See the + <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.11">CHANGES</a> + file for more details, read the + <a href="http://lists.busybox.net/pipermail/buildroot/2017-December/208338.html">announcement</a> + and go to the <a href="/downloads/">downloads page</a> to pick up the + <a href="/downloads/buildroot-2017.11.tar.bz2">2017.11 release</a>.</p> + </div> + </div> + </li> + + <li class="timeline-inverted"> + <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div> + <div class="timeline-panel"> + <div class="timeline-heading"> + <h4 class="timeline-title">2017.08.2 released</h4> + <p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>29 November 2017</small></p> + </div> + <div class="timeline-body"> + <p>The 2017.08.2 bugfix release is out, fixing a number of important / + security related issues discovered since the 2017.08.1 release. See the + <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.08.2">CHANGES</a> + file for more details, read the + <a href="http://lists.busybox.net/pipermail/buildroot/2017-November/208174.html">announcement</a> + and go to the <a href="/downloads/">downloads page</a> to pick up the + <a href="/downloads/buildroot-2017.08.2.tar.bz2">2017.08.2 release</a>.</p> + </div> + </div> + </li> + + <li> + <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div> + <div class="timeline-panel"> + <div class="timeline-heading"> + <h4 class="timeline-title">2017.02.8 released</h4> + <p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>27 November 2017</small></p> + </div> + <div class="timeline-body"> + <p>The 2017.02.8 bugfix release is out, fixing a number of important / + security related issues discovered since the 2017.02.7 release. See the + <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.02.8">CHANGES</a> + file for more details, read the + <a href="http://lists.busybox.net/pipermail/buildroot/2017-November/208113.html">announcement</a> + and go to the <a href="/downloads/">downloads page</a> to pick up the + <a href="/downloads/buildroot-2017.02.8.tar.bz2">2017.02.8 release</a>.</p> + </div> + </div> + </li> + <li class="timeline-inverted"> <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div> <div class="timeline-panel"> diff --git a/package/Config.in.host b/package/Config.in.host index 59be666143..48b6f8c7a8 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -20,6 +20,7 @@ menu "Host utilities" source "package/genpart/Config.in.host" source "package/go/Config.in.host" source "package/go-bootstrap/Config.in.host" + source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imx-usb-loader/Config.in.host" source "package/jq/Config.in.host" diff --git a/package/asterisk/0005-build-ensure-target-directory-for-modules-exists.patch b/package/asterisk/0005-build-ensure-target-directory-for-modules-exists.patch new file mode 100644 index 0000000000..20cfc93892 --- /dev/null +++ b/package/asterisk/0005-build-ensure-target-directory-for-modules-exists.patch @@ -0,0 +1,32 @@ +From 933b2554a40f932571bdbdbb5217cda3e35fd61f Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" <yann.morin.1998@free.fr> +Date: Mon, 27 Nov 2017 12:52:52 +0100 +Subject: [PATCH] build: ensure target directory for modules exists + +Currently, in highly-parallel builds, it is possible that installing +modules fails because the target directory does not exist yet. + +We fix that by instructing $(INSTALL) to create the destination directory +first. + +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> +--- + Makefile.moddir_rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules +index 59190bece9..b73153a9a5 100644 +--- a/Makefile.moddir_rules ++++ b/Makefile.moddir_rules +@@ -110,7 +110,7 @@ clean:: + + install:: all + @echo "Installing modules from `basename $(CURDIR)`..." +- @for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x "$(DESTDIR)$(ASTMODDIR)" ; done ++ @for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -D -m 755 $$x "$(DESTDIR)$(ASTMODDIR)" ; done + ifneq ($(findstring :,$(XMLSTARLET)$(BASH)),:) + @if [ -f .moduleinfo ] ; then \ + declare -A DISABLED_MODS ;\ +-- +2.11.0 + diff --git a/package/boost/Config.in b/package/boost/Config.in index 8610932248..8925982ba8 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -101,6 +101,9 @@ config BR2_PACKAGE_BOOST_EXCEPTION config BR2_PACKAGE_BOOST_FIBER bool "boost-fiber" depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + # mips support uses the "pause" instruction, only available + # since mips32r2/mips64r2. + depends on !BR2_MIPS_CPU_MIPS32 && !BR2_MIPS_CPU_MIPS64 help C++11 userland threads library. diff --git a/package/chrony/0001-ntp-fix-build-with-musl-libc.patch b/package/chrony/0001-ntp-fix-build-with-musl-libc.patch new file mode 100644 index 0000000000..c927b343f7 --- /dev/null +++ b/package/chrony/0001-ntp-fix-build-with-musl-libc.patch @@ -0,0 +1,39 @@ +From 1e64bc4c4379ae3e55be3c518e0e3e22c8c4ae77 Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Tue, 14 Nov 2017 13:23:57 +0200 +Subject: [PATCH] ntp: fix build with musl libc + +The configure script enables HAVE_LINUX_TIMESTAMPING_OPT_PKTINFO based +on the existence of struct scm_ts_pktinfo and +SOF_TIMESTAMPING_OPT_PKTINFO that were introduced in Linux kernel v4.13 +in the linux/net_tstamp.h kernel header. But this feature also requires +SCM_TIMESTAMPING_PKTINFO that is defined in the socket.h header. musl +libc provides its own version of socket.h, and as of musl version 1.1.16 +this macro is missing. Define this macro in the code as a temporary +measure until musl is updated to its latest version. + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Upstream status: not upstreamable +--- + ntp_io_linux.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ntp_io_linux.c b/ntp_io_linux.c +index 00caed06f7ba..2214a6f6f6c5 100644 +--- a/ntp_io_linux.c ++++ b/ntp_io_linux.c +@@ -574,6 +574,10 @@ extract_udp_data(unsigned char *msg, NTP_Remote_Address *remote_addr, int len) + + /* ================================================== */ + ++#ifndef SCM_TIMESTAMPING_PKTINFO ++#define SCM_TIMESTAMPING_PKTINFO 58 ++#endif ++ + int + NIO_Linux_ProcessMessage(NTP_Remote_Address *remote_addr, NTP_Local_Address *local_addr, + NTP_Local_Timestamp *local_ts, struct msghdr *hdr, int length) +-- +2.15.0 + diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 25a78b9f78..71a76c2818 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -8,7 +8,7 @@ DOVECOT_VERSION_MAJOR = 2.2 DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).33.2 DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES -DOVECOT_LICENSE = LGPL-2.1 +DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 DOVECOT_LICENSE_FILES = COPYING COPYING.LGPL COPYING.MIT DOVECOT_DEPENDENCIES = \ host-pkgconf \ diff --git a/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch b/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch new file mode 100644 index 0000000000..279cdecb77 --- /dev/null +++ b/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch @@ -0,0 +1,52 @@ +# HG changeset patch +# User "Yann E. MORIN" <yann.morin.1998@free.fr> +# Date 1511772629 -3600 +# Mon Nov 27 09:50:29 2017 +0100 +# Branch yem/fixes +# Node ID 0848fa96c6eb13cf37249d317eff12cbd2f59ff7 +# Parent 3d43b280298c39a67d1d889e01e173f52c12da35 +utils: fix build with kernel headers >= 4.14 + +In kernel 4.14, CA_SET_PID was removed, in commit 833ff5e7feda (media: +ca.h: get rid of CA_SET_PID). + +Fix dst-util to not fail the build when this is missing. + +Fiuxes build failures such as: + http://autobuild.buildroot.org/results/708/708f11809b2cafc2a3375dc515803c87b376ed4d/build-end.log + http://autobuild.buildroot.org/results/e39/e3939d44376e92e8a35fb179d9890510334d8304/build-end.log + +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> + +diff --git a/util/dst-utils/dst_test.c b/util/dst-utils/dst_test.c +--- a/util/dst-utils/dst_test.c ++++ b/util/dst-utils/dst_test.c +@@ -111,6 +111,7 @@ + return 0; + } + ++#if defined CA_SET_PID + static int dst_set_pid(int cafd) + { + if ((ioctl(cafd, CA_SET_PID)) < 0) { +@@ -120,6 +121,7 @@ + + return 0; + } ++#endif + + static int dst_get_descr(int cafd) + { +@@ -230,8 +232,12 @@ + dst_reset(cafd); + break; + case 'p': ++#if defined CA_SET_PID + printf("%s: PID\n", __FUNCTION__); + dst_set_pid(cafd); ++#else ++ printf("%s: PID not supported\n", __FUNCTION__); ++#endif + break; + case 'g': + printf("%s: Get Desc\n", __FUNCTION__); diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk index 8ba1501d5c..ffab0db682 100644 --- a/package/dvb-apps/dvb-apps.mk +++ b/package/dvb-apps/dvb-apps.mk @@ -15,6 +15,8 @@ DVB_APPS_DEPENDENCIES = libiconv DVB_APPS_LDLIBS += -liconv endif +DVB_APPS_MAKE_OPTS = PERL5LIB=$(@D)/util/scan + ifeq ($(BR2_STATIC_LIBS),y) DVB_APPS_MAKE_OPTS += enable_shared=no else ifeq ($(BR2_SHARED_LIBS),y) @@ -25,7 +27,7 @@ DVB_APPS_INSTALL_STAGING = YES define DVB_APPS_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) LDLIBS="$(DVB_APPS_LDLIBS)" \ - $(MAKE) -C $(@D) CROSS_ROOT=$(STAGING_DIR) \ + $(MAKE1) -C $(@D) CROSS_ROOT=$(STAGING_DIR) \ $(DVB_APPS_MAKE_OPTS) endef diff --git a/package/exim/exim.hash b/package/exim/exim.hash index 29b9989c3e..d961083ebd 100644 --- a/package/exim/exim.hash +++ b/package/exim/exim.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 912f2ee03c8dba06a3a4c0ee40522d367e1b65dc59e38dfcc1f5d9eecff51ab0 exim-4.89.tar.bz2 +sha256 1c853bc960dff0a0e51e3e28bc4a4a8165b58b41bb64ea3abb90f254d9947a8c exim-4.89.1.tar.bz2 diff --git a/package/exim/exim.mk b/package/exim/exim.mk index 45cb57db14..612eaf47fa 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXIM_VERSION = 4.89 +EXIM_VERSION = 4.89.1 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.bz2 EXIM_SITE = ftp://ftp.exim.org/pub/exim/exim4 EXIM_LICENSE = GPL-2.0+ diff --git a/package/feh/feh.mk b/package/feh/feh.mk index 3f4c410440..7211dc7bdd 100644 --- a/package/feh/feh.mk +++ b/package/feh/feh.mk @@ -12,8 +12,8 @@ FEH_LICENSE = MIT FEH_LICENSE_FILES = COPYING define FEH_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ - -C $(@D) all + $(TARGET_MAKE_ENV) CFLAGS="$(TARGET_CFLAGS) -std=gnu99" $(MAKE1) \ + CC="$(TARGET_CC) $(TARGET_LDFLAGS)" -C $(@D) all endef define FEH_INSTALL_TARGET_CMDS diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 69a89a190c..0ceef576a8 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -198,7 +198,7 @@ else FREERDP_CONF_OPTS += -DWITH_XV=OFF endif -ifeq ($(BR2_PACKAGE_WAYLAND),y) +ifeq ($(BR2_PACKAGE_FREERDP_CLIENT_WL),y) FREERDP_DEPENDENCIES += wayland libxkbcommon FREERDP_CONF_OPTS += \ -DWITH_WAYLAND=ON \ diff --git a/package/gcc/arc-2017.09-release/0001-fix-checking-for-jumps.patch b/package/gcc/arc-2017.09-release/0001-fix-checking-for-jumps.patch new file mode 100644 index 0000000000..ce78fac2e6 --- /dev/null +++ b/package/gcc/arc-2017.09-release/0001-fix-checking-for-jumps.patch @@ -0,0 +1,49 @@ +From c2694d3739d90ea3350b42252638b604a2c122b7 Mon Sep 17 00:00:00 2001 +From: Claudiu Zissulescu <claziss@gmail.com> +Date: Tue, 7 Nov 2017 20:16:41 +0200 +Subject: [PATCH] [FIX][ZOL] fix checking for jumps + +Signed-off-by: Evgeniy Didin <didin@synopsys.com> +--- + gcc/config/arc/arc.c | 3 ++- + gcc/testsuite/gcc.target/arc/loop-4.c | 14 ++++++++++++++ + 2 files changed, 16 insertions(+), 1 deletion(-) + create mode 100644 gcc/testsuite/gcc.target/arc/loop-4.c + +diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c +index 22eeb34a371..5d367499d03 100644 +--- a/gcc/config/arc/arc.c ++++ b/gcc/config/arc/arc.c +@@ -7505,7 +7505,8 @@ hwloop_optimize (hwloop_info loop) + && INSN_P (last_insn) + && (JUMP_P (last_insn) || CALL_P (last_insn) + || GET_CODE (PATTERN (last_insn)) == SEQUENCE +- || JUMP_P (prev_active_insn (last_insn)) ++ || (prev_active_insn (last_insn) ++ && JUMP_P (prev_active_insn (last_insn))) + /* At this stage we can have (insn (clobber (mem:BLK + (reg)))) instructions, ignpre them. */ + || (GET_CODE (PATTERN (last_insn)) != CLOBBER +diff --git a/gcc/testsuite/gcc.target/arc/loop-4.c b/gcc/testsuite/gcc.target/arc/loop-4.c +new file mode 100644 +index 00000000000..99a93a74d1e +--- /dev/null ++++ b/gcc/testsuite/gcc.target/arc/loop-4.c +@@ -0,0 +1,14 @@ ++/* { dg-do assemble } */ ++/* { dg-do compile } */ ++/* { dg-options "-Os" } */ ++ ++ ++void fn1(void *p1, int p2, int p3) ++{ ++ char *d = p1; ++ do ++ *d++ = p2; ++ while (--p3); ++} ++ ++/* { dg-final { scan-assembler "lp_count" } } */ +-- +2.11.0 + diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 5910dda72d..4e5bc7f7bc 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,4 +1,4 @@ # Locally calculated (fetched from Github) -sha256 f1f2566fea1518dd7244d322882242bbd654eb215fba51a7ab001b8fd2c9bcbe glibc-glibc-2.26-73-g4b692dffb95ac4812b161eb6a16113d7e824982e.tar.gz +sha256 d66b3702961c846ead2bacf17a9b5239cc1e8a43ca6e322f3637e99f276efec1 glibc-glibc-2.26-73-g4b692dffb95ac4812b161eb6a16113d7e824982e.tar.gz # Locally calculated (fetched from Github) sha256 5aa9adeac09727db0b8a52794186563771e74d70410e9fd86431e339953fd4bb glibc-arc-2017.09-release.tar.gz diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 5911dfec5f..d99b524ef9 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -18,8 +18,7 @@ GLIBC_VERSION = glibc-2.26-73-g4b692dffb95ac4812b161eb6a16113d7e824982e # When updating the version, check it on the official repository; # *NEVER* decide on a version string by looking at the mirror. # Then check that the mirror has been synced already (happens once a day.) -GLIBC_SITE = https://github.com/bminor/glibc.git -GLIBC_SITE_METHOD = git +GLIBC_SITE = $(call github,bminor,glibc,$(GLIBC_VERSION)) endif GLIBC_SRC_SUBDIR = . diff --git a/package/google-breakpad/0002-Replace-remaining-references-to-struct-ucontext-with.patch b/package/google-breakpad/0002-Replace-remaining-references-to-struct-ucontext-with.patch new file mode 100644 index 0000000000..e02ae268b9 --- /dev/null +++ b/package/google-breakpad/0002-Replace-remaining-references-to-struct-ucontext-with.patch @@ -0,0 +1,257 @@ +From 7975a962e1d6dbad5a46792a54e647abd7caf5f1 Mon Sep 17 00:00:00 2001 +From: Mark Mentovai <mark@chromium.org> +Date: Tue, 19 Sep 2017 22:48:30 -0400 +Subject: [PATCH] Replace remaining references to 'struct ucontext' with + 'ucontext_t' + +This relands +https://chromium.googlesource.com/breakpad/breakpad/src/+/e3035bc406cee8a4d765e59ad46eb828705f17f4, +which was accidentally committed to breakpad/breakpad/src, the read-only +mirror of src in breakpad/breakpad. (Well, it should have been +read-only.) See https://crbug.com/766164. + +This fixes issues with glibc-2.26. + +See https://bugs.gentoo.org/show_bug.cgi?id=628782 , +https://sourceware.org/git/?p=glibc.git;h=251287734e89a52da3db682a8241eb6bccc050c9 , and +https://sourceware.org/ml/libc-alpha/2017-08/msg00010.html for context. +Change-Id: Id66f474d636dd2afa450bab925c5514a800fdd6f +Reviewed-on: https://chromium-review.googlesource.com/674304 +Reviewed-by: Mark Mentovai <mark@chromium.org> + +(cherry picked from commit bddcc58860f522a0d4cbaa7e9d04058caee0db9d) +[Romain: backport from upstream] +Signed-off-by: Romain Naour <romain.naour@gmail.com> +--- + .../linux/dump_writer_common/ucontext_reader.cc | 32 +++++++++++----------- + .../linux/dump_writer_common/ucontext_reader.h | 14 +++++----- + src/client/linux/handler/exception_handler.cc | 10 +++---- + src/client/linux/handler/exception_handler.h | 6 ++-- + .../linux/microdump_writer/microdump_writer.cc | 2 +- + .../linux/minidump_writer/minidump_writer.cc | 2 +- + 6 files changed, 33 insertions(+), 33 deletions(-) + +diff --git a/src/client/linux/dump_writer_common/ucontext_reader.cc b/src/client/linux/dump_writer_common/ucontext_reader.cc +index c80724d..052ce37 100644 +--- a/src/client/linux/dump_writer_common/ucontext_reader.cc ++++ b/src/client/linux/dump_writer_common/ucontext_reader.cc +@@ -36,19 +36,19 @@ namespace google_breakpad { + + // Minidump defines register structures which are different from the raw + // structures which we get from the kernel. These are platform specific +-// functions to juggle the ucontext and user structures into minidump format. ++// functions to juggle the ucontext_t and user structures into minidump format. + + #if defined(__i386__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_ESP]; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_EIP]; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct _libc_fpstate* fp) { + const greg_t* regs = uc->uc_mcontext.gregs; + +@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, + + #elif defined(__x86_64) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_RSP]; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[REG_RIP]; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct _libc_fpstate* fpregs) { + const greg_t* regs = uc->uc_mcontext.gregs; + +@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, + + #elif defined(__ARM_EABI__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.arm_sp; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.arm_pc; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { + out->context_flags = MD_CONTEXT_ARM_FULL; + + out->iregs[0] = uc->uc_mcontext.arm_r0; +@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { + + #elif defined(__aarch64__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.sp; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.pc; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct fpsimd_context* fpregs) { + out->context_flags = MD_CONTEXT_ARM64_FULL; + +@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, + + #elif defined(__mips__) + +-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { + return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]; + } + +-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { ++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { + return uc->uc_mcontext.pc; + } + +-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { ++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { + #if _MIPS_SIM == _ABI64 + out->context_flags = MD_CONTEXT_MIPS64_FULL; + #elif _MIPS_SIM == _ABIO32 +diff --git a/src/client/linux/dump_writer_common/ucontext_reader.h b/src/client/linux/dump_writer_common/ucontext_reader.h +index b6e77b4..2de80b7 100644 +--- a/src/client/linux/dump_writer_common/ucontext_reader.h ++++ b/src/client/linux/dump_writer_common/ucontext_reader.h +@@ -39,23 +39,23 @@ + + namespace google_breakpad { + +-// Wraps platform-dependent implementations of accessors to ucontext structs. ++// Wraps platform-dependent implementations of accessors to ucontext_t structs. + struct UContextReader { +- static uintptr_t GetStackPointer(const struct ucontext* uc); ++ static uintptr_t GetStackPointer(const ucontext_t* uc); + +- static uintptr_t GetInstructionPointer(const struct ucontext* uc); ++ static uintptr_t GetInstructionPointer(const ucontext_t* uc); + +- // Juggle a arch-specific ucontext into a minidump format ++ // Juggle a arch-specific ucontext_t into a minidump format + // out: the minidump structure + // info: the collection of register structures. + #if defined(__i386__) || defined(__x86_64) +- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct _libc_fpstate* fp); + #elif defined(__aarch64__) +- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct fpsimd_context* fpregs); + #else +- static void FillCPUContext(RawContextCPU *out, const ucontext *uc); ++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc); + #endif + }; + +diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc +index b63f973..3d809b8 100644 +--- a/src/client/linux/handler/exception_handler.cc ++++ b/src/client/linux/handler/exception_handler.cc +@@ -439,9 +439,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { + // Fill in all the holes in the struct to make Valgrind happy. + memset(&g_crash_context_, 0, sizeof(g_crash_context_)); + memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t)); +- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext)); ++ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t)); + #if defined(__aarch64__) +- struct ucontext* uc_ptr = (struct ucontext*)uc; ++ ucontext_t* uc_ptr = (ucontext_t*)uc; + struct fpsimd_context* fp_ptr = + (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; + if (fp_ptr->head.magic == FPSIMD_MAGIC) { +@@ -450,9 +450,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { + } + #elif !defined(__ARM_EABI__) && !defined(__mips__) + // FP state is not part of user ABI on ARM Linux. +- // In case of MIPS Linux FP state is already part of struct ucontext ++ // In case of MIPS Linux FP state is already part of ucontext_t + // and 'float_state' is not a member of CrashContext. +- struct ucontext* uc_ptr = (struct ucontext*)uc; ++ ucontext_t* uc_ptr = (ucontext_t*)uc; + if (uc_ptr->uc_mcontext.fpregs) { + memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs, + sizeof(g_crash_context_.float_state)); +@@ -476,7 +476,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) { + // ExceptionHandler::HandleSignal(). + siginfo.si_code = SI_USER; + siginfo.si_pid = getpid(); +- struct ucontext context; ++ ucontext_t context; + getcontext(&context); + return HandleSignal(sig, &siginfo, &context); + } +diff --git a/src/client/linux/handler/exception_handler.h b/src/client/linux/handler/exception_handler.h +index 591c310..42f4055 100644 +--- a/src/client/linux/handler/exception_handler.h ++++ b/src/client/linux/handler/exception_handler.h +@@ -191,11 +191,11 @@ class ExceptionHandler { + struct CrashContext { + siginfo_t siginfo; + pid_t tid; // the crashing thread. +- struct ucontext context; ++ ucontext_t context; + #if !defined(__ARM_EABI__) && !defined(__mips__) + // #ifdef this out because FP state is not part of user ABI for Linux ARM. +- // In case of MIPS Linux FP state is already part of struct +- // ucontext so 'float_state' is not required. ++ // In case of MIPS Linux FP state is already part of ucontext_t so ++ // 'float_state' is not required. + fpstate_t float_state; + #endif + }; +diff --git a/src/client/linux/microdump_writer/microdump_writer.cc b/src/client/linux/microdump_writer/microdump_writer.cc +index 6f5b435..a508667 100644 +--- a/src/client/linux/microdump_writer/microdump_writer.cc ++++ b/src/client/linux/microdump_writer/microdump_writer.cc +@@ -571,7 +571,7 @@ class MicrodumpWriter { + + void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } + +- const struct ucontext* const ucontext_; ++ const ucontext_t* const ucontext_; + #if !defined(__ARM_EABI__) && !defined(__mips__) + const google_breakpad::fpstate_t* const float_state_; + #endif +diff --git a/src/client/linux/minidump_writer/minidump_writer.cc b/src/client/linux/minidump_writer/minidump_writer.cc +index 86009b9..f2aec73 100644 +--- a/src/client/linux/minidump_writer/minidump_writer.cc ++++ b/src/client/linux/minidump_writer/minidump_writer.cc +@@ -1248,7 +1248,7 @@ class MinidumpWriter { + const int fd_; // File descriptor where the minidum should be written. + const char* path_; // Path to the file where the minidum should be written. + +- const struct ucontext* const ucontext_; // also from the signal handler ++ const ucontext_t* const ucontext_; // also from the signal handler + #if !defined(__ARM_EABI__) && !defined(__mips__) + const google_breakpad::fpstate_t* const float_state_; // ditto + #endif +-- +2.9.5 + diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index e0e91068be..91ec9ce309 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -12,6 +12,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 + depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS select BR2_PACKAGE_LINUX_SYSCALL_SUPPORT help Google-Breakpad is a library and tool suite that allows you @@ -36,6 +37,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD 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_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) || \ diff --git a/package/google-breakpad/Config.in.host b/package/google-breakpad/Config.in.host new file mode 100644 index 0000000000..28d304766a --- /dev/null +++ b/package/google-breakpad/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS + bool + default y if BR2_HOSTARCH = "x86_64" + default y if BR2_HOSTARCH = "x86" + default y if BR2_HOSTARCH = "arm" + default y if BR2_HOSTARCH = "aarch64" + default y if BR2_HOSTARCH = "mips" + default y if BR2_HOSTARCH = "mipsel" diff --git a/package/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer.mk index bc886c78a2..22240bceea 100644 --- a/package/gstreamer/gstreamer.mk +++ b/package/gstreamer/gstreamer.mk @@ -1 +1 @@ -include package/gstreamer/*/*.mk +include $(sort $(wildcard package/gstreamer/*/*.mk)) diff --git a/package/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1.mk index 5b748e33fb..8530ff027a 100644 --- a/package/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1.mk @@ -1 +1 @@ -include package/gstreamer1/*/*.mk +include $(sort $(wildcard package/gstreamer1/*/*.mk)) diff --git a/package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch b/package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch new file mode 100644 index 0000000000..0bd259ad8b --- /dev/null +++ b/package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch @@ -0,0 +1,71 @@ +From 591fc6da944ffc29936e0019b2bc225ddc81dbba Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Mon, 20 Nov 2017 22:48:33 +0100 +Subject: [PATCH] lib/hsh.c: rename hsh local variable + +The hsh local variable name conflicts with the function prototype of +hsh() in hsh.h, causing the following build issues with old compilers +(gcc 4.7): + +hsh.c: In function 'hsh': +hsh.c:28:21: error: declaration of 'hsh' shadows a global declaration [-Werror=shadow] +hsh.c:26:1: error: shadowed declaration is here [-Werror=shadow] +hsh.c: In function 'hsh_buf': +hsh.c:60:21: error: declaration of 'hsh' shadows a global declaration [-Werror=shadow] +hsh.c:26:1: error: shadowed declaration is here [-Werror=shadow] + +Therefore, we rename this local variable to _hsh. + +Submitted-upstream: https://github.com/latchset/jose/pull/51 +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + lib/hsh.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/lib/hsh.c b/lib/hsh.c +index c59a95f..a2a891b 100644 +--- a/lib/hsh.c ++++ b/lib/hsh.c +@@ -25,7 +25,7 @@ + json_t * + hsh(jose_cfg_t *cfg, const char *alg, const void *data, size_t dlen) + { +- jose_io_auto_t *hsh = NULL; ++ jose_io_auto_t *_hsh = NULL; + jose_io_auto_t *enc = NULL; + jose_io_auto_t *buf = NULL; + char b[1024] = {}; +@@ -33,8 +33,8 @@ hsh(jose_cfg_t *cfg, const char *alg, const void *data, size_t dlen) + + buf = jose_io_buffer(cfg, b, &l); + enc = jose_b64_enc_io(buf); +- hsh = hsh_io(cfg, alg, enc); +- if (!buf || !enc || !hsh || !hsh->feed(hsh, data, dlen) || !hsh->done(hsh)) ++ _hsh = hsh_io(cfg, alg, enc); ++ if (!buf || !enc || !_hsh || !_hsh->feed(_hsh, data, dlen) || !_hsh->done(_hsh)) + return NULL; + + return json_stringn(b, l); +@@ -57,7 +57,7 @@ hsh_buf(jose_cfg_t *cfg, const char *alg, + const void *data, size_t dlen, void *hash, size_t hlen) + { + const jose_hook_alg_t *a = NULL; +- jose_io_auto_t *hsh = NULL; ++ jose_io_auto_t *_hsh = NULL; + jose_io_auto_t *buf = NULL; + + a = jose_hook_alg_find(JOSE_HOOK_ALG_KIND_HASH, alg); +@@ -71,8 +71,8 @@ hsh_buf(jose_cfg_t *cfg, const char *alg, + return SIZE_MAX; + + buf = jose_io_buffer(cfg, hash, &hlen); +- hsh = a->hash.hsh(a, cfg, buf); +- if (!buf || !hsh || !hsh->feed(hsh, data, dlen) || !hsh->done(hsh)) ++ _hsh = a->hash.hsh(a, cfg, buf); ++ if (!buf || !_hsh || !_hsh->feed(_hsh, data, dlen) || !_hsh->done(_hsh)) + return SIZE_MAX; + + return hlen; +-- +2.13.6 + diff --git a/package/jose/0002-configure-fix-build-with-old-compilers.patch b/package/jose/0002-configure-fix-build-with-old-compilers.patch new file mode 100644 index 0000000000..0484f38f0d --- /dev/null +++ b/package/jose/0002-configure-fix-build-with-old-compilers.patch @@ -0,0 +1,165 @@ +From 98e9faa4d39cd5b6aaab882877e19ae394ba3810 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Mon, 20 Nov 2017 23:10:38 +0100 +Subject: [PATCH] configure: fix build with old compilers + +Old gcc versions (gcc 4.7) do not support all warnings flags currently +hard-coded by configure.ac. In order to fix this, we import the +AX_CHECK_COMPILE_FLAG() macro from the autoconf-archive, and use it in +the configure.ac to only use warning flags when the compiler supports +them. + +Submitted-upstream: https://github.com/latchset/jose/pull/51 +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + configure.ac | 46 +++++++++++++++------------- + m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 105 insertions(+), 22 deletions(-) + create mode 100644 m4/ax_check_compile_flag.m4 + +diff --git a/configure.ac b/configure.ac +index cf8c9a6..6fe4ded 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,6 @@ + AC_PREREQ(2.62) + AC_INIT(jose, 10) ++AC_CONFIG_MACRO_DIRS([m4]) + AC_CANONICAL_SYSTEM + AC_PROG_CC_C99 + +@@ -18,27 +19,30 @@ PKG_CHECK_MODULES([libcrypto], [libcrypto >= 1.0.2]) + AC_OPENMP + AC_SUBST([OPENMP_CFLAGS]) + +-JOSE_CFLAGS="\ +--Wall \ +--Wextra \ +--Werror \ +--Wstrict-aliasing \ +--Wchar-subscripts \ +--Wformat-security \ +--Wmissing-declarations \ +--Wmissing-prototypes \ +--Wnested-externs \ +--Wpointer-arith \ +--Wshadow \ +--Wsign-compare \ +--Wstrict-prototypes \ +--Wtype-limits \ +--Wunused-function \ +--Wno-missing-field-initializers \ +--Wno-unused-command-line-argument \ +--Wno-unused-parameter \ +--Wno-unknown-pragmas \ +-" ++for flag in \ ++ -Wall \ ++ -Wextra \ ++ -Werror \ ++ -Wstrict-aliasing \ ++ -Wchar-subscripts \ ++ -Wformat-security \ ++ -Wmissing-declarations \ ++ -Wmissing-prototypes \ ++ -Wnested-externs \ ++ -Wpointer-arith \ ++ -Wshadow \ ++ -Wsign-compare \ ++ -Wstrict-prototypes \ ++ -Wtype-limits \ ++ -Wunused-function \ ++ -Wno-missing-field-initializers \ ++ -Wno-unused-command-line-argument \ ++ -Wno-unused-parameter \ ++ -Wno-unknown-pragmas ; do ++ AX_CHECK_COMPILE_FLAG([${flag}], ++ [JOSE_CFLAGS="${JOSE_CFLAGS} ${flag}"]) ++done ++ + AC_SUBST([JOSE_CFLAGS]) + + AC_MSG_CHECKING([for linker script support]) +diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 +new file mode 100644 +index 0000000..dcabb92 +--- /dev/null ++++ b/m4/ax_check_compile_flag.m4 +@@ -0,0 +1,74 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) ++# ++# DESCRIPTION ++# ++# Check whether the given FLAG works with the current language's compiler ++# or gives an error. (Warnings, however, are ignored) ++# ++# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on ++# success/failure. ++# ++# If EXTRA-FLAGS is defined, it is added to the current language's default ++# flags (e.g. CFLAGS) when the check is done. The check is thus made with ++# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to ++# force the compiler to issue an error when a bad flag is given. ++# ++# INPUT gives an alternative input source to AC_COMPILE_IFELSE. ++# ++# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this ++# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de> ++# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com> ++# ++# 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 <https://www.gnu.org/licenses/>. ++# ++# As a special exception, the respective Autoconf Macro's copyright owner ++# gives unlimited permission to copy, distribute and modify the configure ++# scripts that are the output of Autoconf when processing the Macro. You ++# need not follow the terms of the GNU General Public License when using ++# or distributing such scripts, even though portions of the text of the ++# Macro appear in them. The GNU General Public License (GPL) does govern ++# all other use of the material that constitutes the Autoconf Macro. ++# ++# This special exception to the GPL applies to versions of the Autoconf ++# Macro released by the Autoconf Archive. When you make and distribute a ++# modified version of the Autoconf Macro, you may extend this special ++# exception to the GPL to apply to your modified version as well. ++ ++#serial 5 ++ ++AC_DEFUN([AX_CHECK_COMPILE_FLAG], ++[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF ++AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl ++AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ ++ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS ++ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" ++ AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], ++ [AS_VAR_SET(CACHEVAR,[yes])], ++ [AS_VAR_SET(CACHEVAR,[no])]) ++ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) ++AS_VAR_IF(CACHEVAR,yes, ++ [m4_default([$2], :)], ++ [m4_default([$3], :)]) ++AS_VAR_POPDEF([CACHEVAR])dnl ++])dnl AX_CHECK_COMPILE_FLAGS +-- +2.13.6 + diff --git a/package/jose/jose.mk b/package/jose/jose.mk index 1f5e3e4ded..2758d408da 100644 --- a/package/jose/jose.mk +++ b/package/jose/jose.mk @@ -9,6 +9,8 @@ JOSE_SOURCE = jose-$(JOSE_VERSION).tar.bz2 JOSE_SITE = https://github.com/latchset/jose/releases/download/v$(JOSE_VERSION) JOSE_LICENSE = Apache-2.0 JOSE_LICENSE_FILES = COPYING +# 0002-configure-fix-build-with-old-compilers.patch +JOSE_AUTORECONF = YES JOSE_INSTALL_STAGING = YES JOSE_DEPENDENCIES = host-pkgconf zlib jansson openssl diff --git a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch new file mode 100644 index 0000000000..b1ea09272e --- /dev/null +++ b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch @@ -0,0 +1,26 @@ +From 08e14a662b9e75daec29722e49150869952ba1b6 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Mon, 20 Nov 2017 22:09:39 +0100 +Subject: [PATCH] Makefile: remove -Werror to avoid build failures + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 16ce297..909498e 100644 +--- a/Makefile ++++ b/Makefile +@@ -45,7 +45,7 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ + > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) + + CFLAGS += -g +-CFLAGS += $(autodepend-flags) -Wall -Werror ++CFLAGS += $(autodepend-flags) -Wall + 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, "") +-- +2.13.6 + diff --git a/package/kvm-unit-tests/0001-remove-werror.patch b/package/kvm-unit-tests/0001-remove-werror.patch deleted file mode 100644 index 058a640d76..0000000000 --- a/package/kvm-unit-tests/0001-remove-werror.patch +++ /dev/null @@ -1,17 +0,0 @@ -Remove -Werror to avoid build failures - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - -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, "") diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash index b83e57de50..2a4cfe021a 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.hash +++ b/package/kvm-unit-tests/kvm-unit-tests.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 8cb85e5af51820dea8c250e1d4dac723de92c5cd8878354c6fa5c099975f3264 kvm-unit-tests-5731572b2ac23eb410732110b93425b5bb7f27dd.tar.gz +sha256 ccb9ff17a2c7d6c7d50b4b71b87381181b45484187100ae5b1ac54d9d61e8666 kvm-unit-tests-95062c20790d82713bfa7475b61a4adef3f3645a.tar.gz diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index 3a5d0fd125..c630ec6270 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 = 5731572b2ac23eb410732110b93425b5bb7f27dd +KVM_UNIT_TESTS_VERSION = 95062c20790d82713bfa7475b61a4adef3f3645a KVM_UNIT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/scm/virt/kvm/kvm-unit-tests.git KVM_UNIT_TESTS_SITE_METHOD = git KVM_UNIT_TESTS_LICENSE = LGPL-2.0 diff --git a/package/lftp/lftp.mk b/package/lftp/lftp.mk index de4ebb8521..b174057f03 100644 --- a/package/lftp/lftp.mk +++ b/package/lftp/lftp.mk @@ -41,6 +41,13 @@ else LFTP_CONF_OPTS += --without-openssl endif +ifeq ($(BR2_PACKAGE_LIBIDN),y) +LFTP_DEPENDENCIES += libidn +LFTP_CONF_OPTS += --with-libidn=$(STAGING_DIR)/usr +else +LFTP_CONF_OPTS += --without-libidn +endif + # Remove /usr/share/lftp define LFTP_REMOVE_DATA $(RM) -fr $(TARGET_DIR)/usr/share/lftp diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 49292dfb9e..275a5a373f 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.1.tar.xz.asc -sha256 8eed282cf3a0158d567a0feaa3c4619e8e847970597b5a2c81879e8f0d1a39d1 curl-7.56.1.tar.xz +# https://curl.haxx.se/download/curl-7.57.0.tar.xz.asc +sha256 f5f6fd3c72b7b8389969f4fb671ed8532fa9b5bb7a5cae7ca89bc1cea45c7878 curl-7.57.0.tar.xz sha256 cbcf511f5702f7baf5424193a792bc9c18fab22bcbec2e6a587598389dc632c2 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 57b9c2cbca..0aab58a7de 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.56.1 +LIBCURL_VERSION = 7.57.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index fc4108f6fd..65bf1c2b7b 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -12,6 +12,7 @@ LIBEVENT_LICENSE_FILES = LICENSE # For 0001-Disable-building-test-programs.patch LIBEVENT_AUTORECONF = YES LIBEVENT_CONF_OPTS = --disable-samples +HOST_LIBEVENT_CONF_OPTS = --disable-samples --disable-openssl define LIBEVENT_REMOVE_PYSCRIPT rm $(TARGET_DIR)/usr/bin/event_rpcgen.py diff --git a/package/libfastjson/libfastjson.mk b/package/libfastjson/libfastjson.mk index b1cdd6a158..06da0d8edd 100644 --- a/package/libfastjson/libfastjson.mk +++ b/package/libfastjson/libfastjson.mk @@ -7,6 +7,7 @@ LIBFASTJSON_VERSION = v0.99.4 LIBFASTJSON_SITE = $(call github,rsyslog,libfastjson,$(LIBFASTJSON_VERSION)) LIBFASTJSON_INSTALL_STAGING = YES +LIBFASTJSON_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' # From git LIBFASTJSON_AUTORECONF = YES LIBFASTJSON_LICENSE = MIT diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index c772d4117a..53b654d072 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -48,7 +48,6 @@ LIBPJSIP_CONF_OPTS = \ --disable-openh264 \ --disable-libyuv \ --disable-ipp \ - --disable-ssl \ --disable-silk \ --with-external-srtp @@ -57,8 +56,8 @@ LIBPJSIP_CONF_OPTS = \ # so we want to use it. LIBPJSIP_CONF_OPTS += --enable-epoll -ifeq ($(BR2_PACKAGE_OPENSSL),y) -LIBPJSIP_DEPENDENCIES += openssl +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +LIBPJSIP_DEPENDENCIES += libopenssl LIBPJSIP_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr else LIBPJSIP_CONF_OPTS += --disable-ssl diff --git a/package/libupnp/libupnp.hash b/package/libupnp/libupnp.hash index 3b45d5311c..929e5c42e7 100644 --- a/package/libupnp/libupnp.hash +++ b/package/libupnp/libupnp.hash @@ -1,2 +1,3 @@ # Locally computed: sha256 7d83d79af3bb4062e5c3a58bf2e90d2da5b8b99e2b2d57c23b5b6f766288cf96 libupnp-1.6.24.tar.bz2 +sha256 0375955c8a79d6e8fa0792d45d00fc4e7710d7ac95bcbd27f9225a83f5c946fd LICENSE diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk index fb5e18db69..a10d6bb208 100644 --- a/package/linphone/linphone.mk +++ b/package/linphone/linphone.mk @@ -50,4 +50,11 @@ else LINPHONE_CONF_OPTS += --disable-libv4l1 --disable-libv4l2 endif +ifeq ($(BR2_PACKAGE_LIBUPNP),y) +LINPHONE_DEPENDENCIES += libupnp +LINPHONE_CONF_OPTS += --enable-upnp +else +LINPHONE_CONF_OPTS += --disable-upnp +endif + $(eval $(autotools-package)) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1a5630ae3e..b7f188cd72 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -247,16 +247,16 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "3.2.94" if BR2_KERNEL_HEADERS_3_2 + default "3.2.96" 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.10.108" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 - default "4.1.45" if BR2_KERNEL_HEADERS_4_1 - default "4.4.97" if BR2_KERNEL_HEADERS_4_4 - default "4.9.61" if BR2_KERNEL_HEADERS_4_9 + default "4.1.46" if BR2_KERNEL_HEADERS_4_1 + default "4.4.102" if BR2_KERNEL_HEADERS_4_4 + default "4.9.65" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 - default "4.13.12" if BR2_KERNEL_HEADERS_4_13 + default "4.13.16" if BR2_KERNEL_HEADERS_4_13 default "4.14" if BR2_KERNEL_HEADERS_4_14 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION diff --git a/package/localedef/0001-Don-t-include-xlocale.h.patch b/package/localedef/0001-Don-t-include-xlocale.h.patch new file mode 100644 index 0000000000..9a6c2f8e90 --- /dev/null +++ b/package/localedef/0001-Don-t-include-xlocale.h.patch @@ -0,0 +1,50 @@ +From: Bernhard Walle <bernhard@bwalle.de> +Date: Mon, 2 Oct 2017 16:55:23 +0200 +Subject: [PATCH] Don't include <xlocale.h> + +This header has been removed in glibc 2.26: + +https://abi-laboratory.pro/tracker/changelog/glibc/2.26/log.html + +------------------------ >8 ------------------------ +* The nonstandard header <xlocale.h> has been removed. Most programs should + use <locale.h> instead. If you have a specific need for the definition of + locale_t with no other declarations, please contact + libc-alpha@sourceware.org and explain. +------------------------ 8< ------------------------ + +Signed-off-by: Bernhard Walle <bernhard@bwalle.de> + +Upstream: https://git.pengutronix.de/cgit/ptxdist/tree/patches/localedef-eglibc-2.14.1-r17443-ptx1/0003-Don-t-include-xlocale.h.patch +Signed-off-by: Peter Seiderer <ps.report@gmx.net> +--- + eglibc/locale/langinfo.h | 2 +- + eglibc/locale/locale.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/eglibc/locale/langinfo.h b/eglibc/locale/langinfo.h +index 0a5336507196..76707a4584c1 100644 +--- a/eglibc/locale/langinfo.h ++++ b/eglibc/locale/langinfo.h +@@ -589,7 +589,7 @@ extern char *nl_langinfo (nl_item __item) __THROW; + more information. */ + + /* Get locale datatype definition. */ +-# include <xlocale.h> ++# include <locale.h> + + /* Just like nl_langinfo but get the information from the locale object L. */ + extern char *nl_langinfo_l (nl_item __item, __locale_t __l); +diff --git a/eglibc/locale/locale.h b/eglibc/locale/locale.h +index 2aa19e76acb2..18be711a2d40 100644 +--- a/eglibc/locale/locale.h ++++ b/eglibc/locale/locale.h +@@ -143,7 +143,7 @@ __END_NAMESPACE_STD + This is a proof-of-concept implementation. */ + + /* Get locale datatype definition. */ +-# include <xlocale.h> ++# include_next <locale.h> + + /* Return a reference to a data structure representing a set of locale + datasets. Unlike for the CATEGORY parameter for `setlocale' the diff --git a/package/lttng-tools/0001-Fix-detect-dlmopen-and-disable-corresponding-tests-i.patch b/package/lttng-tools/0001-Fix-detect-dlmopen-and-disable-corresponding-tests-i.patch new file mode 100644 index 0000000000..8e14a14413 --- /dev/null +++ b/package/lttng-tools/0001-Fix-detect-dlmopen-and-disable-corresponding-tests-i.patch @@ -0,0 +1,249 @@ +From bc1d8ca01415710d40224de312c7ecf6f4223301 Mon Sep 17 00:00:00 2001 +From: Philippe Proulx <eeppeliteloop@gmail.com> +Date: Mon, 6 Nov 2017 18:46:41 -0500 +Subject: [PATCH] Fix: detect dlmopen() and disable corresponding tests if not + available +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +musl and uClibc-ng are known not to support dlmopen(). LTTng-UST has +this dlmopen() detection. + +Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com> +[Philippe: backport from upstream commit bc1d8ca0 + edited to remove .gitignore part] +Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> +--- + .gitignore | 1 + + configure.ac | 25 ++++++++++++++++++++++ + tests/regression/ust/ust-dl/prog.c | 17 +++++++++++++-- + tests/regression/ust/ust-dl/test_ust-dl | 32 ---------------------------- + tests/regression/ust/ust-dl/test_ust-dl.in | 34 ++++++++++++++++++++++++++++++ + tests/regression/ust/ust-dl/test_ust-dl.py | 9 +++++++- + tests/utils/test_utils.py | 3 +++ + 7 files changed, 86 insertions(+), 35 deletions(-) + delete mode 100755 tests/regression/ust/ust-dl/test_ust-dl + create mode 100644 tests/regression/ust/ust-dl/test_ust-dl.in + +diff --git a/configure.ac b/configure.ac +index 016c56ec..b6ea39c5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -196,6 +196,30 @@ AC_CHECK_FUNCS([ \ + # add -lrt to LIBS + AC_CHECK_LIB([rt], [clock_gettime, timer_create, timer_settime, timer_delete]) + ++# Checks for dl. ++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]) ++ HAVE_DLMOPEN=1 ++], [ ++ HAVE_DLMOPEN=0 ++]) ++AC_SUBST(HAVE_DLMOPEN) ++ + # Babeltrace viewer check + AC_ARG_WITH([babeltrace-bin], + AS_HELP_STRING([--with-babeltrace-bin], +@@ -1100,6 +1124,7 @@ AC_CONFIG_FILES([ + AC_CONFIG_FILES([tests/regression/ust/python-logging/test_python_logging],[chmod +x tests/regression/ust/python-logging/test_python_logging]) + # Inject LTTNG_TOOLS_BUILD_WITH_LIBPFM variable in test script. + AC_CONFIG_FILES([tests/perf/test_perf_raw],[chmod +x tests/perf/test_perf_raw]) ++AC_CONFIG_FILES([tests/regression/ust/ust-dl/test_ust-dl],[chmod +x tests/regression/ust/ust-dl/test_ust-dl]) + + AC_OUTPUT + +diff --git a/tests/regression/ust/ust-dl/prog.c b/tests/regression/ust/ust-dl/prog.c +index e8e4b264..669792d9 100644 +--- a/tests/regression/ust/ust-dl/prog.c ++++ b/tests/regression/ust/ust-dl/prog.c +@@ -13,7 +13,12 @@ + */ + int main(int argc, char **argv) + { +- void *h0, *h1, *h2, *h3, *h4; ++ void *h0, *h2, *h3, *h4; ++ ++#ifdef HAVE_DLMOPEN ++ void *h1; ++#endif ++ + char *error; + int (*foo)(void); + +@@ -21,10 +26,14 @@ int main(int argc, char **argv) + if (!h0) { + goto get_error; + } ++ ++#ifdef HAVE_DLMOPEN + h1 = dlmopen(LM_ID_BASE, "libfoo.so", RTLD_LAZY); + if (!h1) { + goto get_error; + } ++#endif ++ + h2 = dlopen("libzzz.so", RTLD_LAZY); + if (!h2) { + goto get_error; +@@ -38,7 +47,7 @@ int main(int argc, char **argv) + goto get_error; + } + +- foo = dlsym(h1, "foo"); ++ foo = dlsym(h3, "foo"); + error = dlerror(); + if (error != NULL) { + goto error; +@@ -49,9 +58,13 @@ int main(int argc, char **argv) + if (dlclose(h0)) { + goto get_error; + } ++ ++#ifdef HAVE_DLMOPEN + if (dlclose(h1)) { + goto get_error; + } ++#endif ++ + if (dlclose(h2)) { + goto get_error; + } +diff --git a/tests/regression/ust/ust-dl/test_ust-dl b/tests/regression/ust/ust-dl/test_ust-dl +deleted file mode 100755 +index 1f2934db..00000000 +--- a/tests/regression/ust/ust-dl/test_ust-dl ++++ /dev/null +@@ -1,32 +0,0 @@ +-#!/bin/bash +-# +-# Copyright (C) - 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com> +-# +-# This program is free software; you can redistribute it and/or modify it +-# under the terms of the GNU General Public License, version 2 only, as +-# published by the Free Software Foundation. +-# +-# 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. +- +-CURDIR=$(dirname $0) +-TESTDIR=${CURDIR}/../../.. +- +-source $TESTDIR/utils/utils.sh +- +-if [ ! -x "$CURDIR/.libs/libfoo.so" ]; then +- diag "No shared object generated. Skipping all tests." +- exit 0 +-fi +- +-start_lttng_sessiond_notap +- +-python3 ${CURDIR}/test_ust-dl.py +- +-stop_lttng_sessiond_notap +diff --git a/tests/regression/ust/ust-dl/test_ust-dl.in b/tests/regression/ust/ust-dl/test_ust-dl.in +new file mode 100644 +index 00000000..61d00d21 +--- /dev/null ++++ b/tests/regression/ust/ust-dl/test_ust-dl.in +@@ -0,0 +1,34 @@ ++#!/bin/bash ++# ++# Copyright (C) - 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com> ++# ++# This program is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License, version 2 only, as ++# published by the Free Software Foundation. ++# ++# 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. ++ ++CURDIR=$(dirname $0) ++TESTDIR=${CURDIR}/../../.. ++ ++source $TESTDIR/utils/utils.sh ++ ++if [ ! -x "$CURDIR/.libs/libfoo.so" ]; then ++ diag "No shared object generated. Skipping all tests." ++ exit 0 ++fi ++ ++export LTTNG_TOOLS_HAVE_DLMOPEN=@HAVE_DLMOPEN@ ++ ++start_lttng_sessiond_notap ++ ++python3 ${CURDIR}/test_ust-dl.py ++ ++stop_lttng_sessiond_notap +diff --git a/tests/regression/ust/ust-dl/test_ust-dl.py b/tests/regression/ust/ust-dl/test_ust-dl.py +index 81972a7d..72459840 100644 +--- a/tests/regression/ust/ust-dl/test_ust-dl.py ++++ b/tests/regression/ust/ust-dl/test_ust-dl.py +@@ -31,6 +31,9 @@ sys.path.append(test_utils_path) + from test_utils import * + + ++have_dlmopen = (os.environ.get('LTTNG_TOOLS_HAVE_DLMOPEN') == '1') ++ ++ + NR_TESTS = 14 + current_test = 1 + print("1..{0}".format(NR_TESTS)) +@@ -113,7 +116,11 @@ current_test += 1 + print_test_result(dlopen_event_found > 0, current_test, "lttng_ust_dl:dlopen event found in resulting trace") + current_test += 1 + +-print_test_result(dlmopen_event_found > 0, current_test, "lttng_ust_dl:dlmopen event found in resulting trace") ++if have_dlmopen: ++ print_test_result(dlmopen_event_found > 0, current_test, "lttng_ust_dl:dlmopen event found in resulting trace") ++else: ++ skip_test(current_test, 'dlmopen() is not available') ++ + current_test += 1 + + print_test_result(build_id_event_found > 0, current_test, "lttng_ust_dl:build_id event found in resulting trace") +diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py +index 4b38630c..02e632a2 100644 +--- a/tests/utils/test_utils.py ++++ b/tests/utils/test_utils.py +@@ -62,6 +62,9 @@ def print_test_result(result, number, description): + result_string += " {0} - {1}".format(number, description) + print(result_string) + ++def skip_test(number, description): ++ print('ok {} # skip {}'.format(number, description)) ++ + def enable_ust_tracepoint_event(session_info, event_name): + event = Event() + event.name = event_name +-- +2.15.0 + diff --git a/package/lttng-tools/0002-Fix-src-common-pipe.h-include-sys-types.h-for-ssize_.patch b/package/lttng-tools/0002-Fix-src-common-pipe.h-include-sys-types.h-for-ssize_.patch new file mode 100644 index 0000000000..914947684d --- /dev/null +++ b/package/lttng-tools/0002-Fix-src-common-pipe.h-include-sys-types.h-for-ssize_.patch @@ -0,0 +1,31 @@ +From 40dde31f7eeb71af169b97b82d8fd1739895dfc3 Mon Sep 17 00:00:00 2001 +From: Philippe Proulx <eeppeliteloop@gmail.com> +Date: Wed, 8 Nov 2017 15:19:24 -0500 +Subject: [PATCH] Fix: src/common/pipe.h: include <sys/types.h> for ssize_t and + mode_t +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com> +[Philippe: backport from upstream commit 40dde31f] +Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> +--- + src/common/pipe.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/common/pipe.h b/src/common/pipe.h +index 2d4fc967..30f7c3f3 100644 +--- a/src/common/pipe.h ++++ b/src/common/pipe.h +@@ -20,6 +20,7 @@ + + #include <pthread.h> + #include <common/macros.h> ++#include <sys/types.h> + + enum lttng_pipe_state { + LTTNG_PIPE_STATE_OPENED = 1, +-- +2.15.0 + diff --git a/package/lttng-tools/0003-Fix-warning-src-bin-lttng-utils.c-cast-incompatible-.patch b/package/lttng-tools/0003-Fix-warning-src-bin-lttng-utils.c-cast-incompatible-.patch new file mode 100644 index 0000000000..b353b8f48a --- /dev/null +++ b/package/lttng-tools/0003-Fix-warning-src-bin-lttng-utils.c-cast-incompatible-.patch @@ -0,0 +1,32 @@ +From 56efeab366da412ee4196107c08174f32ed83c9a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?= + <jeremie.galarneau@efficios.com> +Date: Mon, 13 Nov 2017 10:31:29 -0500 +Subject: [PATCH] Fix warning: src/bin/lttng/utils.c: cast incompatible pointer +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reported-by: Philippe Proulx <eeppeliteloop@gmail.com> +[Philippe: backport from upstream commit 56efeab3] +Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> +--- + src/bin/lttng/utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c +index 885f498b..52a2440e 100644 +--- a/src/bin/lttng/utils.c ++++ b/src/bin/lttng/utils.c +@@ -387,7 +387,7 @@ int check_relayd(void) + * A successful connect means the relayd exists thus returning 0 else a + * negative value means it does NOT exists. + */ +- ret = connect(fd, &sin, sizeof(sin)); ++ ret = connect(fd, (struct sockaddr *) &sin, sizeof(sin)); + if (ret < 0) { + /* Not found. */ + ret = 0; +-- +2.15.0 + diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index 776750c63e..451f652cdc 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -10,7 +10,8 @@ LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ (include/lttng/*, src/lib/lttng-ctl/*) LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE LTTNG_TOOLS_CONF_OPTS += --disable-man-pages - +# 0001-Fix-detect-dlmopen-and-disable-corresponding-tests-i.patch +LTTNG_TOOLS_AUTORECONF = YES LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y) diff --git a/package/mp4v2/0001-Fix-GCC7-build.patch b/package/mp4v2/0001-Fix-GCC7-build.patch new file mode 100644 index 0000000000..90222c10ae --- /dev/null +++ b/package/mp4v2/0001-Fix-GCC7-build.patch @@ -0,0 +1,32 @@ +From 855e9674232808ff3be7191b697dfb56917db21f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com> +Date: Wed, 8 Feb 2017 00:56:32 +0000 +Subject: [PATCH] Fix GCC7 build + +if (*pSlash != '\0') { + +As it stands the body of that if will always execute and when there are +no encoding parameters ppEncodingParams will be returned as a pointer to +an empty string rather than as a null pointer + +Signed-off-by: Peter Korsgaard <peter@korsgaard.com> +--- + src/rtphint.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/rtphint.cpp b/src/rtphint.cpp +index e07309d..1eb01f5 100644 +--- a/src/rtphint.cpp ++++ b/src/rtphint.cpp +@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload( + pSlash = strchr(pSlash, '/'); + if (pSlash != NULL) { + pSlash++; +- if (pSlash != '\0') { ++ if (*pSlash != '\0') { + length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap); + *ppEncodingParams = (char *)MP4Calloc(length + 1); + strncpy(*ppEncodingParams, pSlash, length); +-- +2.11.0 + diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index 5db548fad9..1a6218831e 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -13,9 +13,13 @@ MTOOLS_CONF_OPTS = --without-x # info documentation not needed MTOOLS_CONF_ENV = \ ac_cv_func_setpgrp_void=yes \ + ac_cv_lib_bsd_gethostbyname=no \ + ac_cv_lib_bsd_main=no \ ac_cv_path_INSTALL_INFO= HOST_MTOOLS_CONF_ENV = \ + ac_cv_lib_bsd_gethostbyname=no \ + ac_cv_lib_bsd_main=no \ ac_cv_path_INSTALL_INFO= # link with iconv if enabled diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk index 1b15937ea1..eb4fbbbc27 100644 --- a/package/ndisc6/ndisc6.mk +++ b/package/ndisc6/ndisc6.mk @@ -11,7 +11,7 @@ NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99" LIBS=$(TARGET_NLS_LIBS) NDISC6_CONF_OPTS = --disable-rpath --disable-suid-install NDISC6_LICENSE = GPL-2.0 or GPL-3.0 NDISC6_LICENSE_FILES = COPYING -NDISC8_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +NDISC6_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) NDISC6_BIN_ += dnssort # perl script NDISC6_BIN_$(BR2_PACKAGE_NDISC6_NAME2ADDR) += name2addr addr2name diff --git a/package/oracle-mysql/0008-gcc7.patch b/package/oracle-mysql/0008-gcc7.patch index 2cf6d26125..321112d635 100644 --- a/package/oracle-mysql/0008-gcc7.patch +++ b/package/oracle-mysql/0008-gcc7.patch @@ -4,15 +4,17 @@ mysql.cc: In function 'void build_completion_hash(bool, bool)': mysql.cc:2687:37: error: invalid conversion from 'char' to 'char*' [-fpermissive] field_names[i][num_fields*2]= '\0'; ^~~~ - Patch was partly backported from upstream commit: https://github.com/mysql/mysql-server/commit/ae21683d980d5fe9e39bd0193827ea3604256eb9 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> +[Thomas: add more gcc 7.x fixes in instance_map.cc.] +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -diff -uNr mysql-5.1.73.org/client/mysql.cc mysql-5.1.73/client/mysql.cc ---- mysql-5.1.73.org/client/mysql.cc 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/client/mysql.cc 2017-05-13 19:52:10.125101101 +0200 +Index: b/client/mysql.cc +=================================================================== +--- a/client/mysql.cc ++++ b/client/mysql.cc @@ -2684,7 +2684,7 @@ mysql_free_result(fields); break; @@ -22,3 +24,22 @@ diff -uNr mysql-5.1.73.org/client/mysql.cc mysql-5.1.73/client/mysql.cc j=0; while ((sql_field=mysql_fetch_field(fields))) { +Index: b/server-tools/instance-manager/instance_map.cc +=================================================================== +--- a/server-tools/instance-manager/instance_map.cc ++++ b/server-tools/instance-manager/instance_map.cc +@@ -526,12 +526,12 @@ + Options::Main::config_file); + + argv_options[1]= defaults_file_arg; +- argv_options[2]= '\0'; ++ argv_options[2]= NULL; + + argc= 2; + } + else +- argv_options[1]= '\0'; ++ argv_options[1]= NULL; + + /* + If the routine failed, we'll simply fallback to defaults in diff --git a/package/parted/0001-libparted-arch-linux.c-Compile-without-ENABLE_DEVICE.patch b/package/parted/0001-libparted-arch-linux.c-Compile-without-ENABLE_DEVICE.patch index 5adc9beb12..1cf699bb12 100644 --- a/package/parted/0001-libparted-arch-linux.c-Compile-without-ENABLE_DEVICE.patch +++ b/package/parted/0001-libparted-arch-linux.c-Compile-without-ENABLE_DEVICE.patch @@ -1,4 +1,4 @@ -From 7e87ca3c531228d35e13e802d2622006138b104c Mon Sep 17 00:00:00 2001 +From 141c4309d7164dcd4e09d137fc075c1726fd8dbb Mon Sep 17 00:00:00 2001 From: Felix Janda <felix.janda@posteo.de> Date: Sun, 3 May 2015 10:33:15 +0200 Subject: [PATCH] libparted/arch/linux.c: Compile without ENABLE_DEVICE_MAPPER @@ -10,7 +10,7 @@ Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index 90ab21d..f6141e4 100644 +index 0f18904..cf38c6f 100644 --- a/libparted/arch/linux.c +++ b/libparted/arch/linux.c @@ -2304,6 +2304,7 @@ zasprintf (const char *format, ...) @@ -57,7 +57,7 @@ index 90ab21d..f6141e4 100644 return result; } -@@ -2958,12 +2968,15 @@ _disk_sync_part_table (PedDisk* disk) +@@ -2945,12 +2955,15 @@ _disk_sync_part_table (PedDisk* disk) unsigned long long *length); @@ -75,5 +75,5 @@ index 90ab21d..f6141e4 100644 remove_partition = _blkpg_remove_partition; #ifdef BLKPG_RESIZE_PARTITION -- -2.1.4 +2.14.2 diff --git a/package/parted/0002-configure.ac-uclinux-is-also-linux.patch b/package/parted/0002-configure.ac-uclinux-is-also-linux.patch index b2119bcdd7..5a264ced80 100644 --- a/package/parted/0002-configure.ac-uclinux-is-also-linux.patch +++ b/package/parted/0002-configure.ac-uclinux-is-also-linux.patch @@ -1,4 +1,4 @@ -From b3958317c5ee2940e7024bec2e7f288b5a6a26c3 Mon Sep 17 00:00:00 2001 +From 7697d9c54e489b32b82c01f17db04f8b51857e51 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias <gustavo@zacarias.com.ar> Date: Mon, 30 Jun 2014 10:09:04 -0300 Subject: [PATCH] configure.ac: uclinux is also linux @@ -29,5 +29,5 @@ index 436d0e2..50ad478 100644 AC_SUBST([OS]) -- -1.8.5.5 +2.14.2 diff --git a/package/parted/0003-Include-fcntl.h-to-get-loff_t-definition.patch b/package/parted/0003-Include-fcntl.h-to-get-loff_t-definition.patch new file mode 100644 index 0000000000..752938ab7f --- /dev/null +++ b/package/parted/0003-Include-fcntl.h-to-get-loff_t-definition.patch @@ -0,0 +1,29 @@ +From 2078c07d38ee7841b89ac8d81afc5e8bfcd4f703 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Sun, 8 Oct 2017 00:58:58 +0200 +Subject: [PATCH] Include <fcntl.h> to get loff_t definition + +Patch borrowed from Alpine Linux at +http://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch. Solves +build with musl. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + libparted/fs/xfs/platform_defs.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libparted/fs/xfs/platform_defs.h b/libparted/fs/xfs/platform_defs.h +index 2b55752..17023dc 100644 +--- a/libparted/fs/xfs/platform_defs.h ++++ b/libparted/fs/xfs/platform_defs.h +@@ -35,6 +35,7 @@ + #define __XFS_PLATFORM_DEFS_H__ + + #include <stdio.h> ++#include <fcntl.h> + #include <stdarg.h> + #include <assert.h> + #include <endian.h> +-- +2.14.2 + diff --git a/package/parted/0003-fix-includes-for-musl.patch b/package/parted/0003-fix-includes-for-musl.patch deleted file mode 100644 index 28c94ace7c..0000000000 --- a/package/parted/0003-fix-includes-for-musl.patch +++ /dev/null @@ -1,18 +0,0 @@ -Include <fcntl.h> to get loff_t definition - -Patch borrowed from Alpine Linux at -http://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch. Solves -build with musl. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - ---- parted-3.1.orig/libparted/fs/xfs/platform_defs.h -+++ parted-3.1/libparted/fs/xfs/platform_defs.h -@@ -35,6 +35,7 @@ - #define __XFS_PLATFORM_DEFS_H__ - - #include <stdio.h> -+#include <fcntl.h> - #include <stdarg.h> - #include <assert.h> - #include <endian.h> diff --git a/package/parted/0004-libparted-labels-link-with-libiconv-if-needed.patch b/package/parted/0004-libparted-labels-link-with-libiconv-if-needed.patch new file mode 100644 index 0000000000..a4a1b00331 --- /dev/null +++ b/package/parted/0004-libparted-labels-link-with-libiconv-if-needed.patch @@ -0,0 +1,54 @@ +From dd17f55b2ac189ccd3b8025e4f6509537d00f9d3 Mon Sep 17 00:00:00 2001 +From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be> +Date: Sun, 8 Oct 2017 00:53:31 +0200 +Subject: [PATCH] libparted/labels: link with libiconv if needed + +gpt.c uses iconv so it should link with it. Otherwise, on platforms +where libiconv is a separate library, we get a link failure of parted: + + CCLD parted + ../libparted/.libs/libparted.so: undefined reference to `libiconv' + ../libparted/.libs/libparted.so: undefined reference to `libiconv_open' + ../libparted/.libs/libparted.so: undefined reference to `libiconv_close' + +Since iconv functionality is needed unconditionally (not only when +gettext is enabled), AM_ICONV needs to be added to configure.ac. + +Upstream status: sent to mailing list +http://lists.alioth.debian.org/pipermail/parted-devel/2017-November/005131.html + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> +--- + configure.ac | 2 ++ + libparted/labels/Makefile.am | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 50ad478..62f1b4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -288,6 +288,8 @@ fi + AC_PROG_LIBTOOL + LT_INIT + ++AM_ICONV ++ + AM_GNU_GETTEXT_VERSION([0.18]) + AM_GNU_GETTEXT([external]) + if test "$USE_INCLUDED_LIBINTL" = "yes"; then +diff --git a/libparted/labels/Makefile.am b/libparted/labels/Makefile.am +index c996f81..b204379 100644 +--- a/libparted/labels/Makefile.am ++++ b/libparted/labels/Makefile.am +@@ -35,7 +35,7 @@ liblabels_la_SOURCES = \ + rdb.c \ + sun.c + +-liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS) ++liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS) $(LIBICONV) + + AM_CPPFLAGS = $(partedincludedir) $(INTLINCS) + +-- +2.14.2 + diff --git a/package/parted/parted.mk b/package/parted/parted.mk index 35d152b469..1f0428a55b 100644 --- a/package/parted/parted.mk +++ b/package/parted/parted.mk @@ -9,7 +9,8 @@ PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz PARTED_SITE = $(BR2_GNU_MIRROR)/parted PARTED_DEPENDENCIES = host-pkgconf util-linux PARTED_INSTALL_STAGING = YES -# For uclinux patch +# 0002-configure.ac-uclinux-is-also-linux.patch +# 0004-libparted-labels-link-with-libiconv-if-needed.patch PARTED_AUTORECONF = YES PARTED_GETTEXTIZE = YES PARTED_LICENSE = GPL-3.0+ @@ -29,6 +30,10 @@ else PARTED_CONF_OPTS += --disable-device-mapper endif +ifeq ($(BR2_PACKAGE_LIBICONV),y) +PARTED_DEPENDENCIES += libiconv +endif + ifeq ($(BR2_STATIC_LIBS),y) PARTED_CONF_OPTS += --disable-dynamic-loading endif diff --git a/package/pdbg/0001-libpdbg-Remove-unused-__unused-from-compiler.h.patch b/package/pdbg/0001-libpdbg-Remove-unused-__unused-from-compiler.h.patch deleted file mode 100644 index e778f283d7..0000000000 --- a/package/pdbg/0001-libpdbg-Remove-unused-__unused-from-compiler.h.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5a85b8c78846b342bdeba37caed03b64b1dd2864 Mon Sep 17 00:00:00 2001 -From: Joel Stanley <joel@jms.id.au> -Date: Tue, 3 Oct 2017 21:37:46 +1030 -Subject: [PATCH] libpdbg: Remove unused __unused from compiler.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The compiler.h header contains a macro that defines __unused. When -building against uClibc this collides with uClibc_stdio.h: - -In file included from /usr/include/stdio.h:71:0, - from libpdbg/fake.c:17: -/usr/include/bits/uClibc_stdio.h:149:16: error: expected identifier or ‘(’ before ‘;’ token - void *__unused; /* Placeholder for codeset binding. */ - ^ - -As it is unused in pdbg, remove it. - -Signed-off-by: Joel Stanley <joel@jms.id.au> ---- - libpdbg/compiler.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/libpdbg/compiler.h b/libpdbg/compiler.h -index 35bf16525761..86bd9673ac36 100644 ---- a/libpdbg/compiler.h -+++ b/libpdbg/compiler.h -@@ -24,7 +24,6 @@ - /* Macros for various compiler bits and pieces */ - #define __packed __attribute__((packed)) - #define __align(x) __attribute__((__aligned__(x))) --#define __unused __attribute__((unused)) - #define __used __attribute__((used)) - #define __section(x) __attribute__((__section__(x))) - #define __noreturn __attribute__((noreturn)) --- -2.14.1 - diff --git a/package/pdbg/0001-template.S-fix-to-build-on-architecture-with-non-emp.patch b/package/pdbg/0001-template.S-fix-to-build-on-architecture-with-non-emp.patch new file mode 100644 index 0000000000..15c0eef611 --- /dev/null +++ b/package/pdbg/0001-template.S-fix-to-build-on-architecture-with-non-emp.patch @@ -0,0 +1,63 @@ +From 50ae93273376ede704012030009c29bd58d6a569 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Sun, 26 Nov 2017 16:22:25 +0100 +Subject: [PATCH] template.S: fix to build on architecture with non-empty + __USER_LABEL_PREFIX__ + +Blackfin has a non-empty __USER_LABEL_PREFIX__, which means that a +symbol called "foo" in C must be named "_foo" in assembler. + +Interestingly, it seems like "$(CC) -xassembler - -c" doesn't pass the +input source file through the C preprocessor, so we do this +explicitly. + +Submitted-upstream: https://github.com/open-power/pdbg/pull/26 +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + Makefile.am | 2 +- + template.S | 22 +++++++++++++++------- + 2 files changed, 16 insertions(+), 8 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 9d34bff..82e0856 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -62,4 +62,4 @@ p9z-fsi.dtb.o: p9z-fsi.dts p9-fsi.dtsi + %.dtb.o: %.dts + dtc -i$(dir $@) -I dts $< -O dtb > $@.tmp + symbol_prefix=`echo $@ | tr '.-' '_'` ; \ +- sed "s%SYMBOL_PREFIX%$${symbol_prefix}%g; s%FILENAME%$@.tmp%g" $(top_srcdir)/template.S | $(CC) -xassembler - -c -o $@ ++ sed "s%SYMBOL_PREFIX%$${symbol_prefix}%g; s%FILENAME%$@.tmp%g" $(top_srcdir)/template.S | $(CPP) - | $(CC) -xassembler - -c -o $@ +diff --git a/template.S b/template.S +index 2e6cbdb..1407a7c 100644 +--- a/template.S ++++ b/template.S +@@ -1,10 +1,18 @@ ++#ifdef __USER_LABEL_PREFIX__ ++#define CONCAT1(a, b) CONCAT2(a, b) ++#define CONCAT2(a, b) a ## b ++#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x) ++#else ++#define SYM(x) x ++#endif ++ + .section .data +-_binary_SYMBOL_PREFIX_start: ++SYM(_binary_SYMBOL_PREFIX_start): + .incbin "FILENAME" + .align 4 +-_binary_SYMBOL_PREFIX_end: +-_binary_SYMBOL_PREFIX_size: +- .long _binary_SYMBOL_PREFIX_end - _binary_SYMBOL_PREFIX_start +-.globl _binary_SYMBOL_PREFIX_start +-.globl _binary_SYMBOL_PREFIX_end +-.globl _binary_SYMBOL_PREFIX_size ++SYM(_binary_SYMBOL_PREFIX_end): ++SYM(_binary_SYMBOL_PREFIX_size): ++ .long SYM(_binary_SYMBOL_PREFIX_end) - SYM(_binary_SYMBOL_PREFIX_start) ++.globl SYM(_binary_SYMBOL_PREFIX_start) ++.globl SYM(_binary_SYMBOL_PREFIX_end) ++.globl SYM(_binary_SYMBOL_PREFIX_size) +-- +2.13.6 + diff --git a/package/pdbg/Config.in b/package/pdbg/Config.in index 3e23c210c9..4a902694f5 100644 --- a/package/pdbg/Config.in +++ b/package/pdbg/Config.in @@ -2,9 +2,9 @@ config BR2_PACKAGE_PDBG bool "pdbg" help PowerPC FSI Debugger, for low level debugging of a IBM - Power8 CPU over FSI. + Power8 and Power9 CPU over FSI. pdbg runs on a BMC, which is generally an ARM-powered system - monitoring/controlling a host CPU. + monitoring/controlling a host CPU. It can also run on the host. https://github.com/open-power/pdbg diff --git a/package/pdbg/pdbg.hash b/package/pdbg/pdbg.hash index 2aec718177..6fef128084 100644 --- a/package/pdbg/pdbg.hash +++ b/package/pdbg/pdbg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 e0b81fc65eb83692c5c07d7ae109882cefebf663444b7ea804d0544451c1a72f pdbg-77158819158d1d7053a737ac090d04fdfbfe9265.tar.gz +sha256 e9143607b0d15693ace9f50b27f931020127a9d605c45f8609f1fe8608be7949 pdbg-527fe54e1c95e031efd3db008c3f4e096cb3ea58.tar.gz diff --git a/package/pdbg/pdbg.mk b/package/pdbg/pdbg.mk index 70adb0a166..f16a392aa6 100644 --- a/package/pdbg/pdbg.mk +++ b/package/pdbg/pdbg.mk @@ -4,7 +4,7 @@ # ################################################################################ -PDBG_VERSION = 77158819158d1d7053a737ac090d04fdfbfe9265 +PDBG_VERSION = 527fe54e1c95e031efd3db008c3f4e096cb3ea58 PDBG_SITE = $(call github,open-power,pdbg,$(PDBG_VERSION)) PDBG_LICENSE = Apache-2.0 PDBG_LICENSE_FILES = COPYING diff --git a/package/pkg-download.mk b/package/pkg-download.mk index dc4ff1c8c7..fbbc2d7391 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -52,8 +52,8 @@ notdomain = $(patsubst $(call domain,$(1),$(2))$(call domainseparator,$(2))%,%,$ # default domainseparator is /, specify alternative value as first argument domainseparator = $(if $(1),$(1),/) -# github(user,package[,version]): returns site of GitHub repository -github = https://github.com/$(1)/$(2)/archive/$(or $(3),$($(call UPPERCASE,$(pkgname))_VERSION)) +# github(user,package,version): returns site of GitHub repository +github = https://github.com/$(1)/$(2)/archive/$(3) # Expressly do not check hashes for those files # Exported variables default to immediately expanded in some versions of diff --git a/package/qt/0015-configure-fix-build-on-non-x86-platforms.patch b/package/qt/0015-configure-fix-build-on-non-x86-platforms.patch new file mode 100644 index 0000000000..a5995484c8 --- /dev/null +++ b/package/qt/0015-configure-fix-build-on-non-x86-platforms.patch @@ -0,0 +1,146 @@ +From 02e9698c96ca78342b82fa7239e93bab4aa45db2 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Fri, 17 Nov 2017 22:20:06 +0100 +Subject: [PATCH] configure: fix build on non-x86 platforms + +When building for an uncommon platform on a ppc64le machine, Qt build +fails because it builds qmake with the target compiler instead of +using the host compiler. This is due to the fact that Qt configure +script believes that both the host and target platforms are "powerpc", +even though the target really is Xtensa or ARC for example. + +Qt's configure script defines a variable called PLATFORM that points to +the mkspecs describing the host machine. For x86, its value is +qws/linux-x86-g++ and for x86-64, its value is +qws/linux-x86_64-g++. For any other host architecture, its value is +qws/linux-generic-g++. + +In parallel to this, Qt's configure script defines a variable called +XPLATFORM that points to the mkspecs describing the target machine. It +points to qws/linux-${CFG_EMBEDDED}-g++, where CFG_EMBEDDED is +simply "generic" for most uncommon architectures. + +Therefore, when we're building for an uncommon architecture, on a +ppc64le machine, we have: + + PLATFORM = qws/linux-generic-g++ + XPLATFORM = qws/linux-generic-g++ + +i.e, both values are equal. Due to this, the following condition is +false: + +if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then + +which causes Qt's configure script to fallback to: + +elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then + CFG_ARCH=$CFG_HOST_ARCH +fi + +because CFG_ARCH is not defined, and therefore gets defined to +CFG_HOST_ARCH. So we have CFG_ARCH == CFG_HOST_ARCH, and Qt believes +we're doing a native build. + +Therefore, we need to ensure that PLATFORM and XPLATFORM always have a +different value. To achieve this, we create a +qws/linux-host-generic-g++ mkspecs, which is always used as +PLATFORM. It is identical to qws/linux-x86-g++. Compared to +qws/linux-x86_64-g++, the only difference is that we're not passing +the -m64 flag, but that isn't needed when building host tools. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + configure | 8 +---- + mkspecs/qws/linux-host-generic-g++/qmake.conf | 10 ++++++ + mkspecs/qws/linux-host-generic-g++/qplatformdefs.h | 42 ++++++++++++++++++++++ + 3 files changed, 53 insertions(+), 7 deletions(-) + create mode 100644 mkspecs/qws/linux-host-generic-g++/qmake.conf + create mode 100644 mkspecs/qws/linux-host-generic-g++/qplatformdefs.h + +diff --git a/configure b/configure +index 10ad7ca0b0..d25f90be1e 100755 +--- a/configure ++++ b/configure +@@ -2806,14 +2806,8 @@ if [ "$CFG_EMBEDDED" != "no" ]; then + Linux:*) + if [ -z "$PLATFORM" ]; then + case "$UNAME_MACHINE" in +- *86) +- PLATFORM=qws/linux-x86-g++ +- ;; +- *86_64) +- PLATFORM=qws/linux-x86_64-g++ +- ;; + *) +- PLATFORM=qws/linux-generic-g++ ++ PLATFORM=qws/linux-host-generic-g++ + ;; + esac + fi +diff --git a/mkspecs/qws/linux-host-generic-g++/qmake.conf b/mkspecs/qws/linux-host-generic-g++/qmake.conf +new file mode 100644 +index 0000000000..55011ec52b +--- /dev/null ++++ b/mkspecs/qws/linux-host-generic-g++/qmake.conf +@@ -0,0 +1,10 @@ ++# ++# qmake configuration for building with linux-g++ ++# ++ ++include(../../common/linux.conf) ++include(../../common/gcc-base-unix.conf) ++include(../../common/g++-unix.conf) ++include(../../common/qws.conf) ++ ++load(qt_config) +diff --git a/mkspecs/qws/linux-host-generic-g++/qplatformdefs.h b/mkspecs/qws/linux-host-generic-g++/qplatformdefs.h +new file mode 100644 +index 0000000000..a654aa78a2 +--- /dev/null ++++ b/mkspecs/qws/linux-host-generic-g++/qplatformdefs.h +@@ -0,0 +1,42 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2015 The Qt Company Ltd. ++** Contact: http://www.qt.io/licensing/ ++** ++** This file is part of the qmake spec of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see http://www.qt.io/terms-conditions. For further ++** information use the contact form at http://www.qt.io/contact-us. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 or version 3 as published by the Free ++** Software Foundation and appearing in the file LICENSE.LGPLv21 and ++** LICENSE.LGPLv3 included in the packaging of this file. Please review the ++** following information to ensure the GNU Lesser General Public License ++** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ++** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** As a special exception, The Qt Company gives you certain additional ++** rights. These rights are described in The Qt Company LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include "../../linux-g++/qplatformdefs.h" +-- +2.13.6 + diff --git a/package/qt5/qt5connectivity/5.9.2/0001-Example-heartrate-server-needs-only-core-and-bluetoo.patch b/package/qt5/qt5connectivity/5.9.2/0001-Example-heartrate-server-needs-only-core-and-bluetoo.patch new file mode 100644 index 0000000000..cb0e8d18b1 --- /dev/null +++ b/package/qt5/qt5connectivity/5.9.2/0001-Example-heartrate-server-needs-only-core-and-bluetoo.patch @@ -0,0 +1,32 @@ +From 13c2f56cc9c3bbfe0c96031107e7fafd437703d9 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <ps.report@gmx.net> +Date: Sat, 18 Nov 2017 21:07:44 +0100 +Subject: [PATCH] Example heartrate-server needs only core and bluetooth module + +Fixes compile with disabled gui module. + +Task-number: QTBUG-64597 +Change-Id: I376dede3db987e524f97070344cc119e0ee1d187 + +Upstream: https://codereview.qt-project.org/211810 +Signed-off-by: Peter Seiderer <ps.report@gmx.net> +--- + examples/bluetooth/heartrate-server/heartrate-server.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/bluetooth/heartrate-server/heartrate-server.pro b/examples/bluetooth/heartrate-server/heartrate-server.pro +index 4ccf486c..edd011b9 100644 +--- a/examples/bluetooth/heartrate-server/heartrate-server.pro ++++ b/examples/bluetooth/heartrate-server/heartrate-server.pro +@@ -1,7 +1,7 @@ + TEMPLATE = app + TARGET = heartrate-server + +-QT += bluetooth ++QT = core bluetooth + CONFIG += c++11 + + SOURCES += main.cpp +-- +2.14.2 + diff --git a/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch b/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch new file mode 100644 index 0000000000..8406ace9a3 --- /dev/null +++ b/package/qt5/qt5declarative/5.9.2/0001-Fix-no-opengl-builds.patch @@ -0,0 +1,32 @@ +From 66429b5f6986bde1f491699216f095c5e25023cf Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@qt.io> +Date: Mon, 25 Sep 2017 16:53:24 +0200 +Subject: [PATCH] Fix no-opengl builds + +The qquickwidgets examples uses OpenGL directly + +Change-Id: I1cc8cfbcf249abc98473287a9d499032232828c7 +Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> + +Upstream: https://code.qt.io/cgit/qt/qtdeclarative.git/patch/?id=fa52bb665d6beb77a951c14c8edcba3541850afc +Signed-off-by: Peter Seiderer <ps.report@gmx.net> +--- + examples/quick/quick.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro +index 445dfb0f..7da255e9 100644 +--- a/examples/quick/quick.pro ++++ b/examples/quick/quick.pro +@@ -36,7 +36,7 @@ qtConfig(opengl(es1|es2)?) { + # Widget dependent examples + qtHaveModule(widgets) { + SUBDIRS += embeddedinwidgets +- qtHaveModule(quickwidgets): SUBDIRS += quickwidgets ++ qtHaveModule(quickwidgets):qtConfig(opengl(es1|es2)?): SUBDIRS += quickwidgets + } + + EXAMPLE_FILES = \ +-- +2.15.0 + diff --git a/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch b/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch new file mode 100644 index 0000000000..f3b590eadd --- /dev/null +++ b/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch @@ -0,0 +1,93 @@ +From bf172ae289a1348842005a9421797970f9b72060 Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev <annulen@yandex.ru> +Date: Thu, 4 May 2017 15:12:37 +0300 +Subject: [PATCH] Fix compilation with ICU 59 + +Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 + +Task-number: QTBUG-60532 +Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 +Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> +Signed-off-by: Peter Korsgaard <peter@korsgaard.com> +--- + Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++--- + Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++- + Source/WTF/wtf/TypeTraits.h | 3 +++ + Source/WebKit2/Shared/API/c/WKString.cpp | 2 +- + 4 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp +index 812f3d413..77a3fd0f4 100644 +--- a/Source/JavaScriptCore/API/JSStringRef.cpp ++++ b/Source/JavaScriptCore/API/JSStringRef.cpp +@@ -37,7 +37,7 @@ using namespace WTF::Unicode; + JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(chars, numChars).leakRef(); ++ return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef(); + } + + JSStringRef JSStringCreateWithUTF8CString(const char* string) +@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) + JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); ++ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); + } + + JSStringRef JSStringRetain(JSStringRef string) +@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) + + const JSChar* JSStringGetCharactersPtr(JSStringRef string) + { +- return string->characters(); ++ return reinterpret_cast<const JSChar*>(string->characters()); + } + + size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) +diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp +index 0b57f012d..05e27338b 100644 +--- a/Source/JavaScriptCore/runtime/DateConversion.cpp ++++ b/Source/JavaScriptCore/runtime/DateConversion.cpp +@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as + #if OS(WINDOWS) + TIME_ZONE_INFORMATION timeZoneInformation; + GetTimeZoneInformation(&timeZoneInformation); +- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName)); + #else + struct tm gtm = t; + char timeZoneName[70]; +diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h +index 9df2c95cf..f5d6121fd 100644 +--- a/Source/WTF/wtf/TypeTraits.h ++++ b/Source/WTF/wtf/TypeTraits.h +@@ -72,6 +72,9 @@ namespace WTF { + template<> struct IsInteger<unsigned long> { static const bool value = true; }; + template<> struct IsInteger<long long> { static const bool value = true; }; + template<> struct IsInteger<unsigned long long> { static const bool value = true; }; ++#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) ++ template<> struct IsInteger<char16_t> { static const bool value = true; }; ++#endif + #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) + template<> struct IsInteger<wchar_t> { static const bool value = true; }; + #endif +diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp +index cbac67dd8..23400a64e 100644 +--- a/Source/WebKit2/Shared/API/c/WKString.cpp ++++ b/Source/WebKit2/Shared/API/c/WKString.cpp +@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) + size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) + { + COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); +- return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength)); ++ return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength)); + } + + size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) +-- +2.11.0 + diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash index 1a5e72664f..aa3a71c8d0 100644 --- a/package/qt5/qt5webkit/qt5webkit.hash +++ b/package/qt5/qt5webkit/qt5webkit.hash @@ -1,5 +1,5 @@ -# Hash from: http://download.qt.io/snapshots/qt/5.6/5.6.3/latest_src/submodules/qtwebkit-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 qtwebkit-opensource-src-5.6.3.tar.xz +# Hash from: http://download.qt.io/community_releases/5.6/5.6.3/qtwebkit-opensource-src-5.6.3.tar.xz.mirrorlist +sha256 098c6bb25798fbf1b619b540621287787064efc9b586d76ac0ce7e39b87a3896 qtwebkit-opensource-src-5.6.3.tar.xz # hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz.mirrorlist sha256 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf qtwebkit-opensource-src-5.9.1.tar.xz diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 6e982e6bc7..7925b114e6 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -10,7 +10,7 @@ QT5WEBKIT_VERSION = 5.9.1 QT5WEBKIT_SITE = http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules else QT5WEBKIT_VERSION = $(QT5_VERSION) -QT5WEBKIT_SITE = $(QT5_SITE) +QT5WEBKIT_SITE = http://download.qt.io/community_releases/5.6/$(QT5_VERSION) endif QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz diff --git a/package/rauc/Config.in.host b/package/rauc/Config.in.host index a58685a2e6..1bd9a7935a 100644 --- a/package/rauc/Config.in.host +++ b/package/rauc/Config.in.host @@ -1,5 +1,6 @@ config BR2_PACKAGE_HOST_RAUC bool "host rauc" + select BR2_PACKAGE_HOST_SQUASHFS # run-time dependency help RAUC is the Robust Auto-Update Controller developed by Pengutronix. Enable this option to build the rauc diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 11991edef0..4909062cf5 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -29,7 +29,7 @@ ifeq ($(BR2_PACKAGE_SYSTEMD),y) RAUC_DEPENDENCIES += systemd endif -HOST_RAUC_DEPENDENCIES = host-pkgconf host-openssl host-libglib2 +HOST_RAUC_DEPENDENCIES = host-pkgconf host-openssl host-libglib2 host-squashfs HOST_RAUC_CONF_OPTS += --disable-network --disable-json --disable-service $(eval $(autotools-package)) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 08e306d0dc..3e188c5c79 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 3ffefd293932d2ad509701878dd7dd6ef498c3667198a33e8e5d5a3cbce0eeaa runc-v1.0.0-rc4.tar.gz +sha256 b5c50d7d9a5f610d5424f96196efa306ec708fd9299302dd919545099c16b7c1 runc-9c2d8d184e5da67c95d601382adf14862e4f2228.tar.gz diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 0b51e11896..fb3fec20f5 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = v1.0.0-rc4 +RUNC_VERSION = 9c2d8d184e5da67c95d601382adf14862e4f2228 RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE @@ -38,8 +38,7 @@ define RUNC_CONFIGURE_CMDS endef define RUNC_BUILD_CMDS - cd $(RUNC_GOPATH)/src/github.com/opencontainers/runc && \ - $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \ + cd $(@D) && $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \ build -v -o $(@D)/bin/runc \ -tags "$(RUNC_GOTAGS)" -ldflags "$(RUNC_GLDFLAGS)" . endef diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index f7dd30cd3e..ba31d4ccd9 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -86,7 +86,7 @@ endef SAMBA4_POST_INSTALL_TARGET_HOOKS += SAMBA4_REMOVE_CTDB_TESTS define SAMBA4_CONFIGURE_CMDS - cp package/samba4/samba4-cache.txt $(@D)/cache.txt; + $(INSTALL) -m 0644 package/samba4/samba4-cache.txt $(@D)/cache.txt; echo 'Checking uname machine type: $(BR2_ARCH)' >>$(@D)/cache.txt; (cd $(@D); \ PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python-config" \ diff --git a/package/shairport-sync/shairport-sync.hash b/package/shairport-sync/shairport-sync.hash index eac39138db..08f22a0cf3 100644 --- a/package/shairport-sync/shairport-sync.hash +++ b/package/shairport-sync/shairport-sync.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 dd0484d7e8ee7631aee78c78b3762abbdba7ec3f2ee8cd6c1e361544c1414da3 shairport-sync-3.1.3.tar.gz +sha256 4c5a2ab40ef49896f5b6e59b20df4f621ebce47ee64d8571336f59820ae66379 shairport-sync-3.1.4.tar.gz diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index acca45c121..63289d4398 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHAIRPORT_SYNC_VERSION = 3.1.3 +SHAIRPORT_SYNC_VERSION = 3.1.4 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause diff --git a/package/systemd-bootchart/0001-parse-util-Don-t-use-xlocale.h-35.patch b/package/systemd-bootchart/0001-parse-util-Don-t-use-xlocale.h-35.patch new file mode 100644 index 0000000000..4eae7e65e4 --- /dev/null +++ b/package/systemd-bootchart/0001-parse-util-Don-t-use-xlocale.h-35.patch @@ -0,0 +1,32 @@ +From 15062a4501a1dffccd7cb6374b415693fa4435bf Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 18 Jul 2017 22:55:50 +0300 +Subject: [PATCH] parse-util: Don't use xlocale.h (#35) + +glibc 2.26 no longer contains the non-standard xlocale.h +(http://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27) + +This change shouldn't break anything as xlocale.h was a subset of +locale.h. + +[yann.morin.1998@free.fr: backported from upstream] +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> +--- + src/parse-util.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/parse-util.c b/src/parse-util.c +index 5635a68..1b2169c 100644 +--- a/src/parse-util.c ++++ b/src/parse-util.c +@@ -21,7 +21,6 @@ + #include <locale.h> + #include <stdlib.h> + #include <string.h> +-#include <xlocale.h> + + #include "macro.h" + #include "parse-util.h" +-- +2.11.0 + diff --git a/package/webkitgtk/0001-CMake-Values-of-CMAKE_BUILD_TYPE-from-toolchain-file.patch b/package/webkitgtk/0001-CMake-Values-of-CMAKE_BUILD_TYPE-from-toolchain-file.patch new file mode 100644 index 0000000000..6ac1258626 --- /dev/null +++ b/package/webkitgtk/0001-CMake-Values-of-CMAKE_BUILD_TYPE-from-toolchain-file.patch @@ -0,0 +1,52 @@ +From 3b13b1ec9985e72132ec6a3ba13cf60b34848817 Mon Sep 17 00:00:00 2001 +From: "aperez@igalia.com" + <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> +Date: Mon, 27 Nov 2017 15:34:49 +0000 +Subject: [PATCH] [CMake] Values of CMAKE_BUILD_TYPE from toolchain file are + ignored https://bugs.webkit.org/show_bug.cgi?id=179971 + +Reviewed by Carlos Alberto Lopez Perez. + +* CMakeLists.txt: Call project() first, as it loads the toolchain +file, so that's done before checking CMAKE_BUILD_TYPE. + + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@225168 268f45cc-cd09-0410-ab3c-d52691b4dbfc + +Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> +Backported from: 75986e1807b + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d80c37b950a..0a9bd17b981 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,8 +1,17 @@ + # ----------------------------------------------------------------------------- + # Determine CMake version and build type. + # ----------------------------------------------------------------------------- ++# ++# NOTE: cmake_minimum_required() and project() *MUST* be the two fist commands ++# used, see https://cmake.org/cmake/help/v3.3/command/project.html -- the ++# latter in particular handles loading a bunch of shared CMake definitions ++# and loading the cross-compilation settings from CMAKE_TOOLCHAIN_FILE. ++# ++ + cmake_minimum_required(VERSION 3.3) + ++project(WebKit) ++ + if (NOT CMAKE_BUILD_TYPE) + message(WARNING "No CMAKE_BUILD_TYPE value specified, defaulting to RelWithDebInfo.") + set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build." FORCE) +@@ -10,8 +19,6 @@ else () + message(STATUS "The CMake build type is: ${CMAKE_BUILD_TYPE}") + endif () + +-project(WebKit) +- + set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake") + + set(ENABLE_WEBCORE ON) +-- +2.15.1 + diff --git a/package/wireguard/wireguard.hash b/package/wireguard/wireguard.hash index 050d466471..3749456cb0 100644 --- a/package/wireguard/wireguard.hash +++ b/package/wireguard/wireguard.hash @@ -1,4 +1,4 @@ -# From https://lists.zx2c4.com/pipermail/wireguard/2017-November/001881.html -sha256 096b6482a65e566c7bf8c059f5ee6aadb2de565b04b6d810c685f1c377540325 WireGuard-0.0.20171101.tar.xz +# From https://lists.zx2c4.com/pipermail/wireguard/2017-November/001935.html +sha256 d9347786a9406ac276d86321ca64aadb1f0639cb0582c6e0519c634cf6e81157 WireGuard-0.0.20171111.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireguard/wireguard.mk b/package/wireguard/wireguard.mk index 63d536681a..2eacb22a4b 100644 --- a/package/wireguard/wireguard.mk +++ b/package/wireguard/wireguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_VERSION = 0.0.20171101 +WIREGUARD_VERSION = 0.0.20171111 WIREGUARD_SITE = https://git.zx2c4.com/WireGuard/snapshot WIREGUARD_SOURCE = WireGuard-$(WIREGUARD_VERSION).tar.xz WIREGUARD_LICENSE = GPL-2.0 diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash b/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash index 0135ac9dd0..7da9eb8c4f 100644 --- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash +++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash @@ -1,2 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002229.html -sha256 9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df libXcursor-1.1.14.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-November/002823.html +md5 58fe3514e1e7135cf364101e714d1a14 libXcursor-1.1.15.tar.bz2 +sha1 3e19f991f244b7fa31566adce7ead078424296cf libXcursor-1.1.15.tar.bz2 +sha256 294e670dd37cd23995e69aae626629d4a2dfe5708851bbc13d032401b7a3df6b libXcursor-1.1.15.tar.bz2 +sha512 53ad0fa2afd7b4cf1108b560e44ea71abdf5c55a18df243d7123942513589c927f5c105395f790d8769959e0129db54264e6aac7efd51a5f1aec270379b1f2f5 libXcursor-1.1.15.tar.bz2 diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk index c59c01a51f..b27aa653e9 100644 --- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk +++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXCURSOR_VERSION = 1.1.14 +XLIB_LIBXCURSOR_VERSION = 1.1.15 XLIB_LIBXCURSOR_SOURCE = libXcursor-$(XLIB_LIBXCURSOR_VERSION).tar.bz2 XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXCURSOR_LICENSE = MIT diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.hash b/package/x11r7/xlib_libXfont/xlib_libXfont.hash index 78700d3657..ea04348719 100644 --- a/package/x11r7/xlib_libXfont/xlib_libXfont.hash +++ b/package/x11r7/xlib_libXfont/xlib_libXfont.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-October/002816.html -md5 9ba75bf38ba62a6ad52550ab716da9b3 libXfont-1.5.3.tar.bz2 -sha1 628b8ca2207f09324b8926084318a2fa2edb16d1 libXfont-1.5.3.tar.bz2 -sha256 ab85c10fd2683481dfef672a77fe60e6a2039558cbc0e9bf56b5e1df471c93d0 libXfont-1.5.3.tar.bz2 -sha512 e7c8a09c4d174129e5d550194d3c3dc2b4abf797e52fe588c6002920727c52cf33b7db8d07fc69c2987e766d3af2d6ddda72f0c70eb21b135c691c97656a81b4 libXfont-1.5.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-November/002825.html +md5 16eaf156edd79b68038b6a7c44aa9e9b libXfont-1.5.4.tar.bz2 +sha1 9db050f63b9c4cb19e0dbb40575558ccb95719ca libXfont-1.5.4.tar.bz2 +sha256 1a7f7490774c87f2052d146d1e0e64518d32e6848184a18654e8d0bb57883242 libXfont-1.5.4.tar.bz2 +sha512 864edbaff45c44bd92bc4b06275c73fdf584a9b88bc523a297d4c75c01ca253f438463e929af70d753ddecfa648bb0b9bcf0ec72267db9f2b1704f7afa906cb3 libXfont-1.5.4.tar.bz2 diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk index 13e3b211f3..30163eec6f 100644 --- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk +++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXFONT_VERSION = 1.5.3 +XLIB_LIBXFONT_VERSION = 1.5.4 XLIB_LIBXFONT_SOURCE = libXfont-$(XLIB_LIBXFONT_VERSION).tar.bz2 XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFONT_LICENSE = MIT diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash index 3e763b268f..1816b4bf6e 100644 --- a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-October/002813.html -md5 d39e6446e46f939486d1a8b856e8b67b libXfont2-2.0.2.tar.bz2 -sha1 d5117914a026b3fd47123cb1c2a22daaae3b63e4 libXfont2-2.0.2.tar.bz2 -sha256 94088d3b87f7d42c7116d9adaad155859e93330c6e47f5989f2de600b9a6c111 libXfont2-2.0.2.tar.bz2 -sha512 d62b0c3d663a2c668796cca8c6c2a90f83feeae1253b7d946668d33502cd8099c963285b88db4f745efb0d4ff783c118eb3d84cb8e6e1724586e1ef2be23e593 libXfont2-2.0.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-November/002824.html +md5 b7ca87dfafeb5205b28a1e91ac3efe85 libXfont2-2.0.3.tar.bz2 +sha1 1110f1ad4061d9e8131ecb941757480e3e32bca0 libXfont2-2.0.3.tar.bz2 +sha256 0e8ab7fd737ccdfe87e1f02b55f221f0bd4503a1c5f28be4ed6a54586bac9c4e libXfont2-2.0.3.tar.bz2 +sha512 648b664e2aa58cbc7366a1b05873aa06bd4a38060f64085783043388244af8ceced77b29a22c3ac8b6d34cd226e093bbbcc785ea1748ea65720fe7ea05b4b44b libXfont2-2.0.3.tar.bz2 diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk index 696c605a36..3f1bdee435 100644 --- a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXFONT2_VERSION = 2.0.2 +XLIB_LIBXFONT2_VERSION = 2.0.3 XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.bz2 XLIB_LIBXFONT2_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFONT2_LICENSE = MIT diff --git a/support/config-fragments/autobuild/br-arcle-hs38.config b/support/config-fragments/autobuild/br-arcle-hs38.config index 8484f62683..be4f5353f4 100644 --- a/support/config-fragments/autobuild/br-arcle-hs38.config +++ b/support/config-fragments/autobuild/br-arcle-hs38.config @@ -3,7 +3,7 @@ BR2_archs38=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arcle-hs38-full-2017.11-rc1.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arcle-hs38-full-2017.11-rc2-15-g9d544fe.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_7=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/download/svn b/support/download/svn index 9f27d71f86..77abf3d02d 100755 --- a/support/download/svn +++ b/support/download/svn @@ -33,6 +33,6 @@ _svn() { eval ${SVN} "${@}" } -_svn --non-interactive export ${verbose} "${@}" "'${repo}@${rev}'" "'${basename}'" +_svn export ${verbose} "${@}" "'${repo}@${rev}'" "'${basename}'" tar czf "${output}" "${basename}" diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index cb41c303fc..3d833f09fc 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2017.08' +RELEASE='2017.11' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/support/scripts/size-stats b/support/scripts/size-stats index af45000359..3ff2a1ce18 100755 --- a/support/scripts/size-stats +++ b/support/scripts/size-stats @@ -178,9 +178,17 @@ def gen_files_csv(filesdict, pkgsizes, outputf): "File size in system (%)"]) for f, (pkgname, filesize) in filesdict.items(): pkgsize = pkgsizes[pkgname] + + if pkgsize == 0: + percent_pkg = 0 + else: + percent_pkg = float(filesize) / pkgsize * 100 + + percent_total = float(filesize) / total * 100 + wr.writerow([f, pkgname, filesize, pkgsize, - "%.1f" % (float(filesize) / pkgsize * 100), - "%.1f" % (float(filesize) / total * 100)]) + "%.1f" % percent_pkg, + "%.1f" % percent_total]) # diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 48de1e71f2..dd07884c7e 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -25,4 +25,4 @@ $(error No prefix selected for external toolchain package $(BR2_PACKAGE_PROVIDES endif endif -include toolchain/toolchain-external/*/*.mk +include $(sort $(wildcard toolchain/toolchain-external/*/*.mk)) |
