aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2019-06-02 22:11:20 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-06-02 22:11:20 +0200
commitf590097045ee5d399c42a2700475353361babcf9 (patch)
treec8d6feffb86fec6bc0399470392683d5a78051a2
parent2421c246b2ff8b9492ce98f2d2f4838f148fa51b (diff)
parent852df15f317fed37c780e79a253907ee1241cad7 (diff)
downloadbuildroot-f590097045ee5d399c42a2700475353361babcf9.tar.gz
buildroot-f590097045ee5d399c42a2700475353361babcf9.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--Config.in.legacy9
-rw-r--r--DEVELOPERS16
-rw-r--r--arch/Config.in1
-rw-r--r--arch/Config.in.arc3
-rw-r--r--arch/Config.in.arm3
-rw-r--r--arch/Config.in.csky29
-rw-r--r--arch/Config.in.m68k3
-rw-r--r--arch/Config.in.microblaze3
-rw-r--r--arch/Config.in.mips3
-rw-r--r--arch/Config.in.nios23
-rw-r--r--arch/Config.in.or1k3
-rw-r--r--arch/Config.in.powerpc3
-rw-r--r--arch/Config.in.riscv3
-rw-r--r--arch/Config.in.sh3
-rw-r--r--arch/Config.in.sparc3
-rw-r--r--arch/Config.in.x863
-rw-r--r--arch/Config.in.xtensa3
-rw-r--r--arch/arch.mk.csky26
-rw-r--r--boot/barebox/Config.in4
-rw-r--r--boot/barebox/barebox.hash6
-rw-r--r--boot/optee-os/3.4.0/optee-os.hash4
-rw-r--r--boot/optee-os/Config.in4
-rw-r--r--boot/optee-os/optee-os.hash4
-rw-r--r--configs/bananapro_defconfig4
-rw-r--r--configs/grinn_chiliboard_defconfig6
-rw-r--r--configs/grinn_liteboard_defconfig6
-rw-r--r--docs/manual/adding-packages-generic.txt13
-rw-r--r--linux/Config.ext.in13
-rw-r--r--linux/linux-ext-xenomai.mk12
-rw-r--r--package/Config.in8
-rw-r--r--package/Config.in.host1
-rw-r--r--package/Makefile.in9
-rw-r--r--package/acl/acl.hash4
-rw-r--r--package/alsa-lib/0002-alsa-lib-conditionally-enable-libdl-in-AM_PATH_ALSA-.patch49
-rw-r--r--package/alsa-lib/alsa-lib.hash2
-rw-r--r--package/alsa-lib/alsa-lib.mk2
-rw-r--r--package/attr/attr.hash4
-rw-r--r--package/binutils/Config.in.host14
-rw-r--r--package/binutils/arc-2019.03-rc1/0001-poison-system-directories.patch (renamed from package/binutils/arc-2018.09-release/0005-poison-system-directories.patch)0
-rw-r--r--package/binutils/binutils.hash5
-rw-r--r--package/binutils/binutils.mk11
-rw-r--r--package/busybox/Config.in1
-rw-r--r--package/bzip2/bzip2.hash4
-rw-r--r--package/cmake/cmake.hash3
-rw-r--r--package/cog/cog.hash2
-rw-r--r--package/cog/cog.mk3
-rw-r--r--package/connman/connman.hash2
-rw-r--r--package/connman/connman.mk2
-rw-r--r--package/cups-filters/0002-Poppler-removed-memCheck-and-gMemReport-functions.patch79
-rw-r--r--package/cups-filters/cups-filters.hash2
-rw-r--r--package/cups-filters/cups-filters.mk2
-rw-r--r--package/dbus-glib/dbus-glib.hash3
-rw-r--r--package/dbus-python/dbus-python.hash3
-rw-r--r--package/dhcpcd/dhcpcd.hash6
-rw-r--r--package/dhcpcd/dhcpcd.mk2
-rw-r--r--package/domoticz/0001-Bumped-version.patch20
-rw-r--r--package/domoticz/0001-appversion.default-bump-version-to-10717.patch23
-rw-r--r--package/domoticz/0002-CMakeLists.txt-fix-build-with-python-and-cmake-3.7.patch40
-rw-r--r--package/domoticz/0003-Fix-for-boot-1-70-get_io_service.patch.patch74
-rw-r--r--package/domoticz/domoticz.hash2
-rw-r--r--package/domoticz/domoticz.mk2
-rw-r--r--package/dropbear/Config.in7
-rw-r--r--package/dropbear/dropbear.mk8
-rw-r--r--package/dt-utils/0001-src-fix-compilation-for-glibc-version-2.27.9000-36.f.patch75
-rw-r--r--package/dt-utils/dt-utils.hash2
-rw-r--r--package/dt-utils/dt-utils.mk2
-rw-r--r--package/efl/efl.hash4
-rw-r--r--package/efl/efl.mk2
-rw-r--r--package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch31
-rw-r--r--package/ell/ell.hash2
-rw-r--r--package/ell/ell.mk2
-rw-r--r--package/fatcat/Config.in.host8
-rw-r--r--package/fatcat/fatcat.hash3
-rw-r--r--package/fatcat/fatcat.mk12
-rw-r--r--package/fontconfig/fontconfig.hash3
-rw-r--r--package/gcc/Config.in.host15
-rw-r--r--package/gcc/arc-2019.03-rc1/0100-uclibc-conf.patch (renamed from package/gcc/arc-2018.09-release/0100-uclibc-conf.patch)0
-rw-r--r--package/gcc/gcc.hash4
-rw-r--r--package/gcc/gcc.mk3
-rw-r--r--package/gcr/gcr.hash5
-rw-r--r--package/gcr/gcr.mk4
-rw-r--r--package/gdb/Config.in1
-rw-r--r--package/gdb/Config.in.host4
-rw-r--r--package/gdb/gdb.hash5
-rw-r--r--package/gdb/gdb.mk6
-rw-r--r--package/genimage/genimage.hash3
-rw-r--r--package/genimage/genimage.mk2
-rw-r--r--package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash2
-rw-r--r--package/glibc/arc-2019.03-rc1/glibc.hash (renamed from package/glibc/arc-2018.09-release/glibc.hash)2
-rw-r--r--package/glibc/glibc.mk5
-rw-r--r--package/gmp/gmp.hash4
-rw-r--r--package/gperf/gperf.hash3
-rw-r--r--package/gpsd/0002-SConstruct-Do-not-crash-when-not-building-python-man-pages.patch59
-rw-r--r--package/gpsd/0002-driver_greis-fix-build-with-reconfigure-disabled.patch49
-rw-r--r--package/gpsd/0003-driver_ubx-Save-UBX-RXM-RAWX-data-in-rawdate_t.patch38
-rw-r--r--package/gpsd/Config.in5
-rw-r--r--package/gpsd/gpsd.hash2
-rw-r--r--package/gpsd/gpsd.mk5
-rw-r--r--package/gstreamer1/gst1-plugins-bad/Config.in24
-rw-r--r--package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk14
-rw-r--r--package/gstreamer1/gst1-plugins-good/Config.in19
-rw-r--r--package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk9
-rw-r--r--package/ifmetric/0001-Fix-issue-NETLINK-Packet-too-small-or-truncated-92-1.patch29
-rw-r--r--package/ifmetric/Config.in10
-rw-r--r--package/ifmetric/ifmetric.hash4
-rw-r--r--package/ifmetric/ifmetric.mk14
-rw-r--r--package/ifupdown-scripts/Config.in2
-rw-r--r--package/intltool/intltool.hash1
-rw-r--r--package/iproute2/0001-devlink-fix-libc-and-kernel-headers-collision.patch51
-rw-r--r--package/iproute2/0001-ss-fix-compilation-under-glibc-2.18.patch39
-rw-r--r--package/iproute2/0002-f_flower-fix-build-with-musl-libc.patch31
-rw-r--r--package/iproute2/iproute2.hash2
-rw-r--r--package/iproute2/iproute2.mk2
-rw-r--r--package/iputils/0001-ninfod-ninfod_name.c-fix-build-with-nettle.patch38
-rw-r--r--package/iputils/0001-ping-Fix-AI_CANONIDN-usage-on-some-systems.patch57
-rw-r--r--package/iputils/iputils.hash2
-rw-r--r--package/iputils/iputils.mk60
-rw-r--r--package/iwd/iwd.hash2
-rw-r--r--package/iwd/iwd.mk2
-rw-r--r--package/kmod/kmod.hash3
-rw-r--r--package/lapack/lapack.hash3
-rw-r--r--package/lapack/lapack.mk3
-rw-r--r--package/libepoxy/libepoxy.hash4
-rw-r--r--package/libepoxy/libepoxy.mk13
-rw-r--r--package/libopenh264/libopenh264.hash2
-rw-r--r--package/libopenh264/libopenh264.mk2
-rw-r--r--package/libubootenv/0001-fw_printenv-remove-declaration-in-for-loop.patch53
-rw-r--r--package/libubootenv/0002-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch46
-rw-r--r--package/libubootenv/0003-uboot_env-fix-build-with-musl-libc.patch31
-rw-r--r--package/libubootenv/0004-uboot_env-fix-compilation-for-glibc-version-2.28.patch40
-rw-r--r--package/libubootenv/Config.in11
-rw-r--r--package/libubootenv/libubootenv.hash2
-rw-r--r--package/libubootenv/libubootenv.mk13
-rw-r--r--package/libuv/libuv.hash2
-rw-r--r--package/libuv/libuv.mk2
-rw-r--r--package/libva/libva.hash6
-rw-r--r--package/libva/libva.mk2
-rw-r--r--package/libwpe/libwpe.hash8
-rw-r--r--package/libwpe/libwpe.mk2
-rw-r--r--package/libxml-parser-perl/libxml-parser-perl.hash1
-rw-r--r--package/linux-headers/Config.in.host4
-rw-r--r--package/lmbench/lmbench.mk3
-rw-r--r--package/ltp-testsuite/ltp-testsuite.hash4
-rw-r--r--package/ltp-testsuite/ltp-testsuite.mk3
-rw-r--r--package/lua-flu/0001-use-system-xattr-h.patch169
-rw-r--r--package/lua-flu/lua-flu.hash4
-rw-r--r--package/lua-flu/lua-flu.mk4
-rw-r--r--package/luv/luv.hash2
-rw-r--r--package/luv/luv.mk2
-rw-r--r--package/mender-artifact/mender-artifact.hash7
-rw-r--r--package/mender-artifact/mender-artifact.mk4
-rw-r--r--package/mender/Config.in1
-rw-r--r--package/mender/mender.hash16
-rw-r--r--package/mender/mender.mk6
-rw-r--r--package/mesa3d-headers/mesa3d-headers.mk2
-rw-r--r--package/mesa3d/mesa3d.hash10
-rw-r--r--package/mesa3d/mesa3d.mk2
-rw-r--r--package/murata-cyw-fw/Config.in97
-rw-r--r--package/murata-cyw-fw/murata-cyw-fw.hash5
-rw-r--r--package/murata-cyw-fw/murata-cyw-fw.mk98
-rw-r--r--package/nano/nano.hash4
-rw-r--r--package/nano/nano.mk5
-rw-r--r--package/nbd/nbd.hash10
-rw-r--r--package/nbd/nbd.mk2
-rw-r--r--package/netcat-openbsd/netcat-openbsd.hash2
-rw-r--r--package/netcat-openbsd/netcat-openbsd.mk2
-rw-r--r--package/netsniff-ng/netsniff-ng.hash2
-rw-r--r--package/netsniff-ng/netsniff-ng.mk2
-rw-r--r--package/ninja/ninja.mk7
-rw-r--r--package/norm/0001-fix-bigendian-build.patch17
-rw-r--r--package/norm/0001-protolib-drop-linux-version-check.patch (renamed from package/norm/0002-protolib-drop-linux-version-check.patch)0
-rw-r--r--package/norm/0003-fix-const-qualifier-gcc7.patch46
-rw-r--r--package/norm/norm.hash3
-rw-r--r--package/norm/norm.mk4
-rw-r--r--package/ofono/0003-build-Add-check-for-explicit_bzero-support.patch28
-rw-r--r--package/ofono/ofono.hash2
-rw-r--r--package/ofono/ofono.mk5
-rw-r--r--package/oniguruma/0001-fix-cross-compilation.patch61
-rw-r--r--package/oniguruma/oniguruma.hash4
-rw-r--r--package/oniguruma/oniguruma.mk2
-rw-r--r--package/opencv3/0001-3rdparty-protobuf-fix-compilation-issue-on-s390.patch38
-rw-r--r--package/opencv3/opencv3.hash4
-rw-r--r--package/opencv3/opencv3.mk2
-rw-r--r--package/openjpeg/openjpeg.hash2
-rw-r--r--package/openjpeg/openjpeg.mk4
-rw-r--r--package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch66
-rw-r--r--package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch34
-rw-r--r--package/openrc/Config.in26
-rw-r--r--package/openrc/openrc.hash3
-rw-r--r--package/openrc/openrc.mk45
-rw-r--r--package/openzwave/0001-Fix-compilation-of-MinOZW.patch37
-rw-r--r--package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch26
-rw-r--r--package/openzwave/0002-Fix-warning-on-wcsdup-implicit-declaration.patch29
-rw-r--r--package/openzwave/0002-update-spec-files.patch445
-rw-r--r--package/openzwave/0003-Ensure-correct-git-repository-path.patch29
-rw-r--r--package/openzwave/0004-Fix-compilation-error-in-regards-to-Werror-restrict.patch39
-rw-r--r--package/openzwave/Config.in6
-rw-r--r--package/openzwave/openzwave.hash2
-rw-r--r--package/openzwave/openzwave.mk14
-rw-r--r--package/oprofile/0002-oparchive-replace-basename-with-op_basename.patch34
-rw-r--r--package/oprofile/oprofile.hash6
-rw-r--r--package/oprofile/oprofile.mk2
-rw-r--r--package/optee-benchmark/optee-benchmark.hash6
-rw-r--r--package/optee-benchmark/optee-benchmark.mk3
-rw-r--r--package/optee-client/0001-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch52
-rw-r--r--package/optee-client/0002-libteec-fix-build-warnings.patch128
-rw-r--r--package/optee-client/0003-libteec-fix-clang-build-errors.patch64
-rw-r--r--package/optee-client/optee-client.hash4
-rw-r--r--package/optee-client/optee-client.mk2
-rw-r--r--package/optee-examples/0001-fix-deprecated-size_t-type-for-size.patch42
-rw-r--r--package/optee-examples/optee-examples.hash4
-rw-r--r--package/optee-examples/optee-examples.mk2
-rw-r--r--package/optee-test/0001-regression-4100-update-string-conversion-loop.patch72
-rw-r--r--package/optee-test/0001-regression-41xx-prevent-unsafe-loop-optimizations-bu.patch63
-rw-r--r--package/optee-test/optee-test.hash4
-rw-r--r--package/optee-test/optee-test.mk2
-rw-r--r--package/parted/parted.hash3
-rw-r--r--package/pkg-generic.mk2
-rw-r--r--package/polkit/polkit.hash3
-rw-r--r--package/poppler/0001-Form.cc-include-ctype.h-to-fix-build-error.patch37
-rw-r--r--package/poppler/Config.in13
-rw-r--r--package/poppler/poppler.hash2
-rw-r--r--package/poppler/poppler.mk110
-rw-r--r--package/powertop/0002-wakeup_xxx.h-include-limits.h.patch54
-rw-r--r--package/powertop/powertop.hash3
-rw-r--r--package/powertop/powertop.mk4
-rw-r--r--package/pptp-linux/0003-pqueue.h-include-sys-types.h.patch30
-rw-r--r--package/pptp-linux/pptp-linux.hash10
-rw-r--r--package/pptp-linux/pptp-linux.mk2
-rw-r--r--package/python-cycler/Config.in8
-rw-r--r--package/python-cycler/python-cycler.hash4
-rw-r--r--package/python-cycler/python-cycler.mk14
-rw-r--r--package/python-falcon/Config.in4
-rw-r--r--package/python-falcon/python-falcon.hash4
-rw-r--r--package/python-falcon/python-falcon.mk4
-rw-r--r--package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch29
-rw-r--r--package/python-matplotlib/Config.in21
-rw-r--r--package/python-matplotlib/python-matplotlib.hash4
-rw-r--r--package/python-matplotlib/python-matplotlib.mk16
-rw-r--r--package/python-requests/python-requests.hash4
-rw-r--r--package/python-requests/python-requests.mk4
-rw-r--r--package/python-socketio/python-socketio.hash9
-rw-r--r--package/python-socketio/python-socketio.mk4
-rw-r--r--package/qt5/qt5base/qt5base.mk7
-rw-r--r--package/redis/0001-uclibc.patch9
-rw-r--r--package/redis/redis.hash2
-rw-r--r--package/redis/redis.mk2
-rw-r--r--package/rubix/Config.in2
-rw-r--r--package/rubix/rubix.hash3
-rw-r--r--package/rubix/rubix.mk15
-rw-r--r--package/samba4/Config.in3
-rw-r--r--package/samba4/samba4.mk2
-rw-r--r--package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch2
-rw-r--r--package/shared-mime-info/shared-mime-info.hash3
-rw-r--r--package/shared-mime-info/shared-mime-info.mk5
-rw-r--r--package/skeleton-init-openrc/Config.in7
-rw-r--r--package/skeleton-init-openrc/skeleton-init-openrc.mk22
l---------package/skeleton-init-openrc/skeleton/dev/log1
-rw-r--r--package/skeleton-init-openrc/skeleton/etc/fstab3
l---------package/skeleton-init-openrc/skeleton/var/cache1
l---------package/skeleton-init-openrc/skeleton/var/lib/misc1
l---------package/skeleton-init-openrc/skeleton/var/lock1
l---------package/skeleton-init-openrc/skeleton/var/log1
l---------package/skeleton-init-openrc/skeleton/var/run1
l---------package/skeleton-init-openrc/skeleton/var/spool1
l---------package/skeleton-init-openrc/skeleton/var/tmp1
-rw-r--r--package/speexdsp/0001-port-resample-neon-to-aarch64.patch250
-rw-r--r--package/speexdsp/speexdsp.hash2
-rw-r--r--package/speexdsp/speexdsp.mk2
-rw-r--r--package/sslh/sslh.mk7
-rw-r--r--package/stress-ng/stress-ng.hash2
-rw-r--r--package/stress-ng/stress-ng.mk2
-rw-r--r--package/swig/swig.hash3
-rw-r--r--package/swig/swig.mk4
-rw-r--r--package/tcl/0001-dont-build-compat.patch11
-rw-r--r--package/tcl/tcl.hash2
-rw-r--r--package/tcl/tcl.mk2
-rw-r--r--package/terminology/terminology.hash4
-rw-r--r--package/terminology/terminology.mk2
-rw-r--r--package/udisks/udisks.hash1
-rw-r--r--package/usbutils/0001-add-gpl-license-files.patch1030
-rw-r--r--package/usbutils/usbutils.hash2
-rw-r--r--package/usbutils/usbutils.mk10
-rw-r--r--package/ustr/ustr.hash5
-rw-r--r--package/wireless_tools/wireless_tools.hash1
-rw-r--r--package/wpebackend-fdo/0001-Improve-how-CMake-looks-for-wayland-scanner.patch137
-rw-r--r--package/wpebackend-fdo/wpebackend-fdo.hash8
-rw-r--r--package/wpebackend-fdo/wpebackend-fdo.mk2
-rw-r--r--package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patch36
-rw-r--r--package/wpewebkit/Config.in17
-rw-r--r--package/wpewebkit/wpewebkit.hash8
-rw-r--r--package/wpewebkit/wpewebkit.mk10
-rw-r--r--package/x265/0002-arm-asm-primitives.patch (renamed from package/x265/0003-arm-asm-primitives.patch)0
-rw-r--r--package/x265/0002-fix-build-error-on-ppc64le.patch23
-rw-r--r--package/x265/x265.hash2
-rw-r--r--package/x265/x265.mk2
-rw-r--r--package/zziplib/Config.in11
-rw-r--r--package/zziplib/zziplib.hash5
-rw-r--r--package/zziplib/zziplib.mk18
-rw-r--r--support/gnuconfig/README.buildroot2
-rwxr-xr-xsupport/gnuconfig/config.guess836
-rwxr-xr-xsupport/gnuconfig/config.sub2527
-rw-r--r--system/Config.in11
-rw-r--r--toolchain/toolchain-buildroot/Config.in2
304 files changed, 4389 insertions, 4727 deletions
diff --git a/Config.in.legacy b/Config.in.legacy
index a32cbcb6f2..c13399acda 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,15 @@ endif
comment "Legacy options removed in 2019.05"
+config BR2_CSKY_DSP
+ bool "C-SKY DSP support removed"
+ select BR2_LEGACY
+ help
+ C-SKY DSP instruction support for ck810 / ck807 was removed,
+ as it was no longer supported in C-SKY gcc. Perhaps the VDSP
+ instructions should be used instead, using the BR2_CSKY_VDSP
+ option.
+
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR
bool "compositor moved to gst1-plugins-base"
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR
diff --git a/DEVELOPERS b/DEVELOPERS
index e36f1c4109..fec30f68b6 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1228,6 +1228,10 @@ F: package/python-xlib/
N: Joshua Henderson <joshua.henderson@microchip.com>
F: package/qt5/qt5wayland/
+N: Jugurtha BELKALEM <jugurtha.belkalem@smile.fr>
+F: package/python-cycler/
+F: package/python-matplotlib/
+
N: Juha Rantanen <juha@codercoded.com>
F: package/acsccid/
@@ -1387,6 +1391,7 @@ F: package/easydbus/
F: package/lua-flu/
F: package/lua-stdlib/
F: package/luaossl/
+F: package/murata-cyw-fw/
F: package/rs485conf/
F: package/turbolua/
@@ -1616,6 +1621,8 @@ F: board/altera/socrates_cyclone5/
F: board/pine64/rock64
F: configs/rock64_defconfig
F: configs/socrates_cyclone5_defconfig
+F: package/openrc/
+F: package/skeleton-init-openrc/
N: Michel Stempin <michel.stempin@wanadoo.fr>
F: board/licheepi/
@@ -1746,8 +1753,10 @@ F: configs/sheevaplug_defconfig
F: package/bats-core/
F: package/docker-compose/
F: package/dump1090/
+F: package/fatcat/
F: package/flickcurl/
F: package/fscryptctl/
+F: package/ifmetric/
F: package/jo/
F: package/jose/
F: package/libfastjson/
@@ -1842,6 +1851,9 @@ F: package/kf5/
N: Pierre Floury <pierre.floury@gmail.com>
F: package/trace-cmd/
+N: Pierre-Jean Texier <pjtexier@koncepto.io>
+F: package/libubootenv/
+
N: Pieter De Gendt <pieter.degendt@gmail.com>
F: package/libvips/
@@ -1939,6 +1951,7 @@ F: package/tk/
F: package/upower/
F: package/waffle/
F: package/xenomai/
+F: package/zziplib/
F: toolchain/toolchain-external/toolchain-external-arm-aarch64/
F: toolchain/toolchain-external/toolchain-external-arm-aarch64-be/
F: toolchain/toolchain-external/toolchain-external-arm-arm/
@@ -2223,6 +2236,9 @@ F: toolchain/
N: Timo Ketola <timo.ketola@exertus.fi>
F: package/fbgrab/
+N: Titouan Christophe <titouan.christophe@railnova.eu>
+F: package/redis/
+
N: Trent Piepho <tpiepho@impinj.com>
F: package/libp11/
diff --git a/arch/Config.in b/arch/Config.in
index d82803c828..db1199c6a2 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -77,7 +77,6 @@ config BR2_aarch64_be
config BR2_csky
bool "csky"
- select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
select BR2_ARCH_HAS_MMU_MANDATORY
help
csky is processor IP from china.
diff --git a/arch/Config.in.arc b/arch/Config.in.arc
index 156384b9a5..6cddbb961f 100644
--- a/arch/Config.in.arc
+++ b/arch/Config.in.arc
@@ -79,3 +79,6 @@ config BR2_ARC_PAGE_SIZE
default "4K" if BR2_ARC_PAGE_SIZE_4K
default "8K" if BR2_ARC_PAGE_SIZE_8K
default "16K" if BR2_ARC_PAGE_SIZE_16K
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.arm b/arch/Config.in.arm
index a9972978d4..93031ab147 100644
--- a/arch/Config.in.arm
+++ b/arch/Config.in.arm
@@ -866,3 +866,6 @@ config BR2_GCC_TARGET_MODE
config BR2_READELF_ARCH_NAME
default "ARM" if BR2_arm || BR2_armeb
default "AArch64" if BR2_aarch64 || BR2_aarch64_be
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.csky b/arch/Config.in.csky
index e88e4e2d12..4bdfbfae4b 100644
--- a/arch/Config.in.csky
+++ b/arch/Config.in.csky
@@ -13,19 +13,26 @@ config BR2_ck807
config BR2_ck810
bool "ck810"
+config BR2_ck860
+ bool "ck860"
+
endchoice
config BR2_CSKY_FPU
bool "Enable FPU coprocessor"
- depends on BR2_ck810 || BR2_ck807
+ depends on BR2_ck810 || BR2_ck807 || BR2_ck860
help
You can say N here if your C-SKY CPU doesn't have a
Floating-Point Coprocessor or if you don't need FPU support
for your user-space programs.
-config BR2_CSKY_DSP
- bool "Enable DSP enhanced instructions"
- depends on BR2_ck810 || BR2_ck807
+config BR2_CSKY_VDSP
+ bool "Enable VDSP enhanced instructions Co-processor"
+ depends on BR2_CSKY_FPU
+
+config BR2_GCC_TARGET_FLOAT_ABI
+ default "soft" if !BR2_CSKY_FPU
+ default "hard" if BR2_CSKY_FPU
config BR2_ARCH
default "csky"
@@ -33,16 +40,8 @@ config BR2_ARCH
config BR2_ENDIAN
default "LITTLE"
-config BR2_GCC_TARGET_CPU
- default "ck610" if (BR2_ck610 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
- default "ck807" if (BR2_ck807 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
- default "ck807e" if (BR2_ck807 && !BR2_CSKY_FPU && BR2_CSKY_DSP)
- default "ck807f" if (BR2_ck807 && BR2_CSKY_FPU && !BR2_CSKY_DSP)
- default "ck807ef" if (BR2_ck807 && BR2_CSKY_FPU && BR2_CSKY_DSP)
- default "ck810" if (BR2_ck810 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
- default "ck810e" if (BR2_ck810 && !BR2_CSKY_FPU && BR2_CSKY_DSP)
- default "ck810f" if (BR2_ck810 && BR2_CSKY_FPU && !BR2_CSKY_DSP)
- default "ck810ef" if (BR2_ck810 && BR2_CSKY_FPU && BR2_CSKY_DSP)
-
config BR2_READELF_ARCH_NAME
default "CSKY"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.m68k b/arch/Config.in.m68k
index c134df2f14..275f47f1d3 100644
--- a/arch/Config.in.m68k
+++ b/arch/Config.in.m68k
@@ -38,3 +38,6 @@ config BR2_GCC_TARGET_CPU
config BR2_READELF_ARCH_NAME
default "MC68000"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.microblaze b/arch/Config.in.microblaze
index 042712a1b6..5fe2906d40 100644
--- a/arch/Config.in.microblaze
+++ b/arch/Config.in.microblaze
@@ -12,3 +12,6 @@ config BR2_READELF_ARCH_NAME
config BR2_microblaze
bool
default y if BR2_microblazeel || BR2_microblazebe
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.mips b/arch/Config.in.mips
index 7f7aa63f06..619456c2d5 100644
--- a/arch/Config.in.mips
+++ b/arch/Config.in.mips
@@ -271,3 +271,6 @@ config BR2_GCC_TARGET_ABI
config BR2_READELF_ARCH_NAME
default "MIPS R3000"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.nios2 b/arch/Config.in.nios2
index 7466331016..aae435fa17 100644
--- a/arch/Config.in.nios2
+++ b/arch/Config.in.nios2
@@ -6,3 +6,6 @@ config BR2_ENDIAN
config BR2_READELF_ARCH_NAME
default "Altera Nios II"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.or1k b/arch/Config.in.or1k
index b31ab3e95b..abdf498fb8 100644
--- a/arch/Config.in.or1k
+++ b/arch/Config.in.or1k
@@ -6,3 +6,6 @@ config BR2_ENDIAN
config BR2_READELF_ARCH_NAME
default "OpenRISC 1000"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc
index 394f2e625c..56c4b526ec 100644
--- a/arch/Config.in.powerpc
+++ b/arch/Config.in.powerpc
@@ -208,3 +208,6 @@ config BR2_GCC_TARGET_CPU
config BR2_READELF_ARCH_NAME
default "PowerPC" if BR2_powerpc
default "PowerPC64" if BR2_powerpc64 || BR2_powerpc64le
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.riscv b/arch/Config.in.riscv
index 097719e846..bdd2672602 100644
--- a/arch/Config.in.riscv
+++ b/arch/Config.in.riscv
@@ -125,3 +125,6 @@ config BR2_GCC_TARGET_ABI
config BR2_READELF_ARCH_NAME
default "RISC-V"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.sh b/arch/Config.in.sh
index 1cb2db90ad..b5cce18e22 100644
--- a/arch/Config.in.sh
+++ b/arch/Config.in.sh
@@ -30,3 +30,6 @@ config BR2_ENDIAN
config BR2_READELF_ARCH_NAME
default "Renesas / SuperH SH"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.sparc b/arch/Config.in.sparc
index b22b55142e..4c4dc61745 100644
--- a/arch/Config.in.sparc
+++ b/arch/Config.in.sparc
@@ -32,3 +32,6 @@ config BR2_GCC_TARGET_CPU
config BR2_READELF_ARCH_NAME
default "Sparc" if BR2_sparc
default "Sparc v9" if BR2_sparc64
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.x86 b/arch/Config.in.x86
index f7c53a0fae..ce91317dc6 100644
--- a/arch/Config.in.x86
+++ b/arch/Config.in.x86
@@ -290,3 +290,6 @@ config BR2_GCC_TARGET_ARCH
config BR2_READELF_ARCH_NAME
default "Intel 80386" if BR2_i386
default "Advanced Micro Devices X86-64" if BR2_x86_64
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa
index 14049480ec..a79d906985 100644
--- a/arch/Config.in.xtensa
+++ b/arch/Config.in.xtensa
@@ -50,3 +50,6 @@ config BR2_ARCH
config BR2_READELF_ARCH_NAME
default "Tensilica Xtensa Processor"
+
+# vim: ft=kconfig
+# -*- mode:kconfig; -*-
diff --git a/arch/arch.mk.csky b/arch/arch.mk.csky
new file mode 100644
index 0000000000..fb59ae22fd
--- /dev/null
+++ b/arch/arch.mk.csky
@@ -0,0 +1,26 @@
+#
+# Configure the GCC_TARGET_ARCH variable and append the
+# appropriate C-SKY ISA extensions.
+#
+
+ifeq ($(BR2_csky),y)
+
+ifeq ($(BR2_ck610),y)
+GCC_TARGET_CPU := ck610
+else ifeq ($(BR2_ck807),y)
+GCC_TARGET_CPU := ck807
+else ifeq ($(BR2_ck810),y)
+GCC_TARGET_CPU := ck810
+else ifeq ($(BR2_ck860),y)
+GCC_TARGET_CPU := ck860
+endif
+
+ifeq ($(BR2_CSKY_FPU),y)
+GCC_TARGET_CPU := $(GCC_TARGET_CPU)f
+endif
+
+ifeq ($(BR2_CSKY_VDSP),y)
+GCC_TARGET_CPU := $(GCC_TARGET_CPU)v
+endif
+
+endif
diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 6d639e31e9..d919cacc57 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -12,7 +12,7 @@ choice
Select the specific Barebox version you want to use
config BR2_TARGET_BAREBOX_LATEST_VERSION
- bool "2019.04.0"
+ bool "2019.05.0"
config BR2_TARGET_BAREBOX_CUSTOM_VERSION
bool "Custom version"
@@ -40,7 +40,7 @@ endif
config BR2_TARGET_BAREBOX_VERSION
string
- default "2019.04.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
+ default "2019.05.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash
index dfbd94fca8..fb371ab671 100644
--- a/boot/barebox/barebox.hash
+++ b/boot/barebox/barebox.hash
@@ -1,5 +1,5 @@
-# From https://www.barebox.org/download/barebox-2019.04.0.tar.bz2.md5
-md5 2d9619dfe6aaaf3b10d6327486e18571 barebox-2019.04.0.tar.bz2
+# From https://www.barebox.org/download/barebox-2019.05.0.tar.bz2.md5
+md5 2e721cce90f1ea1492710ca23680311f barebox-2019.05.0.tar.bz2
# Locally calculated
-sha256 d2834b612228b82bbaa713b26dec1fa770123bb02727400e4c56f6f2bffb01cc barebox-2019.04.0.tar.bz2
+sha256 704bb09b2bf1347e43ebb9138da32a7e1b4d13892fd187be98f4f9dae000501d barebox-2019.05.0.tar.bz2
diff --git a/boot/optee-os/3.4.0/optee-os.hash b/boot/optee-os/3.4.0/optee-os.hash
deleted file mode 100644
index 07afdfac8f..0000000000
--- a/boot/optee-os/3.4.0/optee-os.hash
+++ /dev/null
@@ -1,4 +0,0 @@
-# From https://github.com/OP-TEE/optee_os/archive/3.4.0.tar.gz
-sha256 51d42ac7aa780ec8d8ee471eff689a29a7621aacace046722b1490b62ec2d481 optee-os-3.4.0.tar.gz
-# Locally computed
-sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE
diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in
index 4cb05798e5..bd685b58bf 100644
--- a/boot/optee-os/Config.in
+++ b/boot/optee-os/Config.in
@@ -18,7 +18,7 @@ choice
Select the version of OP-TEE OS you want to use
config BR2_TARGET_OPTEE_OS_LATEST
- bool "3.4.0"
+ bool "3.5.0"
help
Use the latest release tag from the OP-TEE OS official Git
repository.
@@ -50,7 +50,7 @@ endif
config BR2_TARGET_OPTEE_OS_VERSION
string
- default "3.4.0" if BR2_TARGET_OPTEE_OS_LATEST
+ default "3.5.0" if BR2_TARGET_OPTEE_OS_LATEST
default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \
if BR2_TARGET_OPTEE_OS_CUSTOM_GIT
diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash
new file mode 100644
index 0000000000..1c8f5d6b31
--- /dev/null
+++ b/boot/optee-os/optee-os.hash
@@ -0,0 +1,4 @@
+# From https://github.com/OP-TEE/optee_os/archive/3.5.0.tar.gz
+sha256 a02fe8e7fdee9653e9207059071735a839b1255fdaf311a2a6cfd185a4cee6a2 optee-os-3.5.0.tar.gz
+# Locally computed
+sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE
diff --git a/configs/bananapro_defconfig b/configs/bananapro_defconfig
index 136a166d72..a6433ee597 100644
--- a/configs/bananapro_defconfig
+++ b/configs/bananapro_defconfig
@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lemaker/bananapro/post-image.sh"
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.91"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.116"
BR2_LINUX_KERNEL_USE_DEFCONFIG=y
BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lemaker/bananapro/linux-wifi.fragment"
@@ -39,7 +39,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.04"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Bananapro"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
diff --git a/configs/grinn_chiliboard_defconfig b/configs/grinn_chiliboard_defconfig
index 84f24e1cc4..ab89bbf8f3 100644
--- a/configs/grinn_chiliboard_defconfig
+++ b/configs/grinn_chiliboard_defconfig
@@ -1,11 +1,11 @@
BR2_arm=y
BR2_cortex_a8=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y
BR2_SYSTEM_DHCP="eth0"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/chiliboard/post-image.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.1"
BR2_LINUX_KERNEL_DEFCONFIG="omap2plus"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-chiliboard"
@@ -15,7 +15,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.04"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="chiliboard"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
diff --git a/configs/grinn_liteboard_defconfig b/configs/grinn_liteboard_defconfig
index 84f1735e22..f2c1da33e3 100644
--- a/configs/grinn_liteboard_defconfig
+++ b/configs/grinn_liteboard_defconfig
@@ -1,11 +1,11 @@
BR2_arm=y
BR2_cortex_a7=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y
BR2_SYSTEM_DHCP="eth0"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/liteboard/post-image.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.1"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-liteboard"
@@ -15,7 +15,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.04"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="liteboard"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 7be1754f54..5ac07a81b4 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -536,12 +536,13 @@ different steps of the build process.
should utilize this step if it has binaries which would be similar
to the kernel image, bootloader or root filesystem images.
-* +LIBFOO_INSTALL_INIT_SYSV+ and +LIBFOO_INSTALL_INIT_SYSTEMD+ list the
- actions to install init scripts either for the systemV-like init systems
- (busybox, sysvinit, etc.) or for the systemd units. These commands
- will be run only when the relevant init system is installed (i.e. if
- systemd is selected as the init system in the configuration, only
- +LIBFOO_INSTALL_INIT_SYSTEMD+ will be run).
+* +LIBFOO_INSTALL_INIT_SYSV+, +LIBFOO_INSTALL_INIT_OPENRC+ and
+ +LIBFOO_INSTALL_INIT_SYSTEMD+ list the actions to install init
+ scripts either for the systemV-like init systems (busybox,
+ sysvinit, etc.), openrc or for the systemd units. These commands
+ will be run only when the relevant init system is installed (i.e.
+ if systemd is selected as the init system in the configuration,
+ only +LIBFOO_INSTALL_INIT_SYSTEMD+ will be run).
* +LIBFOO_HELP_CMDS+ lists the actions to print the package help, which
is included to the main +make help+ output. These commands can print
diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index 32dacbdf06..14140d352c 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -22,18 +22,21 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI
However, it is recommended to use the latest version of the
Adeos/Ipipe patch available at
- http://download.gna.org/adeos/patches
+ https://xenomai.org/downloads/ipipe/
Xenomai is know to support Blackfin, SH4, x86, ARM, NIOS2
and PowerPC architectures.
config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
- string "Path for Adeos patch file"
+ string "Path/URL for Adeos patch file"
depends on BR2_LINUX_KERNEL_EXT_XENOMAI
help
- Optionally, explicitly specify the Adeos patch to use.
- Download it at http://download.gna.org/adeos/patches
- and verify that your kernel version in buildroot matches.
+ Optionally, explicitly specify where to find the Adeos
+ patch to use.
+ Examples:
+ https://xenomai.org/downloads/ipipe/v4.x/arm/ipipe-core-4.19.33-arm-2.patch
+ or /home/foo/ipipe-core-4.19.33-arm-2.patch
+ Please verify that your kernel version in Buildroot matches.
comment "xenomai needs a uClibc or glibc toolchain w/ threads"
depends on BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS
diff --git a/linux/linux-ext-xenomai.mk b/linux/linux-ext-xenomai.mk
index d066bb32ac..c7c112dac3 100644
--- a/linux/linux-ext-xenomai.mk
+++ b/linux/linux-ext-xenomai.mk
@@ -8,10 +8,20 @@ LINUX_EXTENSIONS += xenomai
# Adeos patch version
XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
+
+ifneq ($(filter ftp://% http://% https://%,$(XENOMAI_ADEOS_PATCH)),)
+XENOMAI_ADEOS_PATCH_NAME = $(notdir $(XENOMAI_ADEOS_PATCH))
+XENOMAI_ADEOS_PATCH_PATH = $(LINUX_DL_DIR)/$(XENOMAI_ADEOS_PATCH_NAME)
+LINUX_EXTRA_DOWNLOADS += $(XENOMAI_ADEOS_PATCH)
+BR_NO_CHECK_HASH_FOR += $(XENOMAI_ADEOS_PATCH_NAME)
+else
+XENOMAI_ADEOS_PATCH_PATH = $(XENOMAI_ADEOS_PATCH)
+endif
+
ifeq ($(XENOMAI_ADEOS_PATCH),)
XENOMAI_ADEOS_OPTS = --default
else
-XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH)
+XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH_PATH)
endif
# Prepare kernel patch
diff --git a/package/Config.in b/package/Config.in
index f592e74a99..f61009410d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -5,6 +5,7 @@ menu "Target packages"
source "package/skeleton-custom/Config.in"
source "package/skeleton-init-common/Config.in"
source "package/skeleton-init-none/Config.in"
+ source "package/skeleton-init-openrc/Config.in"
source "package/skeleton-init-systemd/Config.in"
source "package/skeleton-init-sysv/Config.in"
@@ -382,6 +383,7 @@ menu "Firmware"
source "package/armbian-firmware/Config.in"
source "package/b43-firmware/Config.in"
source "package/linux-firmware/Config.in"
+ source "package/murata-cyw-fw/Config.in"
source "package/rpi-bt-firmware/Config.in"
source "package/rpi-firmware/Config.in"
source "package/rpi-wifi-firmware/Config.in"
@@ -458,6 +460,7 @@ endmenu
source "package/iucode-tool/Config.in"
source "package/kbd/Config.in"
source "package/lcdproc/Config.in"
+ source "package/libubootenv/Config.in"
source "package/libuio/Config.in"
source "package/linuxconsoletools/Config.in"
source "package/linux-backports/Config.in"
@@ -859,6 +862,7 @@ menu "External python modules"
source "package/python-cryptography/Config.in"
source "package/python-cssselect/Config.in"
source "package/python-cssutils/Config.in"
+ source "package/python-cycler/Config.in"
source "package/python-daemon/Config.in"
source "package/python-daemonize/Config.in"
source "package/python-dataproperty/Config.in"
@@ -931,6 +935,7 @@ menu "External python modules"
source "package/python-markdown/Config.in"
source "package/python-markdown2/Config.in"
source "package/python-markupsafe/Config.in"
+ source "package/python-matplotlib/Config.in"
source "package/python-mbstrdecoder/Config.in"
source "package/python-meld3/Config.in"
source "package/python-mimeparse/Config.in"
@@ -1184,6 +1189,7 @@ menu "Compression and decompression"
source "package/snappy/Config.in"
source "package/szip/Config.in"
source "package/zlib/Config.in"
+ source "package/zziplib/Config.in"
endmenu
menu "Crypto"
@@ -1903,6 +1909,7 @@ menu "Networking applications"
source "package/ibrdtn-tools/Config.in"
source "package/ibrdtnd/Config.in"
source "package/ifenslave/Config.in"
+ source "package/ifmetric/Config.in"
source "package/ifplugd/Config.in"
source "package/iftop/Config.in"
source "package/ifupdown/Config.in"
@@ -2194,6 +2201,7 @@ menu "System tools"
source "package/ncdu/Config.in"
source "package/numactl/Config.in"
source "package/nut/Config.in"
+ source "package/openrc/Config.in"
source "package/openvmtools/Config.in"
source "package/pamtester/Config.in"
source "package/polkit/Config.in"
diff --git a/package/Config.in.host b/package/Config.in.host
index bc7e71882b..d1c6d0d81f 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -18,6 +18,7 @@ menu "Host utilities"
source "package/e2tools/Config.in.host"
source "package/f2fs-tools/Config.in.host"
source "package/faketime/Config.in.host"
+ source "package/fatcat/Config.in.host"
source "package/fwup/Config.in.host"
source "package/genext2fs/Config.in.host"
source "package/genimage/Config.in.host"
diff --git a/package/Makefile.in b/package/Makefile.in
index dc818a2c18..f05b9cc3aa 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -70,6 +70,15 @@ ABI := $(ABI)hf
endif
endif
+# For C-SKY abiv1 & abiv2
+ifeq ($(BR2_csky),y)
+ifeq ($(BR2_ck610),y)
+ABI = abiv1
+else
+ABI = abiv2
+endif
+endif
+
# For FSL PowerPC there's SPE
ifeq ($(BR2_powerpc_SPE),y)
ABI = spe
diff --git a/package/acl/acl.hash b/package/acl/acl.hash
index 091092a1c5..50c32d7734 100644
--- a/package/acl/acl.hash
+++ b/package/acl/acl.hash
@@ -1,2 +1,6 @@
# Locally calculated after checking pgp signature
sha256 06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7 acl-2.2.53.tar.gz
+
+# Locally calculated
+sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 doc/COPYING
+sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55 doc/COPYING.LGPL
diff --git a/package/alsa-lib/0002-alsa-lib-conditionally-enable-libdl-in-AM_PATH_ALSA-.patch b/package/alsa-lib/0002-alsa-lib-conditionally-enable-libdl-in-AM_PATH_ALSA-.patch
deleted file mode 100644
index 3aab64e5e8..0000000000
--- a/package/alsa-lib/0002-alsa-lib-conditionally-enable-libdl-in-AM_PATH_ALSA-.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 2aba563bd077fda94fb9c2c33002ee0ac119b345 Mon Sep 17 00:00:00 2001
-From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
-Date: Fri, 13 Apr 2018 09:13:46 +0200
-Subject: [PATCH] alsa-lib: conditionally enable libdl in AM_PATH_ALSA m4 macro
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The AM_PATH_ALSA macro in utils/alsa.m4 unconditionally uses -ldl. This
-breaks compilation of alsa-utils (and probably other packages using this
-macro) for targets that do not support dynamic loading, such as for
-Blackfin FLAT binaries.
-
-This patch updates the macro to check if dlopen is available, and use that
-result to conditionally add -ldl to the list of libraries.
-
-Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
-[Jörg: update for 1.1.6]
-Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
-Upstream: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-November/141377.html
----
- utils/alsa.m4 | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/utils/alsa.m4 b/utils/alsa.m4
-index e12310df..a5c5a292 100644
---- a/utils/alsa.m4
-+++ b/utils/alsa.m4
-@@ -44,6 +44,8 @@ if test "$alsa_inc_prefix" != "" ; then
- fi
- AC_MSG_RESULT($ALSA_CFLAGS)
-
-+AC_CHECK_LIB(c, dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")])
-+
- dnl add any special lib dirs
- AC_MSG_CHECKING(for ALSA LDFLAGS)
- if test "$alsa_prefix" != "" ; then
-@@ -52,7 +54,7 @@ if test "$alsa_prefix" != "" ; then
- fi
-
- dnl add the alsa library
--ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
-+ALSA_LIBS="$ALSA_LIBS -lasound -lm $LIBDL -lpthread"
- LIBS="$ALSA_LIBS $LIBS"
- AC_MSG_RESULT($ALSA_LIBS)
-
---
-2.14.3
-
diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash
index 4373a2a592..54b2a27ddf 100644
--- a/package/alsa-lib/alsa-lib.hash
+++ b/package/alsa-lib/alsa-lib.hash
@@ -1,4 +1,4 @@
# Locally calculated
-sha256 9d6000b882a3b2df56300521225d69717be6741b71269e488bb20a20783bdc09 alsa-lib-1.1.7.tar.bz2
+sha256 488373aef5396682f3a411a6d064ae0ad196b9c96269d0bb912fbdeec94b994b alsa-lib-1.1.9.tar.bz2
sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING
sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING
diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index 9de45d2089..fecf7d7cfa 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -4,7 +4,7 @@
#
################################################################################
-ALSA_LIB_VERSION = 1.1.7
+ALSA_LIB_VERSION = 1.1.9
ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver)
diff --git a/package/attr/attr.hash b/package/attr/attr.hash
index 88adf44e6a..ba9f45669f 100644
--- a/package/attr/attr.hash
+++ b/package/attr/attr.hash
@@ -1,2 +1,6 @@
# Locally calculated after checking pgp signature
sha256 5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7 attr-2.4.48.tar.gz
+
+# Locally calculated
+sha256 98f318493be6b08bff3cd295791cde06c54e17882a3c74a1ed245eaa02533d52 doc/COPYING
+sha256 5decad7e58d90d44335bf2f45ce27563bd911065c6a1a02dfa7647c4efee75c8 doc/COPYING.LGPL
diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index c3c3beb420..d9b34d7a9b 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -7,28 +7,38 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI
choice
prompt "Binutils Version"
- default BR2_BINUTILS_VERSION_2_31_X if !BR2_arc
+ default BR2_BINUTILS_VERSION_2_31_X if !BR2_arc && !BR2_csky
default BR2_BINUTILS_VERSION_ARC if BR2_arc
+ default BR2_BINUTILS_VERSION_CSKY if BR2_csky
help
Select the version of binutils you wish to use.
config BR2_BINUTILS_VERSION_2_30_X
bool "binutils 2.30"
+ depends on !BR2_csky
config BR2_BINUTILS_VERSION_2_31_X
bool "binutils 2.31.1"
+ depends on !BR2_csky
config BR2_BINUTILS_VERSION_2_32_X
bool "binutils 2.32"
+ depends on !BR2_csky
config BR2_BINUTILS_VERSION_ARC
bool "binutils arc (2.31)"
depends on BR2_arc
+
+config BR2_BINUTILS_VERSION_CSKY
+ bool "binutils csky"
+ depends on BR2_csky
+
endchoice
config BR2_BINUTILS_VERSION
string
- default "arc-2018.09-release" if BR2_BINUTILS_VERSION_ARC
+ default "arc-2019.03-rc1" if BR2_BINUTILS_VERSION_ARC
+ default "c66d8bbcebfddf713b2b436e1b135e6b125a55a5" if BR2_BINUTILS_VERSION_CSKY
default "2.30" if BR2_BINUTILS_VERSION_2_30_X
default "2.31.1" if BR2_BINUTILS_VERSION_2_31_X
default "2.32" if BR2_BINUTILS_VERSION_2_32_X
diff --git a/package/binutils/arc-2018.09-release/0005-poison-system-directories.patch b/package/binutils/arc-2019.03-rc1/0001-poison-system-directories.patch
index 90c7ac760a..90c7ac760a 100644
--- a/package/binutils/arc-2018.09-release/0005-poison-system-directories.patch
+++ b/package/binutils/arc-2019.03-rc1/0001-poison-system-directories.patch
diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash
index 039e3682f6..125372cc6f 100644
--- a/package/binutils/binutils.hash
+++ b/package/binutils/binutils.hash
@@ -4,4 +4,7 @@ sha512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe13
sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz
# Locally calculated (fetched from Github)
-sha512 a96dfcea6064fcd1aac1333ac0d631491bed8b0be9bdcf62f1447909c8f30d2cb8d9323ffeb7c9ad6b326ecddb72e3d28281684e73343189d0a4a37a11aef62f binutils-gdb-arc-2018.09-release.tar.gz
+sha512 ceb0546cb73a29526f2f8916d855fbed52b2fc86b6706687cabf57b96df06932714820edec2f9038529790e7925304778ded0944babc985a39371eb08c6c7f52 binutils-gdb-arc-2019.03-rc1.tar.gz
+
+# Locally calculated (fetched from https://github.com/c-sky/binutils-gdb)
+sha512 979552d4b3a4f31e9f3b9a7027321bd4eb3ac6c2d8deac1720e94e54f81d736db09c53c5d87c301010e307b64127e14400a036c7a35e5d63a954a4edd9cc8e2c binutils-c66d8bbcebfddf713b2b436e1b135e6b125a55a5.tar.gz
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index c70ba13b04..edb4be1869 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -9,17 +9,24 @@
BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION))
ifeq ($(BINUTILS_VERSION),)
ifeq ($(BR2_arc),y)
-BINUTILS_VERSION = arc-2018.09-release
+BINUTILS_VERSION = arc-2019.03-rc1
else
BINUTILS_VERSION = 2.31.1
endif
endif # BINUTILS_VERSION
-ifeq ($(BINUTILS_VERSION),arc-2018.09-release)
+ifeq ($(BINUTILS_VERSION),arc-2019.03-rc1)
BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION))
BINUTILS_SOURCE = binutils-gdb-$(BINUTILS_VERSION).tar.gz
BINUTILS_FROM_GIT = y
endif
+
+ifeq ($(BR2_csky),y)
+BINUTILS_SITE = $(call github,c-sky,binutils-gdb,$(BINUTILS_VERSION))
+BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
+BINUTILS_FROM_GIT = y
+endif
+
BINUTILS_SITE ?= $(BR2_GNU_MIRROR)/binutils
BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.xz
BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index e5c5f89a4d..bab00bf835 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -42,6 +42,7 @@ config BR2_PACKAGE_BUSYBOX_SELINUX
depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_USES_GLIBC
depends on !BR2_arc
+ select BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES
select BR2_PACKAGE_LIBSELINUX
help
Enable SELinux support in BusyBox. Please note that
diff --git a/package/bzip2/bzip2.hash b/package/bzip2/bzip2.hash
index 60b0a191ef..ffe94aa454 100644
--- a/package/bzip2/bzip2.hash
+++ b/package/bzip2/bzip2.hash
@@ -1,2 +1,6 @@
# From http://www.bzip.org/downloads.html
md5 00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz
+
+# Locally calculated
+sha256 a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd bzip2-1.0.6.tar.gz
+sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 LICENSE
diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash
index f138ac79a1..9e0159a3c8 100644
--- a/package/cmake/cmake.hash
+++ b/package/cmake/cmake.hash
@@ -1,2 +1,5 @@
# From http://www.cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt
sha256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d cmake-3.8.2.tar.gz
+
+# Locally calculated
+sha256 af3030e1bf1af2f534430fdfe3cfc5a617966648a2a7f0c06a631adc92be1e5f Copyright.txt
diff --git a/package/cog/cog.hash b/package/cog/cog.hash
index 97daf72744..39cf2afdbd 100644
--- a/package/cog/cog.hash
+++ b/package/cog/cog.hash
@@ -1,5 +1,5 @@
# Locally generated
-sha256 a6abadb78395226bac2e1dd5467feab2cc8c493eab6894a09a51a8e072e38c06 cog-v0.2.0.tar.gz
+sha256 755c68029bbd05a17784262e56021362740783d15868dab9402a125ef35eedaf cog-v0.3.0.tar.gz
# Hashes for license files:
sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING
diff --git a/package/cog/cog.mk b/package/cog/cog.mk
index 43f13152c8..b56a772a25 100644
--- a/package/cog/cog.mk
+++ b/package/cog/cog.mk
@@ -4,8 +4,9 @@
#
################################################################################
-COG_VERSION = v0.2.0
+COG_VERSION = v0.3.0
COG_SITE = $(call github,Igalia,cog,$(COG_VERSION))
+COG_INSTALL_STAGING = YES
COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo
COG_LICENSE = MIT
COG_LICENSE_FILES = COPYING
diff --git a/package/connman/connman.hash b/package/connman/connman.hash
index fad1c55d2d..ff5b4d48f0 100644
--- a/package/connman/connman.hash
+++ b/package/connman/connman.hash
@@ -1,4 +1,4 @@
# From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc
-sha256 c789db41cc443fa41e661217ea321492ad59a004bebcd1aa013f3bc10a6e0074 connman-1.36.tar.xz
+sha256 6ce29b3eb0bb16a7387bc609c39455fd13064bdcde5a4d185fab3a0c71946e16 connman-1.37.tar.xz
# Locally computed
sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index b67d1c4b86..839bc7a0e2 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -4,7 +4,7 @@
#
################################################################################
-CONNMAN_VERSION = 1.36
+CONNMAN_VERSION = 1.37
CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz
CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman
CONNMAN_DEPENDENCIES = libglib2 dbus iptables
diff --git a/package/cups-filters/0002-Poppler-removed-memCheck-and-gMemReport-functions.patch b/package/cups-filters/0002-Poppler-removed-memCheck-and-gMemReport-functions.patch
deleted file mode 100644
index 3eb2d35c3e..0000000000
--- a/package/cups-filters/0002-Poppler-removed-memCheck-and-gMemReport-functions.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 6b0747c1630dd973acd138f927dbded4ea45e360 Mon Sep 17 00:00:00 2001
-From: Olivier Schonken <olivier.schonken@gmail.com>
-Date: Fri, 5 Oct 2018 12:05:31 +0200
-Subject: [PATCH] Poppler removed memCheck and gMemReport functions
-
-Only use gMemReport and memCheck functions if poppler version less
-than 0.69.0
-
-The poppler project removed the memCheck and gMemReport functions in
-commits c362ab1b97f20c5b73b3bad8d52015f679178748 - Remove DEBUG_MEM
-from Object since this uses RAII now and hence cannot leak.
-(The existing tracking also is not thread-safe and hence unreliable.)
-
-and
-
-f89446f6917a869b0f1a80fcc8ce81a7213dade4 - Remove generic heap debugging
-from gmem since external tools and compiler instrumentation achieve the
-same effect.
-
-This commit solves https://github.com/OpenPrinting/cups-filters/issues/62
-
-Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
----
- filter/pdftoijs.cxx | 2 ++
- filter/pdftoopvp/pdftoopvp.cxx | 2 ++
- filter/pdftoraster.cxx | 2 ++
- 3 files changed, 6 insertions(+)
-
-diff --git a/filter/pdftoijs.cxx b/filter/pdftoijs.cxx
-index 22bc33f4..dd6b6fa0 100644
---- a/filter/pdftoijs.cxx
-+++ b/filter/pdftoijs.cxx
-@@ -503,9 +503,11 @@ err1:
- ppdClose(ppd);
- free(outputfile);
-
-+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
- // Check for memory leaks
- Object::memCheck(stderr);
- gMemReport(stderr);
-+#endif
-
- return exitCode;
- }
-diff --git a/filter/pdftoopvp/pdftoopvp.cxx b/filter/pdftoopvp/pdftoopvp.cxx
-index 024941ab..bf25983b 100644
---- a/filter/pdftoopvp/pdftoopvp.cxx
-+++ b/filter/pdftoopvp/pdftoopvp.cxx
-@@ -763,9 +763,11 @@ err2:
- err0:
- delete globalParams;
-
-+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
- // check for memory leaks
- Object::memCheck(stderr);
- gMemReport(stderr);
-+#endif
-
- }
- /* muntrace(); */
-diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx
-index 0c63ab8d..4ebf02b0 100644
---- a/filter/pdftoraster.cxx
-+++ b/filter/pdftoraster.cxx
-@@ -2162,9 +2162,11 @@ err1:
- cmsDeleteTransform(colorTransform);
- }
-
-+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
- // Check for memory leaks
- Object::memCheck(stderr);
- gMemReport(stderr);
-+#endif
-
- return exitCode;
- }
---
-2.17.1
-
diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash
index e426ad8b86..c4e0a40e43 100644
--- a/package/cups-filters/cups-filters.hash
+++ b/package/cups-filters/cups-filters.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 981b280bc5275a21c6f436aff6207e03cab36dc304c119bbac507db940e7421c cups-filters-1.21.3.tar.gz
+sha256 3c03ab7dbfe3642b6cd279a0b63edc8274b7d9740cb087f68d3186c9144988a6 cups-filters-1.23.0.tar.gz
sha256 8e697cf4681ebbca716bf8cc30dde51c264e32ceee41fa63ceb5213334204b83 COPYING
diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk
index 81d9195652..214647a90e 100644
--- a/package/cups-filters/cups-filters.mk
+++ b/package/cups-filters/cups-filters.mk
@@ -4,7 +4,7 @@
#
################################################################################
-CUPS_FILTERS_VERSION = 1.21.3
+CUPS_FILTERS_VERSION = 1.23.0
CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters
CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause
CUPS_FILTERS_LICENSE_FILES = COPYING
diff --git a/package/dbus-glib/dbus-glib.hash b/package/dbus-glib/dbus-glib.hash
index 8a80b71b45..098832431e 100644
--- a/package/dbus-glib/dbus-glib.hash
+++ b/package/dbus-glib/dbus-glib.hash
@@ -1,2 +1,5 @@
# Locally calculated after checking pgp signature
sha256 7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825 dbus-glib-0.110.tar.gz
+
+# Locally calculated
+sha256 ef1634fc21d9112dca08f2557313584719d534d05213cf14f3c77938506266b4 COPYING
diff --git a/package/dbus-python/dbus-python.hash b/package/dbus-python/dbus-python.hash
index 991bb42787..5bf2f507c6 100644
--- a/package/dbus-python/dbus-python.hash
+++ b/package/dbus-python/dbus-python.hash
@@ -1,2 +1,5 @@
# Locally calculated after checking pgp signature
sha256 abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f dbus-python-1.2.8.tar.gz
+
+# Locally calculated
+sha256 1e4562245383fdb5203b1769789e5b28bba21af4923aea7e8b2614f7f93623c0 COPYING
diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash
index 605e87609e..6769cdac49 100644
--- a/package/dhcpcd/dhcpcd.hash
+++ b/package/dhcpcd/dhcpcd.hash
@@ -1,4 +1,4 @@
-# sha256 from ftp://roy.marples.name/pub/dhcpcd/dhcpcd-7.0.3.tar.xz.distinfo.asc
-sha256 a255d9aecceb1c77a9862f1c0d31a48ba37aab5ef2ca5ad76fc7a907b6ea292e dhcpcd-7.0.3.tar.xz
+# sha256 from ftp://roy.marples.name/pub/dhcpcd/dhcpcd-7.2.2.tar.xz.distinfo
+sha256 3db7ff18cba9274da1d2176fb3c7cbe23926a8e58d5c8e244ad55c62d38ba09e dhcpcd-7.2.2.tar.xz
# Locally calculated
-sha256 b120a64b92cfb2453b61df4457a3c0eb163ef9c1c397822826756a31581f3947 LICENSE
+sha256 213fc1a704cecdb322276fa7c95891fd1c23137d9ab572af1fc5e91b48762303 LICENSE
diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
index ae16c340d6..a0f0c2bf42 100644
--- a/package/dhcpcd/dhcpcd.mk
+++ b/package/dhcpcd/dhcpcd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DHCPCD_VERSION = 7.0.3
+DHCPCD_VERSION = 7.2.2
DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz
DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd
DHCPCD_DEPENDENCIES = host-pkgconf
diff --git a/package/domoticz/0001-Bumped-version.patch b/package/domoticz/0001-Bumped-version.patch
deleted file mode 100644
index 70426ba1aa..0000000000
--- a/package/domoticz/0001-Bumped-version.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 98723b7da9467a49222b8a7ffaae276c5bc075c1 Mon Sep 17 00:00:00 2001
-From: gizmocuz <gizmocuz@users.noreply.github.com>
-Date: Thu, 28 Jun 2018 08:00:58 +0200
-Subject: [PATCH] Bumped version
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from https://github.com/domoticz/domoticz/commit/98723b7da9467a49222b8a7ffaae276c5bc075c1]
----
- appversion.default | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/appversion.default b/appversion.default
-index beaa069bb..7d3530590 100644
---- a/appversion.default
-+++ b/appversion.default
-@@ -1,3 +1,3 @@
--#define APPVERSION 5876
-+#define APPVERSION 9700
- #define APPHASH "b97777b"
- #define APPDATE 1478691222
diff --git a/package/domoticz/0001-appversion.default-bump-version-to-10717.patch b/package/domoticz/0001-appversion.default-bump-version-to-10717.patch
new file mode 100644
index 0000000000..df0f1b339a
--- /dev/null
+++ b/package/domoticz/0001-appversion.default-bump-version-to-10717.patch
@@ -0,0 +1,23 @@
+From 4d8bbaf4bdffe4fa77a060cd7fa848f3001d46a8 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 21 May 2019 21:08:13 +0200
+Subject: [PATCH] appversion.default: bump version to 10717
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/domoticz/domoticz/pull/3251]
+---
+ appversion.default | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/appversion.default b/appversion.default
+index 7d3530590..6fc5766c2 100644
+--- a/appversion.default
++++ b/appversion.default
+@@ -1,3 +1,3 @@
+-#define APPVERSION 9700
++#define APPVERSION 10717
+ #define APPHASH "b97777b"
+ #define APPDATE 1478691222
+--
+2.20.1
+
diff --git a/package/domoticz/0002-CMakeLists.txt-fix-build-with-python-and-cmake-3.7.patch b/package/domoticz/0002-CMakeLists.txt-fix-build-with-python-and-cmake-3.7.patch
deleted file mode 100644
index a0adbdfed9..0000000000
--- a/package/domoticz/0002-CMakeLists.txt-fix-build-with-python-and-cmake-3.7.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 4b77662232c806b8aba7680405144ad51ac3671b Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Thu, 29 Nov 2018 00:36:00 +0100
-Subject: [PATCH] CMakeLists.txt: fix build with python and cmake <= 3.7
-
-domoticz will fail to build with python and older cmake
-Indeed, find_package(PythonLibs 3.4) will not recognize python 3.7 until
-cmake 3.7 and the following commit:
-https://github.com/Kitware/CMake/commit/c31573b9641e0f1bc7a34149506db51f3494323b
-
-To fix this, add a call to find_package(PythonInterp 3.4). Indeed, if
-FindPythonInterp has already found the major and minor version, that
-version will be inserted between the user supplied versions and the
-stock version list since cmake in version 3.1 and
-https://github.com/Kitware/CMake/commit/3816cd2dc7a7cc220e4f1b1e87fee986545b9cb3
-
-Fixes:
- - http://autobuild.buildroot.org/results/8e82501a7b49da628ec026132ffca44c0c813040
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/domoticz/domoticz/pull/2889]
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f4e38b88..41003a0c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -125,6 +125,7 @@ ENDIF(USE_BUILTIN_SQLITE)
-
- option(USE_PYTHON "Use Python for Plugins and Event-Scripts" YES)
- IF(USE_PYTHON)
-+ find_package(PythonInterp 3.4)
- find_package(PythonLibs 3.4)
- IF(PYTHONLIBS_FOUND)
- MESSAGE(STATUS "Python3 includes found at: ${PYTHON_INCLUDE_PATH}")
---
-2.14.1
-
diff --git a/package/domoticz/0003-Fix-for-boot-1-70-get_io_service.patch.patch b/package/domoticz/0003-Fix-for-boot-1-70-get_io_service.patch.patch
deleted file mode 100644
index 28807fc0b0..0000000000
--- a/package/domoticz/0003-Fix-for-boot-1-70-get_io_service.patch.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 9d226dab339f5767ec01ea1bcc9043ceee185cca Mon Sep 17 00:00:00 2001
-From: Rob Peters <info@domoticz.com>
-Date: Mon, 25 Mar 2019 08:50:23 +0100
-Subject: [PATCH] Fix for boot 1.70 get_io_service, fixed #3117
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://github.com/domoticz/domoticz/commit/9d226dab339f5767ec01ea1bcc9043ceee185cca]
----
- hardware/Pinger.cpp | 10 ++++++++--
- hardware/TCPProxy/tcpproxy_server.cpp | 8 +++++++-
- 2 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/hardware/Pinger.cpp b/hardware/Pinger.cpp
-index 01a955ba4..184378738 100644
---- a/hardware/Pinger.cpp
-+++ b/hardware/Pinger.cpp
-@@ -18,6 +18,12 @@
-
- #include <iostream>
-
-+#if BOOST_VERSION >= 107000
-+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
-+#else
-+#define GET_IO_SERVICE(s) ((s).get_io_service())
-+#endif
-+
- class pinger
- : private domoticz::noncopyable
- {
-@@ -76,7 +82,7 @@ class pinger
- num_tries_++;
- if (num_tries_ > 4)
- {
-- resolver_.get_io_service().stop();
-+ GET_IO_SERVICE(resolver_).stop();
- }
- else
- {
-@@ -118,7 +124,7 @@ class pinger
- if (num_replies_++ == 0)
- timer_.cancel();
- m_PingState = true;
-- resolver_.get_io_service().stop();
-+ GET_IO_SERVICE(resolver_).stop();
- }
- else
- {
-diff --git a/hardware/TCPProxy/tcpproxy_server.cpp b/hardware/TCPProxy/tcpproxy_server.cpp
-index fddac08de..60445d9c2 100644
---- a/hardware/TCPProxy/tcpproxy_server.cpp
-+++ b/hardware/TCPProxy/tcpproxy_server.cpp
-@@ -15,6 +15,12 @@
- #include "stdafx.h"
- #include "tcpproxy_server.h"
-
-+#if BOOST_VERSION >= 107000
-+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
-+#else
-+#define GET_IO_SERVICE(s) ((s).get_io_service())
-+#endif
-+
- namespace tcp_proxy
- {
- bridge::bridge(boost::asio::io_service& ios)
-@@ -38,7 +44,7 @@ namespace tcp_proxy
- boost::asio::ip::tcp::endpoint end;
-
-
-- boost::asio::io_service &ios=downstream_socket_.get_io_service();
-+ boost::asio::io_service &ios= GET_IO_SERVICE(downstream_socket_);
- boost::asio::ip::tcp::resolver resolver(ios);
- boost::asio::ip::tcp::resolver::query query(upstream_host, upstream_port, boost::asio::ip::resolver_query_base::numeric_service);
- boost::asio::ip::tcp::resolver::iterator i = resolver.resolve(query);
diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash
index 106d242d0d..3d974b3f8d 100644
--- a/package/domoticz/domoticz.hash
+++ b/package/domoticz/domoticz.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 c31f185a1ffac01b86a77bf33e059a4403d814e826c9d6639c63c2e9afa55a46 domoticz-4.9700.tar.gz
+sha256 c053a2161942529f56b748945ec297dcd67f449e68029fc886893a528891ad86 domoticz-4.10717.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt
diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk
index 7f094d0976..9636e208d0 100644
--- a/package/domoticz/domoticz.mk
+++ b/package/domoticz/domoticz.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DOMOTICZ_VERSION = 4.9700
+DOMOTICZ_VERSION = 4.10717
DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION))
DOMOTICZ_LICENSE = GPL-3.0
DOMOTICZ_LICENSE_FILES = License.txt
diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in
index 62f77bad9d..e14a670c19 100644
--- a/package/dropbear/Config.in
+++ b/package/dropbear/Config.in
@@ -66,4 +66,11 @@ config BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO
DSA public keys
Diffie-Hellman Group1 key exchange
+config BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE
+ string "path to custom localoptions.h definitions file"
+ help
+ Path to a file whose contents will be appended to Dropbear
+ localoptions.h. It can be used to tweak the Dropbear
+ configuration.
+
endif
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index 9c995c3894..7cbc16bc3d 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -124,6 +124,14 @@ ifneq ($(BR2_PACKAGE_DROPBEAR_LASTLOG),y)
DROPBEAR_CONF_OPTS += --disable-lastlog
endif
+DROPBEAR_LOCALOPTIONS_FILE = $(call qstrip,$(BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE))
+ifneq ($(DROPBEAR_LOCALOPTIONS_FILE),)
+define DROPBEAR_APPEND_LOCALOPTIONS_FILE
+ cat $(DROPBEAR_LOCALOPTIONS_FILE) >> $(@D)/localoptions.h
+endef
+DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_APPEND_LOCALOPTIONS_FILE
+endif
+
define DROPBEAR_INSTALL_TARGET_CMDS
$(INSTALL) -m 755 $(@D)/dropbearmulti $(TARGET_DIR)/usr/sbin/dropbear
for f in $(DROPBEAR_TARGET_BINS); do \
diff --git a/package/dt-utils/0001-src-fix-compilation-for-glibc-version-2.27.9000-36.f.patch b/package/dt-utils/0001-src-fix-compilation-for-glibc-version-2.27.9000-36.f.patch
deleted file mode 100644
index 8c2f585946..0000000000
--- a/package/dt-utils/0001-src-fix-compilation-for-glibc-version-2.27.9000-36.f.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 1c80e31872aec9f2ef7eca6a52aa89c0ea759d8f Mon Sep 17 00:00:00 2001
-From: Enrico Joerns <ejo@pengutronix.de>
-Date: Wed, 5 Sep 2018 12:28:28 +0200
-Subject: [PATCH] src: fix compilation for glibc version 2.27.9000-36.fc29 and
- newer
-
-As recent glibc versions (>= 2.27.9000-36.fc29) also define 'struct
-statx' which is also defined in linux/stat.h, compilation fails with
-error:
-
-| In file included from ../dt-utils-2018.05.0/src/crypto/digest.c:24:
-| [..]/usr/include/linux/stat.h:56:8: error: redefinition of 'struct statx_timestamp'
-| struct statx_timestamp {
-| ^~~~~~~~~~~~~~~
-| In file included from [..]/usr/include/sys/stat.h:446,
-| from ../dt-utils-2018.05.0/src/dt/common.h:15,
-| from ../dt-utils-2018.05.0/src/crypto/digest.c:19:
-| [..]/usr/include/bits/statx.h:25:8: note: originally defined here
-| struct statx_timestamp
-| ^~~~~~~~~~~~~~~
-| In file included from ../dt-utils-2018.05.0/src/crypto/digest.c:24:
-| [..]/usr/include/linux/stat.h:99:8: error: redefinition of 'struct statx'
-| struct statx {
-| ^~~~~
-| In file included from [..]/usr/include/sys/stat.h:446,
-| from ../dt-utils-2018.05.0/src/dt/common.h:15,
-| from ../dt-utils-2018.05.0/src/crypto/digest.c:19:
-| [..]/usr/include/bits/statx.h:36:8: note: originally defined here
-| struct statx
-| ^~~~~
-
-The linux/stat.h originates from the code that was copied from barebox
-but is not explicitly required to be linux/stat.h instead of sys/stat.h
-and we do not actually use struct statx.
-
-Thus it is safe to simply replace occurrences of linux/stat.h by
-sys/stat.h to fix compilation.
-
-Signed-off-by: Enrico Joerns <ejo@pengutronix.de>
-[Thomas: backport from upstream.]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- src/barebox-state/backend_storage.c | 2 +-
- src/crypto/digest.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/barebox-state/backend_storage.c b/src/barebox-state/backend_storage.c
-index 53fe829..1052656 100644
---- a/src/barebox-state/backend_storage.c
-+++ b/src/barebox-state/backend_storage.c
-@@ -19,7 +19,7 @@
- #include <linux/kernel.h>
- #include <linux/list.h>
- #include <linux/mtd/mtd-abi.h>
--#include <linux/stat.h>
-+#include <sys/stat.h>
- #include <linux/fs.h>
- #include <malloc.h>
- #include <printk.h>
-diff --git a/src/crypto/digest.c b/src/crypto/digest.c
-index 7a8c3c0..8353412 100644
---- a/src/crypto/digest.c
-+++ b/src/crypto/digest.c
-@@ -21,7 +21,7 @@
- #include <malloc.h>
- #include <fs.h>
- #include <fcntl.h>
--#include <linux/stat.h>
-+#include <sys/stat.h>
- #include <errno.h>
- #include <module.h>
- #include <linux/err.h>
---
-2.19.2
-
diff --git a/package/dt-utils/dt-utils.hash b/package/dt-utils/dt-utils.hash
index 5805adf361..3610fe164f 100644
--- a/package/dt-utils/dt-utils.hash
+++ b/package/dt-utils/dt-utils.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 d0f53c76bc9f821a6506c8db3b623922d82570a017a9a40ad118bd7c957672b6 dt-utils-v2018.05.0.tar.gz
+sha256 61440ab222543268923175eb5c7425076d2b8bce4c1dfc177f2eb3873449af7c dt-utils-v2019.01.0.tar.gz
sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING
diff --git a/package/dt-utils/dt-utils.mk b/package/dt-utils/dt-utils.mk
index 3dbadc7b9e..25c287d434 100644
--- a/package/dt-utils/dt-utils.mk
+++ b/package/dt-utils/dt-utils.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DT_UTILS_VERSION = v2018.05.0
+DT_UTILS_VERSION = v2019.01.0
DT_UTILS_SITE = https://git.pengutronix.de/git/tools/dt-utils
DT_UTILS_SITE_METHOD = git
DT_UTILS_LICENSE = GPL-2.0
diff --git a/package/efl/efl.hash b/package/efl/efl.hash
index bef0a73ff1..f9015681ee 100644
--- a/package/efl/efl.hash
+++ b/package/efl/efl.hash
@@ -1,5 +1,5 @@
-# From https://download.enlightenment.org/rel/libs/efl/efl-1.22.1.tar.xz.sha256
-sha256 20d3e5e945d54ae46ec916c7341b5dec24f904b6c0123b4d3ecb8cd8d596ae12 efl-1.22.1.tar.xz
+# From https://download.enlightenment.org/rel/libs/efl/efl-1.22.2.tar.xz.sha256
+sha256 1699891f825911622de0aa77fe1140eff7335aba619d2352485e54dcff6b1cd0 efl-1.22.2.tar.xz
sha256 d949e42ca8fd48d275c397c5fc2ac34c9b63ada715dcaf1a670e17bb62964341 COMPLIANCE
sha256 1f0597d326e2fdb54aa2f0caec6d8bb0afb9941ef32475f017ed02ca214fcf37 COPYING
diff --git a/package/efl/efl.mk b/package/efl/efl.mk
index 959ed0cc3b..6f7c09ffa3 100644
--- a/package/efl/efl.mk
+++ b/package/efl/efl.mk
@@ -4,7 +4,7 @@
#
################################################################################
-EFL_VERSION = 1.22.1
+EFL_VERSION = 1.22.2
EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
EFL_SITE = http://download.enlightenment.org/rel/libs/efl
EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT
diff --git a/package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch b/package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch
new file mode 100644
index 0000000000..f64e3d9a87
--- /dev/null
+++ b/package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch
@@ -0,0 +1,31 @@
+From 3ca3044859f40d7c595daf0a93393352e4999fb7 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Thu, 30 May 2019 23:46:27 +0200
+Subject: [PATCH] ell/ecc.h: fix build with uclibc
+
+ssize_t is defined in sys/types.h
+
+Fixes:
+ - http://autobuild.buildroot.org/results/444c9deb728fb041e560d940145f96cc4f455080
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ ell/ecc.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ell/ecc.h b/ell/ecc.h
+index 26a5889..65c49e8 100644
+--- a/ell/ecc.h
++++ b/ell/ecc.h
+@@ -27,6 +27,8 @@
+ extern "C" {
+ #endif
+
++#include <sys/types.h> // for ssize_t
++
+ #define L_ECC_MAX_DIGITS 6
+ #define L_ECC_SCALAR_MAX_BYTES L_ECC_MAX_DIGITS * 8
+ #define L_ECC_POINT_MAX_BYTES L_ECC_SCALAR_MAX_BYTES * 2
+--
+2.20.1
+
diff --git a/package/ell/ell.hash b/package/ell/ell.hash
index dd6e90f3fc..f5062d0528 100644
--- a/package/ell/ell.hash
+++ b/package/ell/ell.hash
@@ -1,5 +1,5 @@
# Locally computed
-sha256 bb7038340bfa4eed57700a42da235ba2efce19fe7ab6b976af3e69ee9597a4dd ell-0.16.tar.gz
+sha256 6faf84fb5a5285f97c65f21e43d496c5954f62f94079422883c01e80d488c676 ell-0.20.tar.gz
# License files
sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING
diff --git a/package/ell/ell.mk b/package/ell/ell.mk
index 9f610e7d23..9893245b0a 100644
--- a/package/ell/ell.mk
+++ b/package/ell/ell.mk
@@ -4,7 +4,7 @@
#
################################################################################
-ELL_VERSION = 0.16
+ELL_VERSION = 0.20
ELL_SITE = https://git.kernel.org/pub/scm/libs/ell/ell.git
ELL_SITE_METHOD = git
ELL_LICENSE = LGPL-2.1+
diff --git a/package/fatcat/Config.in.host b/package/fatcat/Config.in.host
new file mode 100644
index 0000000000..2c5f66981b
--- /dev/null
+++ b/package/fatcat/Config.in.host
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_FATCAT
+ bool "host fatcat"
+ help
+ Fatcat is designed to manipulate FAT filesystems, in order
+ to explore, extract, repair, recover and forensic them. It
+ currently supports FAT12, FAT16 and FAT32.
+
+ https://github.com/Gregwar/fatcat
diff --git a/package/fatcat/fatcat.hash b/package/fatcat/fatcat.hash
new file mode 100644
index 0000000000..a5a6f670ad
--- /dev/null
+++ b/package/fatcat/fatcat.hash
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256 d44f6bb80d20ed50095ace9e71df8da98037db9f22cda76bdd9724d37df69130 fatcat-1.0.6.tar.gz
+sha256 3ea03755e32cf7f5b12981de92a0fdad396448195fe0024990c9cbc388e9866c LICENSE
diff --git a/package/fatcat/fatcat.mk b/package/fatcat/fatcat.mk
new file mode 100644
index 0000000000..e4f8d757b6
--- /dev/null
+++ b/package/fatcat/fatcat.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# fatcat
+#
+################################################################################
+
+FATCAT_VERSION = 1.0.6
+FATCAT_SITE = $(call github,Gregwar,fatcat,$(FATCAT_VERSION))
+FATCAT_LICENSE = MIT
+FATCAT_LICENSE_FILES = LICENSE
+
+$(eval $(host-cmake-package))
diff --git a/package/fontconfig/fontconfig.hash b/package/fontconfig/fontconfig.hash
index 5243c09615..153f00c3d8 100644
--- a/package/fontconfig/fontconfig.hash
+++ b/package/fontconfig/fontconfig.hash
@@ -1,2 +1,5 @@
# From https://lists.freedesktop.org/archives/fontconfig/2018-August/006324.html
sha256 f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741 fontconfig-2.13.1.tar.bz2
+
+# Locally calculated
+sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 COPYING
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index b477fe56e7..bf22d1b843 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -3,6 +3,7 @@ comment "GCC Options"
choice
prompt "GCC compiler Version"
default BR2_GCC_VERSION_ARC if BR2_arc
+ default BR2_GCC_VERSION_CSKY if BR2_csky
default BR2_GCC_VERSION_OR1K if BR2_or1k
default BR2_GCC_VERSION_7_X
help
@@ -14,6 +15,12 @@ config BR2_GCC_VERSION_ARC
depends on BR2_arc
select BR2_TOOLCHAIN_GCC_AT_LEAST_8
+config BR2_GCC_VERSION_CSKY
+ bool "gcc csky"
+ # Only supported architecture
+ depends on BR2_csky
+ select BR2_TOOLCHAIN_GCC_AT_LEAST_6
+
config BR2_GCC_VERSION_OR1K
bool "gcc or1k (5.x)"
# Only supported architecture
@@ -25,6 +32,7 @@ config BR2_GCC_VERSION_4_9_X
depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5
# Broken or unsupported architectures
depends on !BR2_arc
+ depends on !BR2_csky
depends on !BR2_or1k
# musl on microblaze, ppc64 and mips64 unsupported
depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_microblazeel || BR2_microblazebe))
@@ -39,6 +47,7 @@ config BR2_GCC_VERSION_5_X
depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6
# Broken or unsupported architectures
depends on !BR2_arc
+ depends on !BR2_csky
depends on !BR2_or1k
# musl on ppc64 and mips64 unsupported
depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le))
@@ -52,6 +61,7 @@ config BR2_GCC_VERSION_6_X
depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7
# Broken or unsupported architectures
depends on !BR2_arc
+ depends on !BR2_csky
depends on !BR2_or1k
select BR2_TOOLCHAIN_GCC_AT_LEAST_6
@@ -59,12 +69,14 @@ config BR2_GCC_VERSION_7_X
bool "gcc 7.x"
depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8
# Broken or unsupported architectures
+ depends on !BR2_csky
depends on !BR2_or1k
select BR2_TOOLCHAIN_GCC_AT_LEAST_7
config BR2_GCC_VERSION_8_X
bool "gcc 8.x"
# Broken or unsupported architectures
+ depends on !BR2_csky
depends on !BR2_or1k
# powerpc spe support has been deprecated since gcc 8.x.
# https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html
@@ -86,8 +98,9 @@ config BR2_GCC_VERSION
default "6.5.0" if BR2_GCC_VERSION_6_X
default "7.4.0" if BR2_GCC_VERSION_7_X
default "8.3.0" if BR2_GCC_VERSION_8_X
- default "arc-2018.09-release" if BR2_GCC_VERSION_ARC
+ default "arc-2019.03-rc1" if BR2_GCC_VERSION_ARC
default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K
+ default "48152afb96c59733d5bc79e3399bb7b3d4b44266" if BR2_GCC_VERSION_CSKY
config BR2_EXTRA_GCC_CONFIG_OPTIONS
string "Additional gcc options"
diff --git a/package/gcc/arc-2018.09-release/0100-uclibc-conf.patch b/package/gcc/arc-2019.03-rc1/0100-uclibc-conf.patch
index d354baf81f..d354baf81f 100644
--- a/package/gcc/arc-2018.09-release/0100-uclibc-conf.patch
+++ b/package/gcc/arc-2019.03-rc1/0100-uclibc-conf.patch
diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash
index 4f1e7f932f..09926f3b91 100644
--- a/package/gcc/gcc.hash
+++ b/package/gcc/gcc.hash
@@ -10,6 +10,8 @@ sha512 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6
sha512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802 gcc-8.3.0.tar.xz
# Locally calculated (fetched from Github)
-sha512 4d12c3ac27b9de9c533be3b8964cf23d21bf6933b5073183e1affe714b0ff33f9d6169e3b55a5c505d7dae33c9bb4f8b0d110461e3a124182d8c8d51b66b8e45 gcc-arc-2018.09-release.tar.gz
+sha512 5b80cfa987f615659ccfbd4b3f0cea5a28d8464398b5f7163d9cfad2fec1b15e8e6575628f3f6094a1081be9d4f521ca33795105d1d12295c7207935f51603c0 gcc-arc-2019.03-rc1.tar.gz
# Locally calculated (fetched from Github)
sha512 2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1 gcc-or1k-musl-5.4.0-20170218.tar.gz
+# Locally calculated (fetched from https://github.com/c-sky/gcc)
+sha512 1c3564fd6573dce13451a73015e7d88fecbb214dc1df96607976255b1d8b9e60318405333f4f218eea8d07e3675a802b66eff6df3921d505c4036481512792c2 gcc-48152afb96c59733d5bc79e3399bb7b3d4b44266.tar.gz
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 5901624ea5..abc29c7df0 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -16,6 +16,9 @@ GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
else ifeq ($(BR2_or1k),y)
GCC_SITE = $(call github,openrisc,or1k-gcc,$(GCC_VERSION))
GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
+else ifeq ($(BR2_csky),y)
+GCC_SITE = $(call github,c-sky,gcc,$(GCC_VERSION))
+GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
else
GCC_SITE = $(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION)
# From version 5.5.0, 6.4.0, 7.2.0 and 8.1.0 a bz2 release tarball is not
diff --git a/package/gcr/gcr.hash b/package/gcr/gcr.hash
index 8b8b748b9e..a78f56517d 100644
--- a/package/gcr/gcr.hash
+++ b/package/gcr/gcr.hash
@@ -1,2 +1,3 @@
-# From http://ftp.acc.umu.se/pub/gnome/sources/gcr/3.20/gcr-3.20.0.sha256sum
-sha256 90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379 gcr-3.20.0.tar.xz
+# From http://ftp.acc.umu.se/pub/gnome/sources/gcr/3.28/gcr-3.28.1.sha256sum
+sha256 95204aa2111c301778ebfbe60975ce3ed698c958430ffcc2a785ac5e593d168b gcr-3.28.1.tar.xz
+sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING
diff --git a/package/gcr/gcr.mk b/package/gcr/gcr.mk
index 7cb35af836..7cf7ea79e5 100644
--- a/package/gcr/gcr.mk
+++ b/package/gcr/gcr.mk
@@ -4,8 +4,8 @@
#
################################################################################
-GCR_VERSION_MAJOR = 3.20
-GCR_VERSION = $(GCR_VERSION_MAJOR).0
+GCR_VERSION_MAJOR = 3.28
+GCR_VERSION = $(GCR_VERSION_MAJOR).1
GCR_SITE = http://ftp.acc.umu.se/pub/gnome/sources/gcr/$(GCR_VERSION_MAJOR)
GCR_SOURCE = gcr-$(GCR_VERSION).tar.xz
GCR_DEPENDENCIES = host-intltool host-pkgconf libgcrypt libglib2 p11-kit
diff --git a/package/gdb/Config.in b/package/gdb/Config.in
index 0c3465d145..ab3d2157b6 100644
--- a/package/gdb/Config.in
+++ b/package/gdb/Config.in
@@ -57,6 +57,7 @@ config BR2_PACKAGE_GDB_DEBUGGER
bool "full debugger"
depends on BR2_USE_WCHAR
depends on !BR2_sh
+ depends on !BR2_csky
select BR2_PACKAGE_NCURSES
comment "full gdb on target needs a toolchain w/ wchar"
diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host
index 969168ffa2..7ce26c1628 100644
--- a/package/gdb/Config.in.host
+++ b/package/gdb/Config.in.host
@@ -48,6 +48,7 @@ choice
prompt "GDB debugger Version"
default BR2_GDB_VERSION_8_1
depends on !BR2_arc
+ depends on !BR2_csky
help
Select the version of gdb you wish to use.
@@ -94,7 +95,8 @@ config BR2_PACKAGE_GDB_NEEDS_CXX11
# If cross-gdb is not enabled, the latest working version is chosen.
config BR2_GDB_VERSION
string
- default "arc-2018.09-release-gdb" if BR2_arc
+ default "arc-2019.03-rc1-gdb" if BR2_arc
+ default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky
default "7.12.1" if BR2_GDB_VERSION_7_12
default "8.0.1" if BR2_GDB_VERSION_8_0
default "8.1.1" if BR2_GDB_VERSION_8_1 || !BR2_PACKAGE_HOST_GDB
diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash
index 1104da5dc4..f508b6bffc 100644
--- a/package/gdb/gdb.hash
+++ b/package/gdb/gdb.hash
@@ -5,4 +5,7 @@ sha512 7dcd5e8c90de92f577834d887b5f54edb93a07083bfe661bc46c270a6cc4919f0b348e7e
sha512 2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11 gdb-8.2.1.tar.xz
# Locally calculated (fetched from Github)
-sha512 8303e399e396f5c15dc976e48503fc7d45a720dd1a470443f755c5f2458d092b4392e7ae582abc251bc4b43a778ad784f764286a2a05abfc1649cbeeeb6e7d15 gdb-arc-2018.09-release-gdb.tar.gz
+sha512 bc6dcd92991222418795c49b8fc13df7354b34ba7a7f1e4214b108776da0dad730259aa4611086694bc9291126f5182b449bbc22409aeadc44b89e7a42fb4e00 gdb-arc-2019.03-rc1-gdb.tar.gz
+
+# Locally calculated (fetched from https://github.com/c-sky/binutils-gdb)
+sha512 c421e1f3c0d6cfb3c04544573c0c4b0075c8d8e3d563c6c234fcc1e4c2167ab203d1e57aec3b58abd348dc46f8cf9b47b753d3a43dba3ea970c9c9a6bd78c07b gdb-4ecb98fbc2f94dbe01b69384afbc515107de73df.tar.gz
diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index a926961372..46d745a897 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -14,6 +14,12 @@ GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
GDB_FROM_GIT = y
endif
+ifeq ($(BR2_csky),y)
+GDB_SITE = $(call github,c-sky,binutils-gdb,$(GDB_VERSION))
+GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
+GDB_FROM_GIT = y
+endif
+
GDB_LICENSE = GPL-2.0+, LGPL-2.0+, GPL-3.0+, LGPL-3.0+
GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB
diff --git a/package/genimage/genimage.hash b/package/genimage/genimage.hash
index 095eb1413f..c1f2270d28 100644
--- a/package/genimage/genimage.hash
+++ b/package/genimage/genimage.hash
@@ -1,2 +1,3 @@
# Locally calculated
-sha256 5a36b2c1387007c2d6535a722ee257a387d0913bddcf8a94d460e6acd4d01859 genimage-10.tar.xz
+sha256 2ee024bfb2ec157651b86f3365d138ee013dcc48277d86e1eed6f3285a67b532 genimage-11.tar.xz
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk
index 393c3e9b94..5ef7d301fa 100644
--- a/package/genimage/genimage.mk
+++ b/package/genimage/genimage.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GENIMAGE_VERSION = 10
+GENIMAGE_VERSION = 11
GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz
GENIMAGE_SITE = https://github.com/pengutronix/genimage/releases/download/v$(GENIMAGE_VERSION)
HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse
diff --git a/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash b/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash
new file mode 100644
index 0000000000..a61bd65f80
--- /dev/null
+++ b/package/glibc/7630ed2fa60caea98f500e4a7a51b88f9bf1e176/glibc.hash
@@ -0,0 +1,2 @@
+# Locally calculated (fetched from https://github.com/c-sky/glibc)
+sha512 9deb2deceefe347d72de13510a5baa3de00f94c684f3b25e136ca3660f61e65a69f2115abb488c2ab0fa93cda8535853ce1e13e186efcc8434ecc4049efd82b5 glibc-7630ed2fa60caea98f500e4a7a51b88f9bf1e176.tar.gz
diff --git a/package/glibc/arc-2018.09-release/glibc.hash b/package/glibc/arc-2019.03-rc1/glibc.hash
index 8e70ce0436..1368086acc 100644
--- a/package/glibc/arc-2018.09-release/glibc.hash
+++ b/package/glibc/arc-2019.03-rc1/glibc.hash
@@ -1,5 +1,5 @@
# Locally calculated (fetched from Github)
-sha256 cc2aa6b16641ebcf1492bf6245897d8c263c96b6e30375d09351306a12b6d529 glibc-arc-2018.09-release.tar.gz
+sha256 8cd0fed7993c4e0b9ac8401fbe2a99bc11fe233d1e49957db5b766e973169221 glibc-arc-2019.03-rc1.tar.gz
# Hashes for license files
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index 0345f1f392..26873f3101 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -5,11 +5,14 @@
################################################################################
ifeq ($(BR2_arc),y)
-GLIBC_VERSION = arc-2018.09-release
+GLIBC_VERSION = arc-2019.03-rc1
GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION))
else ifeq ($(BR2_RISCV_32),y)
GLIBC_VERSION = 06983fe52cfe8e4779035c27e8cc5d2caab31531
GLIBC_SITE = $(call github,riscv,riscv-glibc,$(GLIBC_VERSION))
+else ifeq ($(BR2_csky),y)
+GLIBC_VERSION = 7630ed2fa60caea98f500e4a7a51b88f9bf1e176
+GLIBC_SITE = $(call github,c-sky,glibc,$(GLIBC_VERSION))
else
# Generate version string using:
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
diff --git a/package/gmp/gmp.hash b/package/gmp/gmp.hash
index f4793cd93c..417b9d17bf 100644
--- a/package/gmp/gmp.hash
+++ b/package/gmp/gmp.hash
@@ -1,2 +1,6 @@
# Locally calculated after checking pgp signature
sha256 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912 gmp-6.1.2.tar.xz
+
+# Locally calculated
+sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2
diff --git a/package/gperf/gperf.hash b/package/gperf/gperf.hash
index 370235c627..21c76605b5 100644
--- a/package/gperf/gperf.hash
+++ b/package/gperf/gperf.hash
@@ -1,2 +1,5 @@
# Locally calculated after checking pgp signature
sha256 767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e gperf-3.0.4.tar.gz
+
+# Locally calculated
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
diff --git a/package/gpsd/0002-SConstruct-Do-not-crash-when-not-building-python-man-pages.patch b/package/gpsd/0002-SConstruct-Do-not-crash-when-not-building-python-man-pages.patch
new file mode 100644
index 0000000000..75317af10e
--- /dev/null
+++ b/package/gpsd/0002-SConstruct-Do-not-crash-when-not-building-python-man-pages.patch
@@ -0,0 +1,59 @@
+From 02d21faebec245e1526449fb54e7078914d75db7 Mon Sep 17 00:00:00 2001
+From: "Gary E. Miller" <gem@rellim.com>
+Date: Thu, 1 Nov 2018 15:49:01 -0700
+Subject: SConstruct: Do not crash when not building python man pages.
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved from:
+https://git.savannah.gnu.org/cgit/gpsd.git/commit/?id=02d21faebec245e1526449fb54e7078914d75db7]
+---
+ SConstruct | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 0fc3614..0226cd2 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1751,14 +1751,19 @@ if tiocmiwait:
+ "ppscheck.8": "ppscheck.xml",
+ })
+
+-all_manpages = list(base_manpages.keys()) + list(python_manpages.keys())
++all_manpages = list(base_manpages.keys())
++if python_manpages:
++ all_manpages += list(python_manpages.keys())
+
+ man_env = env.Clone()
+ if man_env.GetOption('silent'):
+ man_env['SPAWN'] = filtered_spawn # Suppress stderr chatter
+ manpage_targets = []
+ if manbuilder:
+- items = list(base_manpages.items()) + list(python_manpages.items())
++ items = list(base_manpages.items())
++ if python_manpages:
++ items += list(python_manpages.items())
++
+ for (man, xml) in items:
+ manpage_targets.append(man_env.Man(source=xml, target=man))
+
+@@ -1907,7 +1912,7 @@ if qt_env:
+
+
+ maninstall = []
+-for manpage in list(base_manpages.keys()) + list(python_manpages.keys()):
++for manpage in all_manpages:
+ if not manbuilder and not os.path.exists(manpage):
+ continue
+ section = manpage.split(".")[1]
+@@ -2517,7 +2522,7 @@ if os.path.exists("gpsd.c") and os.path.exists(".gitignore"):
+ if ".gitignore" in distfiles:
+ distfiles.remove(".gitignore")
+ distfiles += generated_sources
+- distfiles += list(base_manpages.keys()) + list(python_manpages.keys())
++ distfiles += all_manpages
+ if "packaging/rpm/gpsd.spec" not in distfiles:
+ distfiles.append("packaging/rpm/gpsd.spec")
+
+--
+cgit v1.0-41-gc330
+
diff --git a/package/gpsd/0002-driver_greis-fix-build-with-reconfigure-disabled.patch b/package/gpsd/0002-driver_greis-fix-build-with-reconfigure-disabled.patch
deleted file mode 100644
index 77badb31cf..0000000000
--- a/package/gpsd/0002-driver_greis-fix-build-with-reconfigure-disabled.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 21a752e827bc9e14de4b4c26aef4d0db7403a5b7 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Tue, 9 Oct 2018 15:22:46 +0300
-Subject: [PATCH] driver_greis: fix build with reconfigure disabled
-
-Unhide the definition of greis_parse_input and greis_event_hook since
-they are used unconditionally.
-
-Fixes the following build failure:
-
-driver_greis.c:969:25: error: 'greis_parse_input' undeclared here (not in a function); did you mean 'generic_parse_input'?
- .parse_packet = greis_parse_input,
- ^~~~~~~~~~~~~~~~~
- generic_parse_input
-driver_greis.c:973:25: error: 'greis_event_hook' undeclared here (not in a function)
- .event_hook = greis_event_hook,
- ^~~~~~~~~~~~~~~~
-
-Cc: Gregory Fong <gregory.fong@virginorbit.com>
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: http://lists.nongnu.org/archive/html/gpsd-dev/2018-10/msg00012.html
-
- driver_greis.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/driver_greis.c b/driver_greis.c
-index 9eb148fc76cd..222bd9daf020 100644
---- a/driver_greis.c
-+++ b/driver_greis.c
-@@ -797,7 +797,6 @@ static ssize_t greis_control_send(struct gps_device_t *session,
- }
- #endif /* CONTROLSEND_ENABLE */
-
--#ifdef RECONFIGURE_ENABLE
- static void greis_event_hook(struct gps_device_t *session, event_t event)
- {
- if (session->context->readonly)
-@@ -870,6 +869,7 @@ static gps_mask_t greis_parse_input(struct gps_device_t *session)
- return 0;
- }
-
-+#ifdef RECONFIGURE_ENABLE
- /**
- * Set port operating mode, speed, parity, stopbits etc. here.
- * Note: parity is passed as 'N'/'E'/'O', but you should program
---
-2.19.1
-
diff --git a/package/gpsd/0003-driver_ubx-Save-UBX-RXM-RAWX-data-in-rawdate_t.patch b/package/gpsd/0003-driver_ubx-Save-UBX-RXM-RAWX-data-in-rawdate_t.patch
new file mode 100644
index 0000000000..a9b40c64af
--- /dev/null
+++ b/package/gpsd/0003-driver_ubx-Save-UBX-RXM-RAWX-data-in-rawdate_t.patch
@@ -0,0 +1,38 @@
+From d685ab05952d7eadf012fc054032f0190cf2abda Mon Sep 17 00:00:00 2001
+From: "Gary E. Miller" <gem@rellim.com>
+Date: Fri, 26 Oct 2018 10:12:40 -0700
+Subject: driver_ubx: Save UBX-RXM-RAWX data in rawdate_t.
+
+A step in getting u-blox 8 raw data into the new RAW JSON message.
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved (and backported to keep only C99-style loop fix) from:
+https://git.savannah.gnu.org/cgit/gpsd.git/commit/driver_ubx.c?id=d685ab05952d7eadf012fc054032f0190cf2abda]
+---
+ driver_ubx.c | 29 ++++++++++++++++++++++++++---
+ 1 file changed, 26 insertions(+), 3 deletions(-)
+
+diff --git a/driver_ubx.c b/driver_ubx.c
+index 585b2b9..0dccddf 100644
+--- a/driver_ubx.c
++++ b/driver_ubx.c
+@@ -813,6 +813,7 @@ static gps_mask_t ubx_rxm_rawx(struct gps_device_t *session,
+ int8_t leapS;
+ uint8_t numMeas;
+ uint8_t recStat;
++ int i;
+
+ if (16 > data_len) {
+ gpsd_log(&session->context->errout, LOG_WARN,
+@@ -830,6 +831,6 @@ static gps_mask_t ubx_rxm_rawx(struct gps_device_t *session,
+ "UBX_RXM_RAWX: rcvTow %f week %u leapS %d numMeas %u recStat %d\n",
+ rcvTow, week, leapS, numMeas, recStat);
+
+- for (int i = 0; i < numMeas; i++) {
++ for (i = 0; i < numMeas; i++) {
+ int off = 32 * i;
+ double prMes = getled64((const char *)buf, off + 16);
+ double cpMes = getled64((const char *)buf, off + 24);
+--
+cgit v1.0-41-gc330
+
diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index e951c0154e..c1bebc30d7 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -222,6 +222,11 @@ config BR2_PACKAGE_GPSD_SIRF
help
SiRF binary support
+config BR2_PACKAGE_GPSD_SKYTRAQ
+ bool "Skytraq"
+ help
+ Skytraq support
+
config BR2_PACKAGE_GPSD_SUPERSTAR2
bool "SuperStarII"
help
diff --git a/package/gpsd/gpsd.hash b/package/gpsd/gpsd.hash
index fe594ea28b..a6d4a65200 100644
--- a/package/gpsd/gpsd.hash
+++ b/package/gpsd/gpsd.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 48521f5158f5fda4c88a6f75e8bfc1ee67e999e3fc095e4a06cb8c2af56712f4 gpsd-3.18.tar.gz
+sha256 5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e gpsd-3.18.1.tar.gz
sha256 71ff85d18bf063954cfc4251678d0e772223e21f80febbd99d5524c90f73f832 COPYING
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index d2c7612526..16d919450f 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GPSD_VERSION = 3.18
+GPSD_VERSION = 3.18.1
GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd
GPSD_LICENSE = BSD-3-Clause
GPSD_LICENSE_FILES = COPYING
@@ -144,6 +144,9 @@ endif
ifneq ($(BR2_PACKAGE_GPSD_SIRF),y)
GPSD_SCONS_OPTS += sirf=no
endif
+ifneq ($(BR2_PACKAGE_GPSD_SKYTRAQ),y)
+GPSD_SCONS_OPTS += skytraq=no
+endif
ifneq ($(BR2_PACKAGE_GPSD_SUPERSTAR2),y)
GPSD_SCONS_OPTS += superstar2=no
endif
diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
index 34551ab532..e1e7b05a59 100644
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -46,6 +46,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD
help
Audio filters plugin
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOLATENCY
+ bool "audiolatency"
+ help
+ Audio latency plugin
+
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX
bool "audiomixmatrix"
help
@@ -212,6 +217,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PNM
help
PNM plugin
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PROXY
+ bool "proxy"
+ help
+ Proxy plugin
+
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE
bool "rawparse"
help
@@ -298,6 +308,20 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER
bool "assrender"
select BR2_PACKAGE_LIBASS
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ
+ bool "bluez"
+ depends on !BR2_STATIC_LIBS # bluez_utils
+ depends on BR2_USE_WCHAR # bluez_utils
+ depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils
+ depends on BR2_USE_MMU # bluez_utils
+ select BR2_PACKAGE_BLUEZ_UTILS
+ help
+ Bluetooth audio A2DP/AVDTP sink, AVDTP source plugin
+
+comment "bluez plugin needs a toolchain w/ wchar, threads, dynamic library"
+ depends on BR2_USE_MMU
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2
bool "bz2"
select BR2_PACKAGE_BZIP2
diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index a66d3e32bf..32edde4901 100644
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -83,7 +83,7 @@ GST1_PLUGINS_BAD_DEPENDENCIES += orc
GST1_PLUGINS_BAD_CONF_OPTS += --enable-orc
endif
-ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ),y)
GST1_PLUGINS_BAD_DEPENDENCIES += bluez_utils
GST1_PLUGINS_BAD_CONF_OPTS += --enable-bluez
else
@@ -132,6 +132,12 @@ else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiofxbad
endif
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOLATENCY),y)
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiolatency
+else
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiolatency
+endif
+
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiomixmatrix
else
@@ -344,6 +350,12 @@ else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-pnm
endif
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PROXY),y)
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-proxy
+else
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-proxy
+endif
+
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-rawparse
else
diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in
index 30a4876ee7..433084fd6b 100644
--- a/package/gstreamer1/gst1-plugins-good/Config.in
+++ b/package/gstreamer1/gst1-plugins-good/Config.in
@@ -345,6 +345,19 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
comment "gdkpixbuf needs a toolchain w/ wchar, threads"
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_JACK
+ bool "jack"
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_STATIC_LIBS
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4
+ select BR2_PACKAGE_JACK2
+ help
+ JACK audio source/sink plugin
+
+comment "jack needs a toolchain w/ C++, dynamic library"
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4
+ depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
+
config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
bool "pulseaudio"
depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
@@ -389,6 +402,12 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TAGLIB
comment "taglib needs a toolchain w/ C++, wchar"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TWOLAME
+ bool "twolame"
+ select BR2_PACKAGE_TWOLAME
+ help
+ twolame mp2 audio encoder plugin
+
config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
bool "vpx (webm)"
depends on BR2_TOOLCHAIN_HAS_THREADS # libvpx
diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
index 4ef128229a..829d27a2da 100644
--- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
@@ -30,7 +30,7 @@ GST1_PLUGINS_GOOD_CONF_OPTS += \
GST1_PLUGINS_GOOD_DEPENDENCIES = gstreamer1 gst1-plugins-base
-ifeq ($(BR2_PACKAGE_JACK2),y)
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_JACK),y)
GST1_PLUGINS_GOOD_CONF_OPTS += --enable-jack
GST1_PLUGINS_GOOD_DEPENDENCIES += jack2
else
@@ -429,6 +429,13 @@ else
GST1_PLUGINS_GOOD_CONF_OPTS += --disable-taglib
endif
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TWOLAME),y)
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-twolame
+GST1_PLUGINS_GOOD_DEPENDENCIES += twolame
+else
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-twolame
+endif
+
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX),y)
GST1_PLUGINS_GOOD_CONF_OPTS += --enable-vpx
GST1_PLUGINS_GOOD_DEPENDENCIES += libvpx
diff --git a/package/ifmetric/0001-Fix-issue-NETLINK-Packet-too-small-or-truncated-92-1.patch b/package/ifmetric/0001-Fix-issue-NETLINK-Packet-too-small-or-truncated-92-1.patch
new file mode 100644
index 0000000000..8986b4fc31
--- /dev/null
+++ b/package/ifmetric/0001-Fix-issue-NETLINK-Packet-too-small-or-truncated-92-1.patch
@@ -0,0 +1,29 @@
+From 0c80f9ead3eb1d938b3e8e68165c91e62db72de3 Mon Sep 17 00:00:00 2001
+From: Damjan Georgievski <gdamjan@gmail.com>
+Date: Wed, 15 Aug 2012 00:54:38 +0200
+Subject: [PATCH] Fix issue: NETLINK: Packet too small or truncated!
+ 92!=16!=244
+
+As reported in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=514197#22
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ src/nlrequest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/nlrequest.c b/src/nlrequest.c
+index 99fd3d0..3a1f794 100644
+--- a/src/nlrequest.c
++++ b/src/nlrequest.c
+@@ -44,7 +44,7 @@ int netlink_request(int s, struct nlmsghdr *n, int (*callback) (struct nlmsghdr
+
+ for (;;) {
+ int bytes;
+- char replybuf[2048];
++ char replybuf[4096];
+ struct nlmsghdr *p = (struct nlmsghdr *) replybuf;
+
+ if ((bytes = recv(s, &replybuf, sizeof(replybuf), 0)) < 0) {
+--
+2.11.0
+
diff --git a/package/ifmetric/Config.in b/package/ifmetric/Config.in
new file mode 100644
index 0000000000..64c8ace84b
--- /dev/null
+++ b/package/ifmetric/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_IFMETRIC
+ bool "ifmetric"
+ help
+ Ifmetric is a Linux tool for setting the metrics of all IPv4
+ routes attached to a given network interface at once. This
+ may be used to change the priority of routing IPv4 traffic
+ over the interface. Lower metrics correlate with higher
+ priorities.
+
+ http://0pointer.de/lennart/projects/ifmetric/
diff --git a/package/ifmetric/ifmetric.hash b/package/ifmetric/ifmetric.hash
new file mode 100644
index 0000000000..186522efab
--- /dev/null
+++ b/package/ifmetric/ifmetric.hash
@@ -0,0 +1,4 @@
+# Locally calculated
+sha256 0fa8510a4e34e555f136f9df81d26618313f2d69a4880c0fb5967f19502f1aec ifmetric-0.3.tar.gz
+sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 LICENSE
+sha256 1e33d5a8750b4b3c2cb4fb89a916463f3c838f8eb361abbf72faf244c7dde771 README
diff --git a/package/ifmetric/ifmetric.mk b/package/ifmetric/ifmetric.mk
new file mode 100644
index 0000000000..29a6cbcdd6
--- /dev/null
+++ b/package/ifmetric/ifmetric.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# ifmetric
+#
+################################################################################
+
+IFMETRIC_VERSION = 0.3
+IFMETRIC_SITE = http://0pointer.de/lennart/projects/ifmetric
+IFMETRIC_LICENSE = GPL-2.0+
+IFMETRIC_LICENSE_FILES = LICENSE README
+# do not generate documentation
+IFMETRIC_CONF_OPTS = --disable-lynx --disable-xmltoman
+
+$(eval $(autotools-package))
diff --git a/package/ifupdown-scripts/Config.in b/package/ifupdown-scripts/Config.in
index 2f4b0d5467..4b984bc30c 100644
--- a/package/ifupdown-scripts/Config.in
+++ b/package/ifupdown-scripts/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_IFUPDOWN_SCRIPTS
bool "ifupdown scripts"
default y if BR2_ROOTFS_SKELETON_DEFAULT
- depends on !BR2_PACKAGE_SYSTEMD_NETWORKD
+ depends on !BR2_PACKAGE_SYSTEMD_NETWORKD && !BR2_PACKAGE_OPENRC
help
Set of scripts used by ifupdown (either the standalone one,
or the busybox one) to bring network up, or tear it down.
diff --git a/package/intltool/intltool.hash b/package/intltool/intltool.hash
index f6f41dc709..de1df87bc7 100644
--- a/package/intltool/intltool.hash
+++ b/package/intltool/intltool.hash
@@ -3,3 +3,4 @@ md5 12e517cac2b57a0121cda351570f1e63 intltool-0.51.0.tar.gz
# Locally calculated
sha256 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd intltool-0.51.0.tar.gz
+sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
diff --git a/package/iproute2/0001-devlink-fix-libc-and-kernel-headers-collision.patch b/package/iproute2/0001-devlink-fix-libc-and-kernel-headers-collision.patch
new file mode 100644
index 0000000000..e111b71032
--- /dev/null
+++ b/package/iproute2/0001-devlink-fix-libc-and-kernel-headers-collision.patch
@@ -0,0 +1,51 @@
+From 602128d22db86bd67e11dec8fe40a73832c222c9 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Thu, 30 May 2019 18:22:40 +0300
+Subject: [PATCH] devlink: fix libc and kernel headers collision
+
+Since commit 2f1242efe9d ("devlink: Add devlink health show command") we
+use the sys/sysinfo.h header for the sysinfo(2) system call. But since
+iproute2 carries a local version of the kernel struct sysinfo, this
+causes a collision with libc that do not rely on kernel defined sysinfo
+like musl libc:
+
+In file included from devlink.c:25:0:
+.../sysroot/usr/include/sys/sysinfo.h:10:8: error: redefinition of 'struct sysinfo'
+ struct sysinfo {
+ ^~~~~~~
+In file included from ../include/uapi/linux/kernel.h:5:0,
+ from ../include/uapi/linux/netlink.h:5,
+ from ../include/uapi/linux/genetlink.h:6,
+ from devlink.c:21:
+../include/uapi/linux/sysinfo.h:8:8: note: originally defined here
+ struct sysinfo {
+ ^~~~~~~
+
+Rely on the kernel header alone to avoid kernel and userspace headers
+collision of definitions.
+
+Cc: Aya Levin <ayal@mellanox.com>
+Cc: Moshe Shemesh <moshe@mellanox.com>
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: http://patchwork.ozlabs.org/patch/1107817/
+
+ devlink/devlink.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/devlink/devlink.c b/devlink/devlink.c
+index 436935f88bda..d7a6ce94f0e6 100644
+--- a/devlink/devlink.c
++++ b/devlink/devlink.c
+@@ -22,7 +22,7 @@
+ #include <linux/devlink.h>
+ #include <libmnl/libmnl.h>
+ #include <netinet/ether.h>
+-#include <sys/sysinfo.h>
++#include <linux/sysinfo.h>
+ #include <sys/queue.h>
+
+ #include "SNAPSHOT.h"
+--
+2.20.1
+
diff --git a/package/iproute2/0001-ss-fix-compilation-under-glibc-2.18.patch b/package/iproute2/0001-ss-fix-compilation-under-glibc-2.18.patch
deleted file mode 100644
index b6934f5d17..0000000000
--- a/package/iproute2/0001-ss-fix-compilation-under-glibc-2.18.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9700927a008a803ac119bdf816bdc1baa69d705c Mon Sep 17 00:00:00 2001
-From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
-Date: Wed, 20 Feb 2019 15:41:51 +0100
-Subject: [PATCH] ss: fix compilation under glibc < 2.18
-
-Commit c759116a0b2b6da8df9687b0a40ac69050132c77 introduced support for
-AF_VSOCK. This define is only provided since glibc version 2.18, so
-compilation fails when using older toolchains.
-
-Provide the necessary definitions if needed.
-
-Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
----
- misc/ss.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/misc/ss.c b/misc/ss.c
-index 9e821faf..766fdc5f 100644
---- a/misc/ss.c
-+++ b/misc/ss.c
-@@ -51,6 +51,14 @@
- #include <linux/tipc_netlink.h>
- #include <linux/tipc_sockets_diag.h>
-
-+/* AF_VSOCK/PF_VSOCK is only provided since glibc 2.18 */
-+#ifndef PF_VSOCK
-+#define PF_VSOCK 40
-+#endif
-+#ifndef AF_VSOCK
-+#define AF_VSOCK PF_VSOCK
-+#endif
-+
- #define MAGIC_SEQ 123456
- #define BUF_CHUNK (1024 * 1024)
- #define LEN_ALIGN(x) (((x) + 1) & ~1)
---
-2.19.2
-
diff --git a/package/iproute2/0002-f_flower-fix-build-with-musl-libc.patch b/package/iproute2/0002-f_flower-fix-build-with-musl-libc.patch
deleted file mode 100644
index 71b652d9d4..0000000000
--- a/package/iproute2/0002-f_flower-fix-build-with-musl-libc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 28747146622a49c3e7b5c5b36dc02c6a64124770 Mon Sep 17 00:00:00 2001
-From: Hans Dedecker <dedeckeh@gmail.com>
-Date: Wed, 23 Jan 2019 22:02:31 +0100
-Subject: [PATCH] f_flower: fix build with musl libc
-
-XATTR_SIZE_MAX requires the usage of linux/limits.h; let's include it
-
-Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: commit 2874714662
-
- tc/f_flower.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tc/f_flower.c b/tc/f_flower.c
-index c563666702b5..9659e894dd1f 100644
---- a/tc/f_flower.c
-+++ b/tc/f_flower.c
-@@ -14,6 +14,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <net/if.h>
-+#include <linux/limits.h>
- #include <linux/if_arp.h>
- #include <linux/if_ether.h>
- #include <linux/ip.h>
---
-2.20.1
-
diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash
index 28862ce19c..5edee4614d 100644
--- a/package/iproute2/iproute2.hash
+++ b/package/iproute2/iproute2.hash
@@ -1,3 +1,3 @@
# From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc
-sha256 c8adaa6a40f888476b23acb283cfa30c0dd55f07b5aa20663ed5ba2ef1f6fda8 iproute2-4.20.0.tar.xz
+sha256 dc5a980873eabf6b00c0be976b6e5562b1400d47d1d07d2ac35d5e5acbcf7bcf iproute2-5.1.0.tar.xz
sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 13b1f90f37..d0b239c653 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,7 +4,7 @@
#
################################################################################
-IPROUTE2_VERSION = 4.20.0
+IPROUTE2_VERSION = 5.1.0
IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz
IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \
diff --git a/package/iputils/0001-ninfod-ninfod_name.c-fix-build-with-nettle.patch b/package/iputils/0001-ninfod-ninfod_name.c-fix-build-with-nettle.patch
new file mode 100644
index 0000000000..796185011a
--- /dev/null
+++ b/package/iputils/0001-ninfod-ninfod_name.c-fix-build-with-nettle.patch
@@ -0,0 +1,38 @@
+From f209ebb91e65980bcdddce8cc12b00ec11623f76 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 21 May 2019 19:14:18 +0200
+Subject: [PATCH] ninfod/ninfod_name.c: fix build with nettle
+
+Build of ninfod with nettle fails on:
+/home/test/autobuild/run/instance-1/output/host/bin/mips64el-linux-gcc -o ninfod/ninfod 'ninfod/0cb6efe@@ninfod@exe/ni_ifaddrs.c.o' 'ninfod/0cb6efe@@ninfod@exe/ninfod.c.o' 'ninfod/0cb6efe@@ninfod@exe/ninfod_addrs.c.o' 'ninfod/0cb6efe@@ninfod@exe/ninfod_core.c.o' 'ninfod/0cb6efe@@ninfod@exe/ninfod_name.c.o' -Wl,--no-undefined -Wl,--as-needed -Wl,-O1 -Wl,--start-group libcommon.a -lcap /home/test/autobuild/run/instance-1/output/host/usr/bin/../mips64el-buildroot-linux-uclibc/sysroot/usr/lib/libnettle.so -Wl,--end-group -pthread '-Wl,-rpath,$ORIGIN/..:/home/test/autobuild/run/instance-1/output/host/usr/bin/../mips64el-buildroot-linux-uclibc/sysroot/usr/lib' -Wl,-rpath-link,/home/test/autobuild/run/instance-1/output/build/iputils-s20190515/build/:/home/test/autobuild/run/instance-1/output/host/usr/bin/../mips64el-buildroot-linux-uclibc/sysroot/usr/lib
+ninfod/0cb6efe@@ninfod@exe/ninfod_name.c.o: In function `init_nodeinfo_nodename':
+ninfod_name.c:(.text+0x378): undefined reference to `MD5_Init'
+
+This error is raised because MD5_Init is not defined by nettle.
+To fix this error, include iputils_md5dig.h if USE_NETTLE is defined.
+
+Fixes:
+ - http://autobuild.buildroot.org/results/e86555090e27b631ba35214ef100aa9331844684
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/iputils/iputils/pull/181]
+---
+ ninfod/ninfod_name.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ninfod/ninfod_name.c b/ninfod/ninfod_name.c
+index daf606d..525c93d 100644
+--- a/ninfod/ninfod_name.c
++++ b/ninfod/ninfod_name.c
+@@ -95,7 +95,7 @@
+
+ #include <arpa/inet.h>
+
+-#if defined(HAVE_GCRYPT_H) || defined(USE_KERNEL_CRYPTO_API)
++#if defined(HAVE_GCRYPT_H) || defined(USE_KERNEL_CRYPTO_API) || defined(USE_NETTLE)
+ # include "iputils_md5dig.h"
+ #elif defined(HAVE_GNUTLS_OPENSSL_H)
+ # include <gnutls/openssl.h>
+--
+2.20.1
+
diff --git a/package/iputils/0001-ping-Fix-AI_CANONIDN-usage-on-some-systems.patch b/package/iputils/0001-ping-Fix-AI_CANONIDN-usage-on-some-systems.patch
deleted file mode 100644
index 556d3786fb..0000000000
--- a/package/iputils/0001-ping-Fix-AI_CANONIDN-usage-on-some-systems.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 25899e849aa3abc1ad29ebf0b830262a859eaed5 Mon Sep 17 00:00:00 2001
-From: Petr Vorel <petr.vorel@gmail.com>
-Date: Sat, 21 Jul 2018 17:46:14 +0200
-Subject: [PATCH] ping: Fix AI_CANONIDN usage on some systems
-
-Commit 99f67db used AI_CANONIDN in a way, which broke compilation on
-systems where AI_CANONIDN is not defined in netdb.h (e.g. glibc < 2.3.4,
-alternative libcs that don't support IDN: e.g. current musl 1.1.19 and
-uClibc-ng 1.0.30) when not using the system libidn2.
-
-Fixes: 99f67db ping: Fix ping name encoded using ACE on C locale
-
-Reported-by: Nicholas Fish
-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
----
- ping.c | 2 +-
- ping.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ping.c b/ping.c
-index 733477f..b241815 100644
---- a/ping.c
-+++ b/ping.c
-@@ -207,9 +207,9 @@ main(int argc, char **argv)
-
- #ifdef USE_IDN
- setlocale(LC_ALL, "");
--#endif
- if (!strcmp(setlocale(LC_ALL, NULL), "C"))
- hints.ai_flags &= ~ AI_CANONIDN;
-+#endif
-
- /* Support being called using `ping4` or `ping6` symlinks */
- if (argv[0][strlen(argv[0])-1] == '4')
-diff --git a/ping.h b/ping.h
-index 3e09685..8a0c4ef 100644
---- a/ping.h
-+++ b/ping.h
-@@ -28,7 +28,6 @@
- #include <netinet/icmp6.h>
- #include <linux/filter.h>
- #include <resolv.h>
--#include <locale.h>
-
- #ifdef CAPABILITIES
- #include <sys/prctl.h>
-@@ -36,6 +35,7 @@
- #endif
-
- #ifdef USE_IDN
-+#include <locale.h>
- #include <idn2.h>
- #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
- #define getnameinfo_flags NI_IDN
---
-2.19.0.rc2
-
diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash
index 14e2c67134..57b9ccf6a4 100644
--- a/package/iputils/iputils.hash
+++ b/package/iputils/iputils.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 da14105291dd491f28ea91ade854ed10aee8ba019641c80eed233de3908be7c5 iputils-s20180629.tar.gz
+sha256 9b5125eb5ef9f4e947ad8fdddcf77f538f53b8f47b53eb5bc5347cb16d01c8fd iputils-s20190515.tar.gz
sha256 966075293e45785230c19415bcda15bd07c75bead4fe73332d1a4b9c45bb321f ninfod/COPYING
diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
index 8371971231..f0902c7038 100644
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -11,61 +11,45 @@
# and IPv6 updates.
# http://www.spinics.net/lists/netdev/msg279881.html
-IPUTILS_VERSION = s20180629
+IPUTILS_VERSION = s20190515
IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION))
IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause, BSD-4-Clause
# Only includes a license file for BSD
IPUTILS_LICENSE_FILES = ninfod/COPYING
-IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_SYSFS=no USE_IDN=no\
- CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
-
ifeq ($(BR2_PACKAGE_LIBCAP),y)
-IPUTILS_MAKE_OPTS += USE_CAP=yes
+IPUTILS_CONF_OPTS += -DUSE_CAP=true
IPUTILS_DEPENDENCIES += libcap
else
-IPUTILS_MAKE_OPTS += USE_CAP=no
+IPUTILS_CONF_OPTS += -DUSE_CAP=false
endif
-ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
-IPUTILS_MAKE_OPTS += USE_GCRYPT=yes
-IPUTILS_DEPENDENCIES += libgcrypt
+ifeq ($(BR2_PACKAGE_LIBIDN),y)
+IPUTILS_CONF_OPTS += -DUSE_IDN=true
+IPUTILS_DEPENDENCIES += libidn
else
-IPUTILS_MAKE_OPTS += USE_GCRYPT=no
+IPUTILS_CONF_OPTS += -DUSE_IDN=false
endif
ifeq ($(BR2_PACKAGE_NETTLE),y)
-IPUTILS_MAKE_OPTS += USE_NETTLE=yes
+IPUTILS_CONF_OPTS += -DUSE_CRYPTO=nettle
IPUTILS_DEPENDENCIES += nettle
-else
-IPUTILS_MAKE_OPTS += USE_NETTLE=no
-endif
-
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-IPUTILS_MAKE_OPTS += USE_CRYPTO=yes
+else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+IPUTILS_CONF_OPTS += -DUSE_CRYPTO=gcrypt
+IPUTILS_DEPENDENCIES += libgcrypt
+else ifeq ($(BR2_PACKAGE_OPENSSL),y)
+IPUTILS_CONF_OPTS += -DUSE_CRYPTO=openssl
IPUTILS_DEPENDENCIES += openssl
+else ifeq ($(BR2_PACKAGE_LINUX_HEADERS),y)
+IPUTILS_CONF_OPTS += -DUSE_CRYPTO=kernel
+IPUTILS_DEPENDENCIES += linux-headers
else
-IPUTILS_MAKE_OPTS += USE_CRYPTO=no
+IPUTILS_CONF_OPTS += -DUSE_CRYPTO=none
+# BUILD_NINFOD=true and USE_CRYPTO=none cannot be combined
+IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false
endif
-define IPUTILS_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS)
-endef
-
-define IPUTILS_INSTALL_TARGET_CMDS
- $(INSTALL) -D -m 755 $(@D)/arping $(TARGET_DIR)/sbin/arping
- $(INSTALL) -D -m 755 $(@D)/clockdiff $(TARGET_DIR)/bin/clockdiff
- $(INSTALL) -D -m 755 $(@D)/ping $(TARGET_DIR)/bin/ping
- $(INSTALL) -D -m 755 $(@D)/rarpd $(TARGET_DIR)/sbin/rarpd
- $(INSTALL) -D -m 755 $(@D)/rdisc $(TARGET_DIR)/sbin/rdisc
- $(INSTALL) -D -m 755 $(@D)/tftpd $(TARGET_DIR)/usr/sbin/in.tftpd
- $(INSTALL) -D -m 755 $(@D)/tracepath $(TARGET_DIR)/bin/tracepath
- $(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6
-endef
-
-define IPUTILS_PERMISSIONS
- /bin/ping f 4755 0 0 - - - - -
- /bin/traceroute6 f 4755 0 0 - - - - -
-endef
+# XSL Stylesheets for DocBook 5 not packaged for buildroot
+IPUTILS_CONF_OPTS += -DBUILD_MANS=false -DBUILD_HTML_MANS=false
-$(eval $(generic-package))
+$(eval $(meson-package))
diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash
index d8eefc064c..a24521ba79 100644
--- a/package/iwd/iwd.hash
+++ b/package/iwd/iwd.hash
@@ -1,5 +1,5 @@
# Locally computed
-sha256 e416bd549474b2940b0e43ac680795fbafe2b4965fe6a977cd4c1caa1a05e897 iwd-0.13.tar.gz
+sha256 28e67c9a55182d08407be34e85cb31de482ba7fd50571fa34d7a16e289bd2e7f iwd-0.18.tar.gz
# License files
sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING
diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk
index 63736947cf..1e68c320d7 100644
--- a/package/iwd/iwd.mk
+++ b/package/iwd/iwd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-IWD_VERSION = 0.13
+IWD_VERSION = 0.18
IWD_SITE = https://git.kernel.org/pub/scm/network/wireless/iwd.git
IWD_SITE_METHOD = git
IWD_LICENSE = LGPL-2.1+
diff --git a/package/kmod/kmod.hash b/package/kmod/kmod.hash
index 0e8f034e06..f970093cf1 100644
--- a/package/kmod/kmod.hash
+++ b/package/kmod/kmod.hash
@@ -1,2 +1,5 @@
# From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc
sha256 7165e6496656159dcb909a91ed708a0fe273a4b128b4b1dc997ccb5189eef1cd kmod-25.tar.xz
+
+# Locally calculated
+sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libkmod/COPYING
diff --git a/package/lapack/lapack.hash b/package/lapack/lapack.hash
index fd3feef554..395087e199 100644
--- a/package/lapack/lapack.hash
+++ b/package/lapack/lapack.hash
@@ -1,2 +1,3 @@
# Locally computed:
-sha256 f6c53fd9f56932f3ddb3d5e24c1c07e4cd9b3b08e7f89de9c867125eecc9a1c8 lapack-3.7.1.tgz
+sha256 deb22cc4a6120bff72621155a9917f485f96ef8319ac074a7afbc68aab88bcf6 lapack-3.8.0.tar.gz
+sha256 d56bd4441b999b80c88df04faf0d8b3d7d3b2bd781cf91242c4188e8a6d0f8be LICENSE
diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk
index 4e74bbd659..3b59214e4b 100644
--- a/package/lapack/lapack.mk
+++ b/package/lapack/lapack.mk
@@ -4,8 +4,7 @@
#
################################################################################
-LAPACK_VERSION = 3.7.1
-LAPACK_SOURCE = lapack-$(LAPACK_VERSION).tgz
+LAPACK_VERSION = 3.8.0
LAPACK_LICENSE = BSD-3-Clause
LAPACK_LICENSE_FILES = LICENSE
LAPACK_SITE = http://www.netlib.org/lapack
diff --git a/package/libepoxy/libepoxy.hash b/package/libepoxy/libepoxy.hash
index dd1b13487b..d574a04455 100644
--- a/package/libepoxy/libepoxy.hash
+++ b/package/libepoxy/libepoxy.hash
@@ -1,5 +1,5 @@
-# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.2.sha256sum
-sha256 a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8 libepoxy-1.5.2.tar.xz
+# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.3.sha256sum
+sha256 002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d libepoxy-1.5.3.tar.xz
# Hashes for license files:
sha256 8d5144666f9c4df9bbd69b8900086d5979259152a1060421cdcc0fb9061a1c12 COPYING
diff --git a/package/libepoxy/libepoxy.mk b/package/libepoxy/libepoxy.mk
index b1731a22c5..deb3c1ecbb 100644
--- a/package/libepoxy/libepoxy.mk
+++ b/package/libepoxy/libepoxy.mk
@@ -5,26 +5,27 @@
################################################################################
LIBEPOXY_VERSION_MAJOR = 1.5
-LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).2
+LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).3
LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR)
LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz
LIBEPOXY_INSTALL_STAGING = YES
LIBEPOXY_DEPENDENCIES = host-pkgconf xutil_util-macros
LIBEPOXY_LICENSE = MIT
LIBEPOXY_LICENSE_FILES = COPYING
+LIBEPOXY_CONF_OPTS += -Ddocs=false -Dtests=false
ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y)
-LIBEPOXY_CONF_OPTS += --enable-egl
+LIBEPOXY_CONF_OPTS += -Degl=yes
LIBEPOXY_DEPENDENCIES += libegl
else
-LIBEPOXY_CONF_OPTS += --disable-egl
+LIBEPOXY_CONF_OPTS += -Degl=no
endif
ifeq ($(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_XLIB_LIBX11),yy)
-LIBEPOXY_CONF_OPTS += --enable-glx
+LIBEPOXY_CONF_OPTS += -Dglx=yes -Dx11=true
LIBEPOXY_DEPENDENCIES += libgl xlib_libX11
else
-LIBEPOXY_CONF_OPTS += --disable-glx
+LIBEPOXY_CONF_OPTS += -Dglx=no -Dx11=false
endif
-$(eval $(autotools-package))
+$(eval $(meson-package))
diff --git a/package/libopenh264/libopenh264.hash b/package/libopenh264/libopenh264.hash
index b9cd9ed53e..f8a63f523e 100644
--- a/package/libopenh264/libopenh264.hash
+++ b/package/libopenh264/libopenh264.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 9c07c38d7de00046c9c52b12c76a2af7648b70d05bd5460c8b67f6895738653f libopenh264-v1.7.0.tar.gz
+sha256 08670017fd0bb36594f14197f60bebea27b895511251c7c64df6cd33fc667d34 libopenh264-v1.8.0.tar.gz
sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE
diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk
index 233e7971f4..96979a9d43 100644
--- a/package/libopenh264/libopenh264.mk
+++ b/package/libopenh264/libopenh264.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBOPENH264_VERSION = v1.7.0
+LIBOPENH264_VERSION = v1.8.0
LIBOPENH264_SITE = $(call github,cisco,openh264,$(LIBOPENH264_VERSION))
LIBOPENH264_LICENSE = BSD-2-Clause
LIBOPENH264_LICENSE_FILES = LICENSE
diff --git a/package/libubootenv/0001-fw_printenv-remove-declaration-in-for-loop.patch b/package/libubootenv/0001-fw_printenv-remove-declaration-in-for-loop.patch
new file mode 100644
index 0000000000..318050d719
--- /dev/null
+++ b/package/libubootenv/0001-fw_printenv-remove-declaration-in-for-loop.patch
@@ -0,0 +1,53 @@
+From ffca94e6f84956838a2d88824b37fcd3b0d0694b Mon Sep 17 00:00:00 2001
+From: Pierre-Jean Texier <pjtexier@koncepto.io>
+Date: Sun, 5 May 2019 21:42:48 +0200
+Subject: [PATCH] fw_printenv: remove declaration in for loop
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This commit fixes :
+
+src/fw_printenv.c:142:4: error: ‘for’ loop initial declarations are only allowed in C99 or C11 mode
+ for (int i = 0; i < argc; i++) {
+
+Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
+[Upstream status: https://github.com/sbabic/libubootenv/commit/d63007652f1d9f9256a5eedbce6273b9848b653c]
+---
+ src/fw_printenv.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/fw_printenv.c b/src/fw_printenv.c
+index 361d150..4236eaa 100644
+--- a/src/fw_printenv.c
++++ b/src/fw_printenv.c
+@@ -59,7 +59,7 @@ int main (int argc, char **argv) {
+ char *cfgfname = NULL;
+ char *defenvfile = NULL;
+ char *scriptfile = NULL;
+- int c;
++ int c, i;
+ int ret = 0;
+ void *tmp;
+ const char *name, *value;
+@@ -139,7 +139,7 @@ int main (int argc, char **argv) {
+ fprintf(stdout, "%s=%s\n", name, value);
+ }
+ } else {
+- for (int i = 0; i < argc; i++) {
++ for (i = 0; i < argc; i++) {
+ value = libuboot_get_env(ctx, argv[i]);
+ if (noheader)
+ fprintf(stdout, "%s\n", value ? value : "");
+@@ -151,7 +151,7 @@ int main (int argc, char **argv) {
+ if (scriptfile)
+ libuboot_load_file(ctx, scriptfile);
+ else {
+- for (int i = 0; i < argc; i += 2) {
++ for (i = 0; i < argc; i += 2) {
+ if (i + 1 == argc)
+ libuboot_set_env(ctx, argv[i], NULL);
+ else
+--
+2.7.4
+
diff --git a/package/libubootenv/0002-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch b/package/libubootenv/0002-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch
new file mode 100644
index 0000000000..c1196d615a
--- /dev/null
+++ b/package/libubootenv/0002-src-CMakeLists.txt-do-not-force-the-build-of-a-share.patch
@@ -0,0 +1,46 @@
+From 5448ca9d92f7fa197060323a82a5f060ce7c31e7 Mon Sep 17 00:00:00 2001
+From: Pierre-Jean Texier <pjtexier@koncepto.io>
+Date: Wed, 22 May 2019 10:26:27 +0200
+Subject: [PATCH] src/CMakeLists.txt: do not force the build of a shared
+ library
+
+By definition, projects using CMake which can build either static or shared
+libraries use a BUILD_SHARED_LIBS flag to allow selecting between both.
+So, let CMake rely on the standard BUILD_SHARED_LIBS variable to decide
+whether a static or shared library should be built.
+
+however, we can control the behaviour as follows:
+
+ $. cmake -DBUILD_SHARED_LIBS=OFF ...
+
+ $. cmake -DBUILS_SHARED_LIBS=ON ...
+
+With Yocto/OE, just add the following option into the libubootenv recipe :
+
+EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON"
+
+Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
+[Upstream status: http://patchwork.ozlabs.org/patch/1103437/]
+---
+ src/CMakeLists.txt | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 051732b..c5f6dcb 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -10,10 +10,9 @@ SET(include_HEADERS
+ libuboot.h
+ )
+
+-add_library(ubootenv SHARED ${libubootenv_SOURCES} ${include_HEADERS})
++add_library(ubootenv ${libubootenv_SOURCES} ${include_HEADERS})
+ SET_TARGET_PROPERTIES(ubootenv PROPERTIES SOVERSION ${SOVERSION})
+
+-ADD_LIBRARY(ubootenv_static STATIC ${libubootenv_SOURCES} ${include_HEADERS})
+ add_executable(fw_printenv fw_printenv.c)
+ add_executable(fw_setenv fw_setenv.c)
+ target_link_libraries(fw_printenv ubootenv z)
+--
+2.7.4
+
diff --git a/package/libubootenv/0003-uboot_env-fix-build-with-musl-libc.patch b/package/libubootenv/0003-uboot_env-fix-build-with-musl-libc.patch
new file mode 100644
index 0000000000..3abd81c3c9
--- /dev/null
+++ b/package/libubootenv/0003-uboot_env-fix-build-with-musl-libc.patch
@@ -0,0 +1,31 @@
+From 113a4ea9ec48b9428b3abac21ecca7d8f11502fe Mon Sep 17 00:00:00 2001
+From: Pierre-Jean Texier <pjtexier@koncepto.io>
+Date: Tue, 21 May 2019 21:32:27 +0200
+Subject: [libubootenv][PATCH] uboot_env: fix build with musl libc
+
+Fixes the following compile failure when building with musl:
+
+ - http://autobuild.buildroot.net/results/206/206f1eba0dec39de1c02d760fa8f961d5a3879d0/
+
+Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
+[Upstream status: http://patchwork.ozlabs.org/patch/1103009/]
+---
+ src/uboot_env.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/uboot_env.c b/src/uboot_env.c
+index 4c298d1..a0f977c 100644
+--- a/src/uboot_env.c
++++ b/src/uboot_env.c
+@@ -11,6 +11,8 @@
+ * @brief This is the implementation of libubootenv library
+ *
+ */
++
++#define _GNU_SOURCE
+
+ #include <stdio.h>
+ #include <stdlib.h>
+--
+2.7.4
+
diff --git a/package/libubootenv/0004-uboot_env-fix-compilation-for-glibc-version-2.28.patch b/package/libubootenv/0004-uboot_env-fix-compilation-for-glibc-version-2.28.patch
new file mode 100644
index 0000000000..d9a9fc0579
--- /dev/null
+++ b/package/libubootenv/0004-uboot_env-fix-compilation-for-glibc-version-2.28.patch
@@ -0,0 +1,40 @@
+From fa991d153a73e312683b751e9f65d8df6ac61732 Mon Sep 17 00:00:00 2001
+From: Pierre-Jean Texier <pjtexier@koncepto.io>
+Date: Tue, 21 May 2019 21:40:23 +0200
+Subject: [libubootenv][PATCH] uboot_env: fix compilation for glibc version
+ >= 2.28
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Starting with glibc 2.28, include file sys/stat.h will have a
+definition for struct statx, in which case include file linux/stat.h should be
+avoided, in order to prevent a duplicate definition.
+
+This commit fixes (if _GNU_SOURCE is defined):
+
+/usr/include/linux/stat.h:56:8: error: redefinition of ‘struct statx_timestamp’
+ struct statx_timestamp {
+ ^~~~~~~~~~~~~~~
+
+Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
+[Upstream status: http://patchwork.ozlabs.org/patch/1103010/]
+---
+ src/uboot_env.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/uboot_env.c b/src/uboot_env.c
+index a0f977c..e8483bf 100644
+--- a/src/uboot_env.c
++++ b/src/uboot_env.c
+@@ -32,7 +32,6 @@
+ #include <sys/wait.h>
+ #include <sys/ioctl.h>
+ #include <zlib.h>
+-#include <linux/stat.h>
+ #include <mtd/mtd-user.h>
+ #include <mtd/ubi-user.h>
+
+--
+2.7.4
+
diff --git a/package/libubootenv/Config.in b/package/libubootenv/Config.in
new file mode 100644
index 0000000000..9be52c4522
--- /dev/null
+++ b/package/libubootenv/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBUBOOTENV
+ bool "libubootenv"
+ select BR2_PACKAGE_ZLIB
+ help
+ libubootenv is a library that provides a hardware independent
+ way to access to U-Boot environment.
+
+ The package provides the fw_printenv / fw_setenv utilities,
+ new tools build from the library and not from U-Boot.
+
+ https://github.com/sbabic/libubootenv/
diff --git a/package/libubootenv/libubootenv.hash b/package/libubootenv/libubootenv.hash
new file mode 100644
index 0000000000..79aaac7b56
--- /dev/null
+++ b/package/libubootenv/libubootenv.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 82c6966af5feae8726bd78a2cde4c4c2f69e81f8fdc548098063f8a35eaad090 libubootenv-8a7d4030bcb106de11632e85b6a0e7b7d4cb47af.tar.gz
diff --git a/package/libubootenv/libubootenv.mk b/package/libubootenv/libubootenv.mk
new file mode 100644
index 0000000000..5348794713
--- /dev/null
+++ b/package/libubootenv/libubootenv.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# libubootenv
+#
+################################################################################
+
+LIBUBOOTENV_VERSION = 8a7d4030bcb106de11632e85b6a0e7b7d4cb47af
+LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,$(LIBUBOOTENV_VERSION))
+LIBUBOOTENV_LICENSE = LGPL-2.1
+LIBUBOOTENV_INSTALL_STAGING = YES
+LIBUBOOTENV_DEPENDENCIES = zlib
+
+$(eval $(cmake-package))
diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash
index 7f51dfc923..81ba5b2672 100644
--- a/package/libuv/libuv.hash
+++ b/package/libuv/libuv.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 9ab338062e5b73bd4a05b7fcb77a0745c925c0be9118e0946434946a262cdad5 libuv-v1.28.0.tar.gz
+sha256 bdde1140087ce97080ea323c3598553ece00a24ae63ac568be78bef3e97f3e25 libuv-v1.29.1.tar.gz
sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE
diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk
index 00b13f26bc..cbf6e384bc 100644
--- a/package/libuv/libuv.mk
+++ b/package/libuv/libuv.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBUV_VERSION = v1.28.0
+LIBUV_VERSION = v1.29.1
LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION))
LIBUV_DEPENDENCIES = host-pkgconf
LIBUV_INSTALL_STAGING = YES
diff --git a/package/libva/libva.hash b/package/libva/libva.hash
index 06b7de5762..661eedf16a 100644
--- a/package/libva/libva.hash
+++ b/package/libva/libva.hash
@@ -1,5 +1,5 @@
-# From https://github.com/intel/libva/releases/download/2.4.0/libva-2.4.0.tar.bz2.sha1sum
-sha1 2e7b69ebb615d039b9253d4708eeec889b812dbf libva-2.4.0.tar.bz2
+# From https://github.com/intel/libva/releases/download/2.4.1/libva-2.4.1.tar.bz2.sha1sum
+sha1 5aeffc9929b4a9a5ebbed94adf065d08fc50bcf9 libva-2.4.1.tar.bz2
# Locally computed
-sha256 99263056c21593a26f2ece812aee6fe60142b49e6cd46cb33c8dddf18fc19391 libva-2.4.0.tar.bz2
+sha256 e9e053908591b121793eaa5d8aa37675b4cd3af4b12f1f377dff4767f39cee70 libva-2.4.1.tar.bz2
sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING
diff --git a/package/libva/libva.mk b/package/libva/libva.mk
index 8a21c11b6c..e876a1a3d0 100644
--- a/package/libva/libva.mk
+++ b/package/libva/libva.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBVA_VERSION = 2.4.0
+LIBVA_VERSION = 2.4.1
LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2
LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION)
LIBVA_LICENSE = MIT
diff --git a/package/libwpe/libwpe.hash b/package/libwpe/libwpe.hash
index 58dba92e6f..bd36016603 100644
--- a/package/libwpe/libwpe.hash
+++ b/package/libwpe/libwpe.hash
@@ -1,7 +1,7 @@
-# From https://wpewebkit.org/releases/libwpe-1.0.0.tar.xz.sums
-md5 b5ea32bd644811d5c6433cf1439763f7 libwpe-1.0.0.tar.xz
-sha1 6e51591c00a9a6128e19920807e6874794c723fd libwpe-1.0.0.tar.xz
-sha256 aff11612123f9ab85a8b9a4bcdfb3a7503eba0a0d2d96f2cdecd30e911091719 libwpe-1.0.0.tar.xz
+# From https://wpewebkit.org/releases/libwpe-1.2.0.tar.xz.sums
+md5 060876c6a32ef1ae519cb9542d0ede06 libwpe-1.2.0.tar.xz
+sha1 5dd34eba8cc7625d2b1c679c509492941092d137 libwpe-1.2.0.tar.xz
+sha256 f28035e7a8991fbb1a0e762f1b3d0e3cb57513a3164c75c7dc3eb0c11d9149fc libwpe-1.2.0.tar.xz
# Hashes for license files:
sha256 6efc9991641b47b1f4e727db7f090d0ade00117dcbbc74be622f2baceddb1f22 COPYING
diff --git a/package/libwpe/libwpe.mk b/package/libwpe/libwpe.mk
index aad1214e1d..fca974aecd 100644
--- a/package/libwpe/libwpe.mk
+++ b/package/libwpe/libwpe.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBWPE_VERSION = 1.0.0
+LIBWPE_VERSION = 1.2.0
LIBWPE_SITE = https://wpewebkit.org/releases
LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz
LIBWPE_INSTALL_STAGING = YES
diff --git a/package/libxml-parser-perl/libxml-parser-perl.hash b/package/libxml-parser-perl/libxml-parser-perl.hash
index d8e0df5a27..1e2a1c4665 100644
--- a/package/libxml-parser-perl/libxml-parser-perl.hash
+++ b/package/libxml-parser-perl/libxml-parser-perl.hash
@@ -1,2 +1,3 @@
# locally computed hash
sha256 1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216 XML-Parser-2.44.tar.gz
+sha256 a008c782e078102720266824c1e87875bafbf25ffae4b173dc135f9a4e1c672e README
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 93c6a5de1b..377478c1c7 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -29,20 +29,24 @@ config BR2_KERNEL_HEADERS_AS_KERNEL
config BR2_KERNEL_HEADERS_4_4
bool "Linux 4.4.x kernel headers"
depends on !BR2_riscv
+ depends on !BR2_csky
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
config BR2_KERNEL_HEADERS_4_9
bool "Linux 4.9.x kernel headers"
depends on !BR2_riscv
+ depends on !BR2_csky
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
config BR2_KERNEL_HEADERS_4_14
bool "Linux 4.14.x kernel headers"
depends on !BR2_riscv
+ depends on !BR2_csky
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
config BR2_KERNEL_HEADERS_4_19
bool "Linux 4.19.x kernel headers"
+ depends on !BR2_csky
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
config BR2_KERNEL_HEADERS_5_0
diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk
index c52d6a5a39..2f3b19b5f8 100644
--- a/package/lmbench/lmbench.mk
+++ b/package/lmbench/lmbench.mk
@@ -18,8 +18,9 @@ LMBENCH_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`
LMBENCH_LDLIBS = `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`
endif
+LMBENCH_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
+
define LMBENCH_CONFIGURE_CMDS
- $(call CONFIG_UPDATE,$(@D))
sed -i 's/CFLAGS=/CFLAGS+=/g' $(@D)/src/Makefile
sed -i 's/LDLIBS=/LDLIBS+=/g' $(@D)/scripts/build
sed -i '/cd .*doc/d' $(@D)/src/Makefile
diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash
index ba0dcbe7e8..01111a8a30 100644
--- a/package/ltp-testsuite/ltp-testsuite.hash
+++ b/package/ltp-testsuite/ltp-testsuite.hash
@@ -1,2 +1,2 @@
-# From: https://github.com/linux-test-project/ltp/releases/download/20190115/ltp-full-20190115.tar.xz.sha1
-sha1 d87e2f96dc628f927e98ecba2e9dae581fc115b4 ltp-full-20190115.tar.xz
+# From: https://github.com/linux-test-project/ltp/releases/download/20190517/ltp-full-20190517.tar.xz.sha1
+sha1 464d09ee1d3b43eecd0d78a9818596e6e1f2234e ltp-full-20190517.tar.xz
diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index ebc386d0cf..173c3bfe8c 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LTP_TESTSUITE_VERSION = 20190115
+LTP_TESTSUITE_VERSION = 20190517
LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz
LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION)
LTP_TESTSUITE_LICENSE = GPL-2.0, GPL-2.0+
@@ -60,7 +60,6 @@ LTP_TESTSUITE_CONF_ENV += \
# Requires uClibc fts and bessel support, normally not enabled
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
define LTP_TESTSUITE_REMOVE_UNSUPPORTED
- rm -rf $(@D)/testcases/kernel/controllers/cpuset/
rm -rf $(@D)/testcases/misc/math/float/bessel/
rm -f $(@D)/testcases/misc/math/float/float_bessel.c
endef
diff --git a/package/lua-flu/0001-use-system-xattr-h.patch b/package/lua-flu/0001-use-system-xattr-h.patch
deleted file mode 100644
index 1cd44b4617..0000000000
--- a/package/lua-flu/0001-use-system-xattr-h.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-Use system <sys/xattr.h>
-
-The one from attr is no longer installed with latest version.
-
-ENOATTR was in fact defined as ENODATA, so switch to using that instead.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
----
-Upstream status: merged:
- https://bitbucket.org/doub/flu/pull-requests/1
- https://bitbucket.org/doub/flu/commits/2d75cc2be79026b94188b11c6f53b219c24a5f70
-
-
-diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua
---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua 2015-03-31 18:54:19.000000000 +0200
-+++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua 2018-05-06 09:22:28.499324049 +0200
-@@ -327,7 +327,7 @@
- name = "fs.getxattr";
- parameters = {"path", "name"};
- results = {"value"};
-- doc = [[Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]];
-+ doc = [[Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]];
- },
- {
- name = "fs.listxattr";
-@@ -338,7 +338,7 @@
- {
- name = "fs.removexattr";
- parameters = {"path", "name"};
-- doc = [[Remove an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]];
-+ doc = [[Remove an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]];
- },
- {
- name = "fs.opendir";
-diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/luafs.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/luafs.lua
---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/luafs.lua 2015-03-31 18:54:19.000000000 +0200
-+++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/luafs.lua 2018-05-06 09:22:28.495324054 +0200
-@@ -222,8 +222,8 @@
- -- :NOTE: since the filesystem is a pure tree (not a DAG), use the path to find attribs
-
- function luafs.getxattr(path, name)
-- local attrs = assert(xattrs[path], errno.ENOATTR)
-- return assert(attrs[name], errno.ENOATTR)
-+ local attrs = assert(xattrs[path], errno.ENODATA)
-+ return assert(attrs[name], errno.ENODATA)
- end
-
- function luafs.setxattr(path, name, value, flags)
-@@ -236,7 +236,7 @@
- end
-
- function luafs.removexattr(path, name)
-- local attrs = assert(xattrs[path], errno.ENOATTR)
-+ local attrs = assert(xattrs[path], errno.ENODATA)
- attrs[name] = nil
- if next(attrs)==nil then
- xattrs[path] = nil
-diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/manual.html lua-flu-20150331-1/doub-flu-a7daae986339/doc/manual.html
---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/manual.html 2015-03-31 18:54:19.000000000 +0200
-+++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/manual.html 2018-05-06 09:22:28.499324049 +0200
-@@ -347,7 +347,7 @@
- <div class="function">
- <h3><a name="fs.getxattr"><code>value = fs.getxattr (path, name)</code></a></h3>
-
--<p>Get an extended attribute. If the attribute doesn't exist <code>ENOATTR</code> should be thrown.</p>
-+<p>Get an extended attribute. If the attribute doesn't exist <code>ENODATA</code> should be thrown.</p>
- </div>
-
- <div class="function">
-@@ -359,7 +359,7 @@
- <div class="function">
- <h3><a name="fs.removexattr"><code>fs.removexattr (path, name)</code></a></h3>
-
--<p>Remove an extended attribute. If the attribute doesn't exist <code>ENOATTR</code> should be thrown.</p>
-+<p>Remove an extended attribute. If the attribute doesn't exist <code>ENODATA</code> should be thrown.</p>
- </div>
-
- <div class="function">
-diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/errno.c lua-flu-20150331-1/doub-flu-a7daae986339/errno.c
---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/errno.c 2015-03-31 18:54:19.000000000 +0200
-+++ lua-flu-20150331-1/doub-flu-a7daae986339/errno.c 2018-05-06 09:23:06.323282527 +0200
-@@ -3,7 +3,7 @@
- #include <lua.h>
- #include <lauxlib.h>
- #include <stdlib.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include "compat.h"
-
- /****************************************************************************/
-@@ -103,7 +103,7 @@
- REGISTER_ERROR(EDOM)
- REGISTER_ERROR(ERANGE)
- REGISTER_ERROR(ENOSYS)
-- REGISTER_ERROR(ENOATTR)
-+ REGISTER_ERROR(ENODATA)
- #undef REGISTER_ERROR
- }
-
-diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu-20150331-1.rockspec lua-flu-20150331-1/doub-flu-a7daae986339/flu-20150331-1.rockspec
---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu-20150331-1.rockspec 2018-05-06 09:22:04.123351349 +0200
-+++ lua-flu-20150331-1/doub-flu-a7daae986339/flu-20150331-1.rockspec 2018-05-06 09:23:06.323282527 +0200
-@@ -14,7 +14,7 @@
- library = 'fuse',
- },
- ATTR = {
-- header = 'attr/xattr.h',
-+ header = 'sys/xattr.h',
- },
- }
- dependencies = {
-diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.c lua-flu-20150331-1/doub-flu-a7daae986339/flu.c
---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.c 2015-03-31 18:54:19.000000000 +0200
-+++ lua-flu-20150331-1/doub-flu-a7daae986339/flu.c 2018-05-06 09:23:06.323282527 +0200
-@@ -15,7 +15,7 @@
- #include <errno.h>
- #include <string.h>
- #include <fuse.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include <lua.h>
- #include <lauxlib.h>
-
-diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.rockspec.in lua-flu-20150331-1/doub-flu-a7daae986339/flu.rockspec.in
---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.rockspec.in 2015-03-31 18:54:19.000000000 +0200
-+++ lua-flu-20150331-1/doub-flu-a7daae986339/flu.rockspec.in 2018-05-06 09:23:06.323282527 +0200
-@@ -14,7 +14,7 @@
- library = 'fuse',
- },
- ATTR = {
-- header = 'attr/xattr.h',
-+ header = 'sys/xattr.h',
- },
- }
- dependencies = {
-diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/README.md lua-flu-20150331-1/doub-flu-a7daae986339/README.md
---- lua-flu-20150331-1.orig/doub-flu-a7daae986339/README.md 2015-03-31 18:54:19.000000000 +0200
-+++ lua-flu-20150331-1/doub-flu-a7daae986339/README.md 2018-05-06 09:22:28.495324054 +0200
-@@ -345,7 +345,7 @@
-
- ### `value = fs.getxattr (path, name)`
-
--Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.
-+Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.
-
- ---
-
-@@ -357,7 +357,7 @@
-
- ### `fs.removexattr (path, name)`
-
--Remove an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.
-+Remove an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.
-
- ---
-
-diff -durN lua-flu-20150331-1.orig/flu-20150331-1.rockspec lua-flu-20150331-1/flu-20150331-1.rockspec
---- lua-flu-20150331-1.orig/flu-20150331-1.rockspec 2015-04-02 23:44:11.000000000 +0200
-+++ lua-flu-20150331-1/flu-20150331-1.rockspec 2018-05-06 09:23:06.323282527 +0200
-@@ -14,7 +14,7 @@
- library = 'fuse',
- },
- ATTR = {
-- header = 'attr/xattr.h',
-+ header = 'sys/xattr.h',
- },
- }
- dependencies = {
diff --git a/package/lua-flu/lua-flu.hash b/package/lua-flu/lua-flu.hash
index 2195b42468..63f414d38f 100644
--- a/package/lua-flu/lua-flu.hash
+++ b/package/lua-flu/lua-flu.hash
@@ -1,3 +1,3 @@
# computed by luarocks/buildroot
-sha256 1389c22daec77161ec93ff90c39ee70e0f8a656ff92f22f9cf5d7121999d5c53 flu-20150331-1.src.rock
-sha256 409f7c274eb26874a382241d675a360ba6b2659742c5941e680d71a41dd35913 doub-flu-a7daae986339/doc/LICENSE.txt
+sha256 221ba8f8d3abbf12d5fc217dbb965605391892eb314eff1cd9c7beca90fe9887 flu-20181218-1.src.rock
+sha256 409f7c274eb26874a382241d675a360ba6b2659742c5941e680d71a41dd35913 doub-flu-63f077a988cd/doc/LICENSE.txt
diff --git a/package/lua-flu/lua-flu.mk b/package/lua-flu/lua-flu.mk
index c01a4848c7..4c7b765470 100644
--- a/package/lua-flu/lua-flu.mk
+++ b/package/lua-flu/lua-flu.mk
@@ -4,9 +4,9 @@
#
################################################################################
-LUA_FLU_VERSION = 20150331-1
+LUA_FLU_VERSION = 20181218-1
LUA_FLU_NAME_UPSTREAM = Flu
-LUA_FLU_SUBDIR = doub-flu-a7daae986339
+LUA_FLU_SUBDIR = doub-flu-63f077a988cd
LUA_FLU_LICENSE = MIT
LUA_FLU_LICENSE_FILES = $(LUA_FLU_SUBDIR)/doc/LICENSE.txt
LUA_FLU_DEPENDENCIES = attr libfuse
diff --git a/package/luv/luv.hash b/package/luv/luv.hash
index e6e47b0d5e..507299f9df 100644
--- a/package/luv/luv.hash
+++ b/package/luv/luv.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 d7eca8a9d7f126ed478fa76ce6a4e5d6e9f79309ddbceaae01060f4edc6bf242 luv-1.28.0-1.tar.gz
+sha256 430d5d8ad6b22e3e6284b8cdcfc7cea93e7459039bc12375a8a89bfbd034751c luv-1.29.1-1.tar.gz
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt
diff --git a/package/luv/luv.mk b/package/luv/luv.mk
index 084311a761..d1f7b06e85 100644
--- a/package/luv/luv.mk
+++ b/package/luv/luv.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LUV_VERSION = 1.28.0-1
+LUV_VERSION = 1.29.1-1
LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION)
LUV_LICENSE = Apache-2.0
LUV_LICENSE_FILES = LICENSE.txt
diff --git a/package/mender-artifact/mender-artifact.hash b/package/mender-artifact/mender-artifact.hash
index d44244d31c..9f75b850f9 100644
--- a/package/mender-artifact/mender-artifact.hash
+++ b/package/mender-artifact/mender-artifact.hash
@@ -1,5 +1,5 @@
# Locally computed:
-sha256 fde448af4811600a130b243d59e21b1f9cdd60fd991bd418246c913ebf945206 2.4.0.tar.gz
+sha256 b1b80822282a750c3f94cf4954ac4b1de5a86a7a9c1c7f2541aaf21417a0ff5f 3.0.0.tar.gz
# License hash extracted from LIC_FILES_CHKSUM.sha256 using the
# following command:
@@ -7,8 +7,8 @@ sha256 fde448af4811600a130b243d59e21b1f9cdd60fd991bd418246c913ebf945206 2.4.0.ta
# sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256
# Apache 2.0 licenses.
-sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7 LICENSE
-sha256 ceb1b36ff073bd13d9806d4615b931707768ca9023805620acc32dd1cfc2f680 vendor/github.com/mendersoftware/mendertesting/LICENSE
+sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 LICENSE
+sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 vendor/github.com/mendersoftware/mendertesting/LICENSE
#
# BSD 2 Clause licenses.
sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE
@@ -17,6 +17,7 @@ sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/g
sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE
sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE
sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE
+sha256 a284e538f3e5649ae6a8f32da2bbd18e9daabf2c1ebbfb99ed92e797b159be1a vendor/github.com/mendersoftware/go-liblzma/LICENSE
#
# ISC licenses.
sha256 3525392c6db3b804af76980b2c560ee9ec1abdadd907d76a26091df7c78f3a25 vendor/github.com/davecgh/go-spew/LICENSE
diff --git a/package/mender-artifact/mender-artifact.mk b/package/mender-artifact/mender-artifact.mk
index 90d0071d1a..f8b364166f 100644
--- a/package/mender-artifact/mender-artifact.mk
+++ b/package/mender-artifact/mender-artifact.mk
@@ -4,7 +4,7 @@
#
################################################################################
-HOST_MENDER_ARTIFACT_VERSION = 2.4.0
+HOST_MENDER_ARTIFACT_VERSION = 3.0.0
HOST_MENDER_ARTIFACT_SITE = https://github.com/mendersoftware/mender-artifact/archive
HOST_MENDER_ARTIFACT_SOURCE = $(HOST_MENDER_ARTIFACT_VERSION).tar.gz
HOST_MENDER_ARTIFACT_LICENSE = Apache2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT
@@ -16,11 +16,13 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \
vendor/github.com/pmezard/go-difflib/LICENSE \
vendor/golang.org/x/sys/LICENSE \
vendor/golang.org/x/crypto/LICENSE \
+ vendor/github.com/mendersoftware/go-liblzma/LICENSE \
vendor/github.com/davecgh/go-spew/LICENSE \
vendor/github.com/stretchr/testify/LICENSE \
vendor/github.com/stretchr/testify/LICENSE \
vendor/github.com/urfave/cli/LICENSE \
vendor/github.com/sirupsen/logrus/LICENSE
+HOST_MENDER_ARTIFACT_DEPENDENCIES = host-xz
HOST_MENDER_ARTIFACT_LDFLAGS = -X main.Version=$(HOST_MENDER_ARTIFACT_VERSION)
diff --git a/package/mender/Config.in b/package/mender/Config.in
index 5ab2304e49..db1a5caa43 100644
--- a/package/mender/Config.in
+++ b/package/mender/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_MENDER
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
+ select BR2_PACKAGE_XZ
select BR2_PACKAGE_UBOOT_TOOLS # runtime
select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV # runtime
help
diff --git a/package/mender/mender.hash b/package/mender/mender.hash
index 89aec239b1..5981252b4d 100644
--- a/package/mender/mender.hash
+++ b/package/mender/mender.hash
@@ -1,19 +1,19 @@
# Locally computed:
-sha256 caee18d1b8446df0cbb9a9c5a1c040d7eb1924332da94c3489494443a8077eb8 1.7.0.tar.gz
+sha256 af37a11c4189097b485254c35450f289b078bc61f6a230d6540743f202d81b98 2.0.0.tar.gz
# Apache-2.0 license, locally computed
-sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7 LICENSE
+sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 LICENSE
# Vendor licenses
# Generated with sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256
# Apache-2.0 license.
-sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7 vendor/github.com/mendersoftware/mendertesting/LICENSE
+sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 vendor/github.com/mendersoftware/mendertesting/LICENSE
sha256 3591f687e2d6f49c83b1ec69577e8110afbde80be5ec81791bd86d2838ccd3de vendor/github.com/mendersoftware/log/LICENSE
sha256 bbb303820971c294a9a8e5eba5affcf1379036e877ea61c11cbf9400b2949483 vendor/github.com/mendersoftware/log/COPYING
sha256 3591f687e2d6f49c83b1ec69577e8110afbde80be5ec81791bd86d2838ccd3de vendor/github.com/mendersoftware/scopestack/LICENSE
sha256 bbb303820971c294a9a8e5eba5affcf1379036e877ea61c11cbf9400b2949483 vendor/github.com/mendersoftware/scopestack/COPYING
-sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 vendor/github.com/mendersoftware/mender-artifact/LICENSE
+sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 vendor/github.com/mendersoftware/mender-artifact/LICENSE
# BSD 2 Clause license.
sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE
@@ -23,13 +23,15 @@ sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/
sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE
sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/net/LICENSE
sha256 0634b008cee55ca01f0888d2f5aba2d34e66c3f52c31a4e16a5d5d33d0c2a03e vendor/github.com/bmatsuo/lmdb-go/LICENSE.md
+sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/text/LICENSE
+sha256 a284e538f3e5649ae6a8f32da2bbd18e9daabf2c1ebbfb99ed92e797b159be1a vendor/github.com/mendersoftware/go-liblzma/LICENSE
# ISC license.
-sha256 3525392c6db3b804af76980b2c560ee9ec1abdadd907d76a26091df7c78f3a25 vendor/github.com/davecgh/go-spew/LICENSE
+sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE
# MIT license.
sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/Sirupsen/logrus/LICENSE
-sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENSE
+sha256 dad2b0b2cc2dbdbf95ad5d800ef7588956e74dc2479014829d42be295125c25d vendor/github.com/stretchr/testify/LICENSE
sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENCE.txt
sha256 fde7d610b9b95fc5a6304055c4dae951025b630aaa42a24e95ebf76675ae832c vendor/github.com/stretchr/objx/LICENSE.md
sha256 ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e vendor/github.com/ungerik/go-sysfs/LICENSE
@@ -38,4 +40,4 @@ sha256 ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e vendor/
sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md
# sha256 of all the vendor licenses combined
-sha256 b84b543cab0505452982422783c0e68b7bfa0a1de4a625753d325e0a8b2dacb1 LIC_FILES_CHKSUM.sha256
+sha256 b4b6f1b6f923ae052ac1393ebcd302844db5e9306df37ce07d7c912f15746e3c LIC_FILES_CHKSUM.sha256
diff --git a/package/mender/mender.mk b/package/mender/mender.mk
index d56b634713..12a25fbbf3 100644
--- a/package/mender/mender.mk
+++ b/package/mender/mender.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MENDER_VERSION = 1.7.0
+MENDER_VERSION = 2.0.0
MENDER_SITE = https://github.com/mendersoftware/mender/archive
MENDER_SOURCE = $(MENDER_VERSION).tar.gz
MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8
@@ -25,6 +25,8 @@ MENDER_LICENSE_FILES = \
vendor/golang.org/x/sys/LICENSE \
vendor/golang.org/x/net/LICENSE \
vendor/github.com/bmatsuo/lmdb-go/LICENSE.md \
+ vendor/golang.org/x/text/LICENSE \
+ vendor/github.com/mendersoftware/go-liblzma/LICENSE \
vendor/github.com/davecgh/go-spew/LICENSE \
vendor/github.com/Sirupsen/logrus/LICENSE \
vendor/github.com/stretchr/testify/LICENSE \
@@ -33,6 +35,8 @@ MENDER_LICENSE_FILES = \
vendor/github.com/ungerik/go-sysfs/LICENSE \
vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md
+MENDER_DEPENDENCIES = xz
+
MENDER_LDFLAGS = -X main.Version=$(MENDER_VERSION)
define MENDER_INSTALL_CONFIG_FILES
diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk
index 22e3e1d28e..5cb34d36bc 100644
--- a/package/mesa3d-headers/mesa3d-headers.mk
+++ b/package/mesa3d-headers/mesa3d-headers.mk
@@ -12,7 +12,7 @@ endif
# Not possible to directly refer to mesa3d variables, because of
# first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 19.0.3
+MESA3D_HEADERS_VERSION = 19.0.5
MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive
MESA3D_HEADERS_DL_SUBDIR = mesa3d
diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash
index d4d20c64bf..5a3eb1fa0f 100644
--- a/package/mesa3d/mesa3d.hash
+++ b/package/mesa3d/mesa3d.hash
@@ -1,7 +1,7 @@
-# From https://lists.freedesktop.org/archives/mesa-announce/2019-April/000510.html
-md5 d03bf14e42c0e54ebae5730712ccc408 mesa-19.0.3.tar.xz
-sha1 e028365fb8c7ae73bb0f01807c9137ec856c8e52 mesa-19.0.3.tar.xz
-sha256 f027244e38dc309a4c12db45ef79be81ab62c797a50a88d566e4edb6159fc4d5 mesa-19.0.3.tar.xz
-sha512 aa170577252aa4157e4bd49076bbf6207e4aada9fc9f23b255de332e816f9c63e5661f752f2f276dd43e232a8926866004e2a2ff9ad4b411330969c2a9a7ffa0 mesa-19.0.3.tar.xz
+# From https://lists.freedesktop.org/archives/mesa-announce/2019-May/000515.html
+md5 1509a3251d459fd8b6fadf9329669dc1 mesa-19.0.5.tar.xz
+sha1 647352d5989d3ca9b5c83fe06ed1d84f341f6ad5 mesa-19.0.5.tar.xz
+sha256 6aecb7f67c136768692fb3c33a54196186c6c4fcafab7973516a355e1a54f831 mesa-19.0.5.tar.xz
+sha512 aecd5ee54ac0316d5e318dbea0abdc06f23e67d75d36eb82d6cf6a396c9e850e1ccf4fa8815f8c4097b6039ebb1524673189350cbfd4b766ce75ce17c26d9d8d mesa-19.0.5.tar.xz
# License
sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c docs/license.html
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 576e8f0a2d..630f181ddb 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -5,7 +5,7 @@
################################################################################
# When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 19.0.3
+MESA3D_VERSION = 19.0.5
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
MESA3D_SITE = https://mesa.freedesktop.org/archive
MESA3D_LICENSE = MIT, SGI, Khronos
diff --git a/package/murata-cyw-fw/Config.in b/package/murata-cyw-fw/Config.in
new file mode 100644
index 0000000000..7530477511
--- /dev/null
+++ b/package/murata-cyw-fw/Config.in
@@ -0,0 +1,97 @@
+config BR2_PACKAGE_MURATA_CYW_FW
+ bool "murata-cyw-fw"
+ help
+ Murata Wireless firmware, NVRAM and Bluetooth HCD patch files.
+
+ https://github.com/murata-wireless/cyw-fmac-fw
+ https://github.com/murata-wireless/cyw-fmac-nvram
+ https://github.com/murata-wireless/cyw-bt-patch
+
+if BR2_PACKAGE_MURATA_CYW_FW
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43012
+ bool "CYW43012 (1LV)"
+ help
+ Murata Wireless CYW43012 (1LV) module firmware files.
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43340
+ bool "CYW43340/CYW43341 (1BW)"
+ help
+ Murata Wireless CYW43340/CYW43341 (1BW) module firmware files.
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43362
+ bool "CYW43362 (SN8000)"
+ help
+ Murata Wireless CYW43362 (SN8000) module firmware files.
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW4339
+ bool "CYW4339 (1CK/ZP)"
+ help
+ Murata Wireless CYW4339 (1CK/ZP) module firmware files.
+
+choice
+ prompt "CYW4339 module" if BR2_PACKAGE_MURATA_CYW_FW_CYW4339
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW4339_1CK
+ bool "1CK"
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW4339_ZP
+ bool "ZP"
+
+endchoice
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43430
+ bool "CYW43430/CYW4343W/CYW43364 (1DX/1FX/1LN)"
+ help
+ Murata Wireless CYW43430/CYW4343W/CYW43364 (1DX/1FX/1LN)
+ module firmware files.
+
+choice
+ prompt "CYW43430/CYW4343W/CYW43364 module" if BR2_PACKAGE_MURATA_CYW_FW_CYW43430
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1DX
+ bool "1DX"
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1FX
+ bool "1FX"
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1LN
+ bool "1LN"
+
+endchoice
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43455
+ bool "CYW43455 (1HK/1LC/1MW)"
+ help
+ Murata Wireless CYW43455 (1HK/1LC/1MW) module firmware files.
+
+choice
+ prompt "CYW43455 module" if BR2_PACKAGE_MURATA_CYW_FW_CYW43455
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1HK
+ bool "1HK"
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1LC
+ bool "1LC"
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1MW
+ bool "1MW"
+
+endchoice
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW4354
+ bool "CYW4354 (1BB)"
+ help
+ Murata Wireless CYW4354 (1BB) module firmware files.
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW4356
+ bool "CYW4356 (1CX)"
+ help
+ Murata Wireless CYW4356 (1CX) module firmware files.
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW4359
+ bool "CYW4359 (1FD)"
+ help
+ Murata Wireless CYW4359 (1FD) module firmware files.
+
+endif
diff --git a/package/murata-cyw-fw/murata-cyw-fw.hash b/package/murata-cyw-fw/murata-cyw-fw.hash
new file mode 100644
index 0000000000..c1afb229eb
--- /dev/null
+++ b/package/murata-cyw-fw/murata-cyw-fw.hash
@@ -0,0 +1,5 @@
+# Locally calculated
+sha256 c3ecf357786d6db6f3283c0ea36ec067b1728f801fd8871694aed1502a82e9bc murata-cyw-fw-8d87950bfad28c65926695b7357bd8995b60016a.tar.gz
+sha256 03c140ae04f9c2036678262d6457b9c4b4a9ebb523c5e681af6d57b97c11da37 cyw-fmac-nvram-d27f1bf105fa1e5b828e355793b88d4b66188411.tar.gz
+sha256 8f23ebb9a262112b62ace1e1bedcdeb00523d9a45e8d48a829d4ca35db4f0280 cyw-bt-patch-748462f0b02ec4aeb500bedd60780ac51c37be31.tar.gz
+sha256 3a892759b73e8b459f1a750954b316118b0061fd9d1868d11fa258c104ee7e0c LICENCE.cypress
diff --git a/package/murata-cyw-fw/murata-cyw-fw.mk b/package/murata-cyw-fw/murata-cyw-fw.mk
new file mode 100644
index 0000000000..b99168b875
--- /dev/null
+++ b/package/murata-cyw-fw/murata-cyw-fw.mk
@@ -0,0 +1,98 @@
+################################################################################
+#
+# murata-cyw-fw
+#
+################################################################################
+
+MURATA_CYW_FW_VERSION = 8d87950bfad28c65926695b7357bd8995b60016a
+MURATA_CYW_FW_VERSION_NVRAM = d27f1bf105fa1e5b828e355793b88d4b66188411
+MURATA_CYW_FW_VERSION_BT_PATCH = 748462f0b02ec4aeb500bedd60780ac51c37be31
+MURATA_CYW_FW_SITE = $(call github,murata-wireless,cyw-fmac-fw,$(MURATA_CYW_FW_VERSION))
+MURATA_CYW_FW_EXTRA_DOWNLOADS = \
+ $(call github,murata-wireless,cyw-fmac-nvram,$(MURATA_CYW_FW_VERSION_NVRAM))/cyw-fmac-nvram-$(MURATA_CYW_FW_VERSION_NVRAM).tar.gz \
+ $(call github,murata-wireless,cyw-bt-patch,$(MURATA_CYW_FW_VERSION_BT_PATCH))/cyw-bt-patch-$(MURATA_CYW_FW_VERSION_BT_PATCH).tar.gz
+MURATA_CYW_FW_LICENSE = PROPRIETARY
+MURATA_CYW_FW_LICENSE_FILES = LICENCE.cypress
+MURATA_CYW_FW_REDISTRIBUTE = NO
+
+define MURATA_CYW_FW_EXTRACT_NVRAM_PATCH
+ $(foreach tar,$(notdir $(MURATA_CYW_FW_EXTRA_DOWNLOADS)), \
+ $(call suitable-extractor,$(tar)) $(MURATA_CYW_FW_DL_DIR)/$(tar) | \
+ $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) -
+ )
+endef
+MURATA_CYW_FW_POST_EXTRACT_HOOKS += MURATA_CYW_FW_EXTRACT_NVRAM_PATCH
+
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43012) += \
+ brcmfmac43012-sdio.bin \
+ brcmfmac43012-sdio.1LV.clm_blob \
+ brcmfmac43012-sdio.1LV.txt \
+ CYW43012C0.1LV.hcd
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43340) += \
+ brcmfmac43340-sdio.bin \
+ brcmfmac43340-sdio.1BW.txt \
+ CYW43341B0.1BW.hcd
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43362) += \
+ brcmfmac43362-sdio.bin \
+ brcmfmac43362-sdio.SN8000.txt
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4339) += \
+ brcmfmac4339-sdio.bin
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4339_1CK) += \
+ brcmfmac4339-sdio.1CK.txt
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4339_ZP) += \
+ brcmfmac4339-sdio.ZP.txt \
+ CYW4335C0.ZP.hcd
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430) += \
+ brcmfmac43430-sdio.bin
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1DX) += \
+ brcmfmac43430-sdio.1DX.clm_blob \
+ brcmfmac43430-sdio.1DX.txt \
+ CYW43430A1.1DX.hcd
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1FX) += \
+ brcmfmac43430-sdio.1FX.clm_blob \
+ brcmfmac43430-sdio.1FX.txt
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1LN) += \
+ brcmfmac43430-sdio.1LN.clm_blob \
+ brcmfmac43430-sdio.1LN.txt
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455) += \
+ brcmfmac43455-sdio.bin
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1HK) += \
+ brcmfmac43455-sdio.1HK.clm_blob \
+ brcmfmac43455-sdio.1HK.txt
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1LC) += \
+ brcmfmac43455-sdio.1LC.clm_blob \
+ brcmfmac43455-sdio.1LC.txt
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1MW) += \
+ brcmfmac43455-sdio.1MW.clm_blob \
+ brcmfmac43455-sdio.1MW.txt \
+ CYW4345C0.1MW.hcd
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4354) += \
+ brcmfmac4354-sdio.bin \
+ brcmfmac4354-sdio.1BB.clm_blob \
+ brcmfmac4354-sdio.1BB.txt \
+ CYW4350C0.1BB.hcd
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4356) += \
+ brcmfmac4356-pcie.bin \
+ brcmfmac4356-pcie.1CX.clm_blob \
+ brcmfmac4356-pcie.1CX.txt \
+ CYW4354A2.1CX.hcd
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4359) += \
+ brcmfmac4359-pcie.bin \
+ brcmfmac4359-pcie.1FD.clm_blob
+
+# Helper that assumes filename with model has two dots (CHIP.MODEL.EXT),
+# but filename without model has only single dot (CHIP.EXT).
+murata-cyw-fw-strip-model = $(shell echo -n $(1) | sed 's/\..*\./\./')
+
+# Helper that strips model name and renames Bluetooth patch files to the ones
+# expected by Linux kernel.
+murata-cyw-fw-file-rename = $(call murata-cyw-fw-strip-model,$(patsubst CYW%,BCM%,$(f)))
+
+define MURATA_CYW_FW_INSTALL_TARGET_CMDS
+ $(foreach f,$(MURATA_CYW_FW_FILES_y), \
+ $(INSTALL) -m 0644 -D $(@D)/$(f) \
+ $(TARGET_DIR)/lib/firmware/brcm/$(call murata-cyw-fw-file-rename,$(f))
+ )
+endef
+
+$(eval $(generic-package))
diff --git a/package/nano/nano.hash b/package/nano/nano.hash
index eae648d16e..b7fd6a6cfd 100644
--- a/package/nano/nano.hash
+++ b/package/nano/nano.hash
@@ -1,5 +1,5 @@
# Locally calculated after checking pgp signature
-# https://www.nano-editor.org/dist/v3/nano-3.2.tar.xz.asc
+# https://www.nano-editor.org/dist/v4/nano-4.2.tar.xz.asc
# using key BFD009061E535052AD0DF2150D28D4D2A0ACE884
-sha256 d12773af3589994b2e4982c5792b07c6240da5b86c5aef2103ab13b401fe6349 nano-3.2.tar.xz
+sha256 1143defce62e391b241252ffdb6e5c1ded56cfe26d46ee81b796abe0ccc45df9 nano-4.2.tar.xz
sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING
diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index 206d210a16..8a315154d2 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -4,7 +4,7 @@
#
################################################################################
-NANO_VERSION_MAJOR = 3
+NANO_VERSION_MAJOR = 4
NANO_VERSION = $(NANO_VERSION_MAJOR).2
NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR)
NANO_SOURCE = nano-$(NANO_VERSION).tar.xz
@@ -24,8 +24,9 @@ endif
ifeq ($(BR2_PACKAGE_FILE),y)
NANO_DEPENDENCIES += file
+NANO_CONF_OPTS += --enable-libmagic
else
-NANO_CONF_ENV += ac_cv_lib_magic_magic_open=no
+NANO_CONF_OPTS += --disable-libmagic
endif
ifeq ($(BR2_PACKAGE_NANO_TINY),y)
diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash
index 03234fd876..fab14072c9 100644
--- a/package/nbd/nbd.hash
+++ b/package/nbd/nbd.hash
@@ -1,3 +1,7 @@
-# From http://sourceforge.net/projects/nbd/files/nbd/3.13/
-md5 f52a4ef8979d81e6c15a745236582fdf nbd-3.15.2.tar.xz
-sha1 c8248dd76641a31189735407cd4d55fe63969c08 nbd-3.15.2.tar.xz
+# From http://sourceforge.net/projects/nbd/files/nbd/3.19/
+md5 162da84302abb5b9be06143c7943a642 nbd-3.19.tar.xz
+sha1 97edd98f7323a2fcd0dcf441f307d348cdbbb807 nbd-3.19.tar.xz
+
+# Locally calculated
+sha256 b4466412f13e057659f25d35e1e8e181afd62c7179bff22a6add81445ecb8690 nbd-3.19.tar.xz
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index 82de1c487d..484f3e695b 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-NBD_VERSION = 3.15.2
+NBD_VERSION = 3.19
NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz
NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION)
NBD_CONF_OPTS = --enable-lfs
diff --git a/package/netcat-openbsd/netcat-openbsd.hash b/package/netcat-openbsd/netcat-openbsd.hash
index 2cf4713449..cfa65ee24b 100644
--- a/package/netcat-openbsd/netcat-openbsd.hash
+++ b/package/netcat-openbsd/netcat-openbsd.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 06b04b163e8c923943b9fc276eea555625f615a530d5bd8fbdbc1af9b2b0d5db netcat-openbsd-debian_1.190-1.tar.gz
+sha256 b46c11f83f66c41ad8f413e842c51a9fb2c495e9a2ed836e6ee75bc314545c30 netcat-openbsd-debian_1.195-2.tar.gz
sha256 e2e86d58c38f044a49f51e45515747585db58a2305419c73323eaad88fcaef5c debian/copyright
diff --git a/package/netcat-openbsd/netcat-openbsd.mk b/package/netcat-openbsd/netcat-openbsd.mk
index b313116b3f..a2333531c0 100644
--- a/package/netcat-openbsd/netcat-openbsd.mk
+++ b/package/netcat-openbsd/netcat-openbsd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-NETCAT_OPENBSD_VERSION = debian/1.190-1
+NETCAT_OPENBSD_VERSION = debian/1.195-2
NETCAT_OPENBSD_SITE = https://salsa.debian.org/debian/netcat-openbsd.git
NETCAT_OPENBSD_SITE_METHOD = git
NETCAT_OPENBSD_LICENSE = BSD-3-Clause
diff --git a/package/netsniff-ng/netsniff-ng.hash b/package/netsniff-ng/netsniff-ng.hash
index 706c9461cf..d44c762660 100644
--- a/package/netsniff-ng/netsniff-ng.hash
+++ b/package/netsniff-ng/netsniff-ng.hash
@@ -1,2 +1,2 @@
# Locally calculated after checking signature
-sha256 4966821510079bb13722b9fbb4b7567e44b1b4c3e1b1e7ad95f417a89be5d795 netsniff-ng-0.6.5.tar.xz
+sha256 7949d38eb5b507700ea0f3c87e9f804d87b43f86ea5de0e961451044c2d3dba2 netsniff-ng-0.6.6.tar.xz
diff --git a/package/netsniff-ng/netsniff-ng.mk b/package/netsniff-ng/netsniff-ng.mk
index 415e86def1..283ecaf245 100644
--- a/package/netsniff-ng/netsniff-ng.mk
+++ b/package/netsniff-ng/netsniff-ng.mk
@@ -4,7 +4,7 @@
#
################################################################################
-NETSNIFF_NG_VERSION = 0.6.5
+NETSNIFF_NG_VERSION = 0.6.6
NETSNIFF_NG_SITE = http://pub.netsniff-ng.org/netsniff-ng
NETSNIFF_NG_SOURCE = netsniff-ng-$(NETSNIFF_NG_VERSION).tar.xz
NETSNIFF_NG_LICENSE = GPL-2.0
diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk
index 9d6f30e9fe..f29ab0a930 100644
--- a/package/ninja/ninja.mk
+++ b/package/ninja/ninja.mk
@@ -9,7 +9,12 @@ NINJA_SITE = $(call github,ninja-build,ninja,$(NINJA_VERSION))
NINJA_LICENSE = Apache-2.0
NINJA_LICENSE_FILES = COPYING
-HOST_NINJA_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python)
+# Although Ninja supports both Python2 and Python3, we enforce Python3
+# on the host for the following reason: Meson is the only package
+# using Ninja so far and Meson requires Python3. In this way, we
+# prevent both Python2 and Python3 from being created on the host,
+# which is time consuming and without benefit.
+HOST_NINJA_DEPENDENCIES = host-python3
define HOST_NINJA_BUILD_CMDS
(cd $(@D); ./configure.py --bootstrap)
diff --git a/package/norm/0001-fix-bigendian-build.patch b/package/norm/0001-fix-bigendian-build.patch
deleted file mode 100644
index cf999c27cf..0000000000
--- a/package/norm/0001-fix-bigendian-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix big-endian build breakage in protolib.
-Patch status: submitted to author via email.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura norm-1.5r6.orig/protolib/include/protoSpace.h norm-1.5r6/protolib/include/protoSpace.h
---- norm-1.5r6.orig/protolib/include/protoSpace.h 2016-03-08 19:48:21.326357963 -0300
-+++ norm-1.5r6/protolib/include/protoSpace.h 2016-03-08 19:48:46.647234075 -0300
-@@ -89,7 +89,7 @@
- }
- #else
- ProtoTree::Endian GetEndian() const
-- return ProtoTree::ENDIAN_BIG;
-+ {return ProtoTree::ENDIAN_BIG;}
- void SetNode(Node* theNode)
- {memcpy(key+sizeof(double), &theNode, sizeof(Node*));}
- Node* GetNode() const
diff --git a/package/norm/0002-protolib-drop-linux-version-check.patch b/package/norm/0001-protolib-drop-linux-version-check.patch
index 7852a30a37..7852a30a37 100644
--- a/package/norm/0002-protolib-drop-linux-version-check.patch
+++ b/package/norm/0001-protolib-drop-linux-version-check.patch
diff --git a/package/norm/0003-fix-const-qualifier-gcc7.patch b/package/norm/0003-fix-const-qualifier-gcc7.patch
deleted file mode 100644
index 57e01f9c13..0000000000
--- a/package/norm/0003-fix-const-qualifier-gcc7.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-protolib: remove const qualifiers in ProtoSortedTreeTemplate
-
-The methods PeekPrevItem() and PeekNextItem() in
-ProtoSortedTreeTemplate were using a const qualifier, but not the
-corresponding methods in ProtoSortedTree, causing a build failure with
-gcc 7.x:
-
-norm-1.5r6/protolib/include/protoTree.h: In member function 'ITEM_TYPE* ProtoSortedTreeTemplate<ITEM_TYPE>::Iterator::PeekPrevItem() const':
-norm-1.5r6/protolib/include/protoTree.h:652:93: error: no matching function for call to 'ProtoSortedTreeTemplate<ITEM_TYPE>::Iterator::PeekPrevItem() const'
- {return static_cast<ITEM_TYPE*>(ProtoSortedTree::Iterator::PeekPrevItem());}
- ^
-norm-1.5r6/protolib/include/protoTree.h:565:23: note: candidate: ProtoSortedTree::Item* ProtoSortedTree::Iterator::PeekPrevItem() <near match>
- Item* PeekPrevItem()
- ^~~~~~~~~~~~
-
-Since the same methods in ProtoTreeTemplate don't have the const
-qualifier, we take the simple solution of dropping such qualifiers
-from ProtoSortedTreeTemplate as well, which fixes the build of norm
-with gcc 7.x.
-
-Many thanks to Romain Naour <romain.naour@gmail.com> for pointing out
-the solution.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Patch has been submitted upstream and accepted, but mailing list
-archive not updated.]
-
-Index: b/protolib/include/protoTree.h
-===================================================================
---- a/protolib/include/protoTree.h
-+++ b/protolib/include/protoTree.h
-@@ -648,12 +648,12 @@
-
- ITEM_TYPE* GetPrevItem()
- {return static_cast<ITEM_TYPE*>(ProtoSortedTree::Iterator::GetPrevItem());}
-- ITEM_TYPE* PeekPrevItem() const
-+ ITEM_TYPE* PeekPrevItem()
- {return static_cast<ITEM_TYPE*>(ProtoSortedTree::Iterator::PeekPrevItem());}
-
- ITEM_TYPE* GetNextItem()
- {return static_cast<ITEM_TYPE*>(ProtoSortedTree::Iterator::GetNextItem());}
-- ITEM_TYPE* PeekNextItem() const
-+ ITEM_TYPE* PeekNextItem()
- {return static_cast<ITEM_TYPE*>(ProtoSortedTree::Iterator::PeekNextItem());}
-
- }; // end class ProtoSortedTreeTemplate::Iterator
diff --git a/package/norm/norm.hash b/package/norm/norm.hash
index 4693eed6bf..b4fd8e171a 100644
--- a/package/norm/norm.hash
+++ b/package/norm/norm.hash
@@ -1,2 +1,3 @@
# Locally calculated
-sha256 20ea2e8dd5d5e1ff1ff91dc7dab6db53a77d7b7183d8cf2425c215fd294f22a7 src-norm-1.5r6.tgz
+sha256 4480a6ea53fb7ce45b4bc2061d18fbfd46ee9990fc2ed9a9dc303ce4d87888a6 src-norm-1.5.8.tgz
+sha256 ba4b7e49b0163d6839830e3f47505696c6eaac77ccd93531831dc837b2160608 LICENSE.TXT
diff --git a/package/norm/norm.mk b/package/norm/norm.mk
index 8af76f8345..d5f7d0400b 100644
--- a/package/norm/norm.mk
+++ b/package/norm/norm.mk
@@ -4,8 +4,8 @@
#
################################################################################
-NORM_VERSION = 1.5r6
-NORM_SITE = http://downloads.pf.itd.nrl.navy.mil/norm/archive
+NORM_VERSION = 1.5.8
+NORM_SITE = http://downloads.pf.itd.nrl.navy.mil/norm
NORM_SOURCE = src-norm-$(NORM_VERSION).tgz
NORM_INSTALL_STAGING = YES
NORM_LICENSE = NRL License
diff --git a/package/ofono/0003-build-Add-check-for-explicit_bzero-support.patch b/package/ofono/0003-build-Add-check-for-explicit_bzero-support.patch
new file mode 100644
index 0000000000..b2507df3ff
--- /dev/null
+++ b/package/ofono/0003-build-Add-check-for-explicit_bzero-support.patch
@@ -0,0 +1,28 @@
+From dff595671bf5a46f7c9231966a6cd7d2a0183076 Mon Sep 17 00:00:00 2001
+From: Marcel Holtmann <marcel@holtmann.org>
+Date: Wed, 15 May 2019 09:39:44 +0200
+Subject: [PATCH] build: Add check for explicit_bzero support
+
+Upstream: dff595671bf5a46f7c9231966a6cd7d2a0183076
+
+Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index bacb7ac5..cad35c5d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,6 +54,8 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
+ fi
+ ])
+
++AC_CHECK_FUNCS(explicit_bzero)
++
+ AC_CHECK_FUNC(signalfd, dummy=yes,
+ AC_MSG_ERROR(signalfd support is required))
+
+--
+2.21.0
+
diff --git a/package/ofono/ofono.hash b/package/ofono/ofono.hash
index 2dbb9986c7..5204bb4fca 100644
--- a/package/ofono/ofono.hash
+++ b/package/ofono/ofono.hash
@@ -1,4 +1,4 @@
# From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc
-sha256 93bb2cedef54f897dd5200e22b072a6e38b5d9b44be57eebbbe8d513f0beb0e4 ofono-1.28.tar.xz
+sha256 67f0f8e5740dea5b46309e40667d1e560be39c90ef08dd01ff9e9ce8e61f0679 ofono-1.29.tar.xz
# Locally computed
sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING
diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
index 0552a181fd..176d23ae05 100644
--- a/package/ofono/ofono.mk
+++ b/package/ofono/ofono.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OFONO_VERSION = 1.28
+OFONO_VERSION = 1.29
OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz
OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
OFONO_LICENSE = GPL-2.0
@@ -49,4 +49,7 @@ else
OFONO_CONF_OPTS += --disable-bluetooth
endif
+# required by 0003-build-Add-check-for-explicit_bzero-support.patch
+OFONO_AUTORECONF = YES
+
$(eval $(autotools-package))
diff --git a/package/oniguruma/0001-fix-cross-compilation.patch b/package/oniguruma/0001-fix-cross-compilation.patch
deleted file mode 100644
index 9186cfd625..0000000000
--- a/package/oniguruma/0001-fix-cross-compilation.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 39619b1c04640375b2fc2c29991137b741a47976 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Wed, 20 Mar 2019 20:33:11 +0100
-Subject: [PATCH] fix cross-compilation
-
-Don't add -I$(includedir) to CPPFLAGS or cross-compilation will fail on:
-
-libtool: compile: /home/fabrice/buildroot/output/host/bin/m68k-linux-gcc -DHAVE_CONFIG_H -I. -I.. -I/usr/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
--D_FILE_OFFSET_BITS=64 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -fno-dwarf2-cfi-asm -Wl,-elf2flt -c regparse.c -o regparse.o
-m68k-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '-I/usr/include'
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/kkos/oniguruma/pull/137]
----
- sample/Makefile.am | 2 +-
- src/Makefile.am | 2 +-
- test/Makefile.am | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/sample/Makefile.am b/sample/Makefile.am
-index fd809fa..320afcf 100644
---- a/sample/Makefile.am
-+++ b/sample/Makefile.am
-@@ -4,7 +4,7 @@ lib_onig = ../src/libonig.la
- LDADD = $(lib_onig)
-
- AM_LDFLAGS = -L$(prefix)/lib
--AM_CPPFLAGS = -I$(top_srcdir)/src -I$(includedir)
-+AM_CPPFLAGS = -I$(top_srcdir)/src
-
- TESTS = encode listcap names posix simple sql syntax user_property callout echo count bug_fix
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index ba7807a..1330620 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,7 +2,7 @@
- libname = libonig.la
-
- AM_CFLAGS = -Wall
--AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir)
-+AM_CPPFLAGS = -I$(top_srcdir)
-
- include_HEADERS = oniguruma.h oniggnu.h
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index c623aa3..67b5d1e 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -3,7 +3,7 @@ lib_onig = ../src/libonig.la
-
- AM_LDFLAGS = -L$(prefix)/lib
- AM_CFLAGS = -Wall -Wno-invalid-source-encoding
--AM_CPPFLAGS = -I$(top_srcdir)/src -I$(includedir)
-+AM_CPPFLAGS = -I$(top_srcdir)/src
-
- if ENABLE_POSIX_API
- TESTS = test_utf8 testc testp testcu
---
-2.14.1
-
diff --git a/package/oniguruma/oniguruma.hash b/package/oniguruma/oniguruma.hash
index 4d3392c972..b6f1cc549d 100644
--- a/package/oniguruma/oniguruma.hash
+++ b/package/oniguruma/oniguruma.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 733a91e257c20cb17b81596db48fd0fbd2e0074fe922ae4c2bc4fefcec110aae oniguruma-6.9.1.tar.gz
-sha256 84e55812150474adf4170d4656744dfcc5f260ff7602e447a70bf13c56203e4b COPYING
+sha256 3b568a9050839e7828b2f2d5bc9cd3650979b6b54a080f54c515320dddda06b0 oniguruma-6.9.2.tar.gz
+sha256 ae266a1ad1c2ef50baf14a1a2993e926cd46d09c6cc8b0b3a8498e44da2746b8 COPYING
diff --git a/package/oniguruma/oniguruma.mk b/package/oniguruma/oniguruma.mk
index 1f992c2b94..9e8858b618 100644
--- a/package/oniguruma/oniguruma.mk
+++ b/package/oniguruma/oniguruma.mk
@@ -4,7 +4,7 @@
#
################################################################################
-ONIGURUMA_VERSION = 6.9.1
+ONIGURUMA_VERSION = 6.9.2
ONIGURUMA_SITE = $(call github,kkos,oniguruma,v$(ONIGURUMA_VERSION))
ONIGURUMA_LICENSE = BSD-2-Clause
ONIGURUMA_LICENSE_FILES = COPYING
diff --git a/package/opencv3/0001-3rdparty-protobuf-fix-compilation-issue-on-s390.patch b/package/opencv3/0001-3rdparty-protobuf-fix-compilation-issue-on-s390.patch
deleted file mode 100644
index 7743eae533..0000000000
--- a/package/opencv3/0001-3rdparty-protobuf-fix-compilation-issue-on-s390.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ac9ec55b37b2dd3b224144b4f20857a80719b750 Mon Sep 17 00:00:00 2001
-From: Loic Devulder <ldevulder@suse.de>
-Date: Fri, 28 Sep 2018 15:33:18 +0200
-Subject: [PATCH] 3rdparty/protobuf: fix compilation issue on s390
-
-This commit fixes an issue while trying to compile
-on s390x architecture.
-
-This is simply a backport of a fixe already applied
-in official protobuf code:
-- https://github.com/protocolbuffers/protobuf/pull/3955
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://github.com/opencv/opencv/commit/ac9ec55b37b2dd3b224144b4f20857a80719b750]
----
- .../protobuf/stubs/atomicops_internals_generic_gcc.h | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h b/3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
-index 0b0b06ce6cf..075c406abab 100644
---- a/3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
-+++ b/3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
-@@ -146,6 +146,14 @@ inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
- return __atomic_load_n(ptr, __ATOMIC_RELAXED);
- }
-
-+inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
-+ Atomic64 old_value,
-+ Atomic64 new_value) {
-+ __atomic_compare_exchange_n(ptr, &old_value, new_value, false,
-+ __ATOMIC_RELEASE, __ATOMIC_ACQUIRE);
-+ return old_value;
-+}
-+
- #endif // defined(__LP64__)
-
- } // namespace internal
diff --git a/package/opencv3/opencv3.hash b/package/opencv3/opencv3.hash
index 34baf260d4..0b88b52da5 100644
--- a/package/opencv3/opencv3.hash
+++ b/package/opencv3/opencv3.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 4eef85759d5450b183459ff216b4c0fa43e87a4f6aa92c8af649f89336f002ec opencv3-3.4.3.tar.gz
-sha256 fea311907cb6271b05ff5843b238e0f2edb6f204a3432975211030d20704b321 LICENSE
+sha256 e7d311ff97f376b8ee85112e2b536dbf4bdf1233673500175ed7cf21a0089f6d opencv3-3.4.6.tar.gz
+sha256 488b640f88bc72a1f9bbb985bde8352ed8826b863f0b3e14f7038c44bf95d6bc LICENSE
diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk
index 49b29d9f1e..5ffff1ae9f 100644
--- a/package/opencv3/opencv3.mk
+++ b/package/opencv3/opencv3.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENCV3_VERSION = 3.4.3
+OPENCV3_VERSION = 3.4.6
OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION))
OPENCV3_INSTALL_STAGING = YES
OPENCV3_LICENSE = BSD-3-Clause
diff --git a/package/openjpeg/openjpeg.hash b/package/openjpeg/openjpeg.hash
index 8a6fda48c4..31c5b50409 100644
--- a/package/openjpeg/openjpeg.hash
+++ b/package/openjpeg/openjpeg.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 3389a1aa908c2b577863da213db3a170df3edbb1432e99ae5fd3f2ac721d69d3 openjpeg-51f097e6d5754ddae93e716276fe8176b44ec548.tar.gz
+sha256 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9 openjpeg-2.3.1.tar.gz
sha256 a6af136f3e15038a666b61f376612a07d9a4e48cb7c01adbf3e33b3f14ab49b6 LICENSE
diff --git a/package/openjpeg/openjpeg.mk b/package/openjpeg/openjpeg.mk
index 6036ab95a3..1b119fa5fe 100644
--- a/package/openjpeg/openjpeg.mk
+++ b/package/openjpeg/openjpeg.mk
@@ -4,8 +4,8 @@
#
################################################################################
-OPENJPEG_VERSION = 51f097e6d5754ddae93e716276fe8176b44ec548
-OPENJPEG_SITE = $(call github,uclouvain,openjpeg,$(OPENJPEG_VERSION))
+OPENJPEG_VERSION = 2.3.1
+OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION))
OPENJPEG_LICENSE = BSD-2-Clause
OPENJPEG_LICENSE_FILES = LICENSE
OPENJPEG_INSTALL_STAGING = YES
diff --git a/package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch b/package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch
new file mode 100644
index 0000000000..da8cf042c6
--- /dev/null
+++ b/package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch
@@ -0,0 +1,66 @@
+From ec1a0c8fa2e7a7c6cf70f68bdabc07cbb1a567cf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= <michal.lyszczek@bofc.pl>
+Date: Sun, 5 May 2019 23:43:40 +0200
+Subject: [PATCH] init.d/sysctl.in: add support for busybox sysctl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Busybox version of sysctl does not support --system argument,
+and files need to be loaded one by one. This patch adds code
+to recognize busybox sysctl and execute proper function based
+on that.
+
+Signed-off-by: Michał Łyszczek <michal.lyszczek@bofc.pl>
+---
+ init.d/sysctl.in | 27 ++++++++++++++++++++++++++-
+ 1 file changed, 26 insertions(+), 1 deletion(-)
+
+diff --git a/init.d/sysctl.in b/init.d/sysctl.in
+index e49f4db2..a705b3d4 100644
+--- a/init.d/sysctl.in
++++ b/init.d/sysctl.in
+@@ -37,6 +37,23 @@ BSD_sysctl()
+ return $retval
+ }
+
++Busybox_sysctl()
++{
++ local quiet
++ yesno $rc_verbose || quiet=-q
++
++ eindent
++ for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do
++ if [ -r "$conf" ]; then
++ vebegin "applying $conf"
++ sysctl $quiet -p "$conf" || retval=1
++ veend $retval
++ fi
++ done
++ eoutdent
++ return $retval
++}
++
+ Linux_sysctl()
+ {
+ local quiet
+@@ -52,7 +69,15 @@ start()
+ ebegin "Configuring kernel parameters"
+ case "$RC_UNAME" in
+ *BSD|GNU) BSD_sysctl; rc=$? ;;
+- Linux) Linux_sysctl; rc=$? ;;
++ Linux)
++ sysctl -h > /dev/null 2>&1
++ if [ $? -ne 0 ]; then
++ # busybox version of sysctl does not recognize -h option
++ Busybox_sysctl
++ else
++ Linux_sysctl
++ fi
++ rc=$? ;;
+ esac
+ eend $rc "Unable to configure some kernel parameters"
+ }
+--
+2.18.1
+
diff --git a/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch b/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch
new file mode 100644
index 0000000000..66bbba42ba
--- /dev/null
+++ b/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch
@@ -0,0 +1,34 @@
+From 5ae8209afad9a4284723712b46d8685e7f7fd72c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= <michal.lyszczek@bofc.pl>
+Date: Mon, 6 May 2019 00:06:39 +0200
+Subject: [PATCH] sh/init.sh.Linux.in: change /run/lock from root:uucp to
+ root:daemon
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On gentoo /run/lock is owned by uucp group because of historical
+reasons. However uucp does not exist on buildroot by default, and
+it makes more sense that 'daemon' group should own this directory.
+
+Signed-off-by: Michał Łyszczek <michal.lyszczek@bofc.pl>
+---
+ sh/init.sh.Linux.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in
+index 222bbd3b..7f1a88db 100644
+--- a/sh/init.sh.Linux.in
++++ b/sh/init.sh.Linux.in
+@@ -85,7 +85,7 @@ fi
+
+ [ -x /sbin/restorecon ] && /sbin/restorecon -rF /run
+ checkpath -d $RC_SVCDIR
+-checkpath -d -m 0775 -o root:uucp /run/lock
++checkpath -d -m 0775 -o root:daemon /run/lock
+
+ # Try to mount xenfs as early as possible, otherwise rc_sys() will always
+ # return RC_SYS_XENU and will think that we are in a domU while it's not.
+--
+2.18.1
+
diff --git a/package/openrc/Config.in b/package/openrc/Config.in
new file mode 100644
index 0000000000..796858f404
--- /dev/null
+++ b/package/openrc/Config.in
@@ -0,0 +1,26 @@
+config BR2_PACKAGE_OPENRC
+ bool "openrc"
+ depends on BR2_USE_MMU # fork()
+ depends on !BR2_STATIC_LIBS
+ depends on BR2_INIT_OPENRC
+ select BR2_PACKAGE_NCURSES
+ help
+ Init that works on top of pid 1 (for example
+ openrc-init). By default it does quite a lot on startup
+ (like setting hwclock, mounting directories, configuring
+ interfaces and so on). So for this init to properly work you
+ need at least these tools on the root filesystem (default
+ busybox configuration provides them all):
+
+ swapon, fsck, hwclock, getty, login, grep, mount, coreutils,
+ procps, modprobe (kmod), net-tools
+
+ Number of tools may be decreased by removing services that
+ use them.
+
+ https://github.com/OpenRC/openrc
+
+comment "openrc needs a toolchain w/ dynamic library"
+ depends on BR2_USE_MMU
+ depends on BR2_INIT_OPENRC
+ depends on BR2_STATIC_LIBS
diff --git a/package/openrc/openrc.hash b/package/openrc/openrc.hash
new file mode 100644
index 0000000000..7d58e254c4
--- /dev/null
+++ b/package/openrc/openrc.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 c99488ca54f2b795328d07bbd456ade49b571136bba7501f7eaaeb1ca9f9ecc4 openrc-0.41.2.tar.gz
+sha256 96862463f4e77e2508e4fc2c83773fd24807cb699368b63fd93a5e2b466dd624 LICENSE
diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
new file mode 100644
index 0000000000..53f2947dcc
--- /dev/null
+++ b/package/openrc/openrc.mk
@@ -0,0 +1,45 @@
+################################################################################
+#
+# openrc
+#
+################################################################################
+
+OPENRC_VERSION = 0.41.2
+OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION))
+OPENRC_LICENSE = BSD-2-Clause
+OPENRC_LICENSE_FILES = LICENSE
+
+OPENRC_DEPENDENCIES = ncurses
+
+# set LIBNAME so openrc puts files in proper directories and sets proper
+# paths in installed files. Since in buildroot /lib64 and /lib32 always
+# points to /lib, it's safe to hardcode it to "lib"
+OPENRC_MAKE_OPTS = \
+ LIBNAME=lib \
+ LIBEXECDIR=/usr/libexec/rc \
+ MKPKGCONFIG=no \
+ MKSELINUX=no \
+ MKSYSVINIT=yes \
+ BRANDING="Buildroot $(BR2_VERSION_FULL)" \
+ CC=$(TARGET_CC)
+
+ifeq ($(BR2_SHARED_LIBS),y)
+OPENRC_MAKE_OPTS += MKSTATICLIBS=no
+else
+OPENRC_MAKE_OPTS += MKSTATICLIBS=yes
+endif
+
+define OPENRC_BUILD_CMDS
+ $(MAKE) $(OPENRC_MAKE_OPTS) -C $(@D)
+endef
+
+define OPENRC_INSTALL_TARGET_CMDS
+ $(MAKE) $(OPENRC_MAKE_OPTS) DESTDIR=$(TARGET_DIR) -C $(@D) install
+endef
+
+define OPENRC_REMOVE_UNNEEDED
+ $(RM) -r $(TARGET_DIR)/usr/share/openrc
+endef
+OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_REMOVE_UNNEEDED
+
+$(eval $(generic-package))
diff --git a/package/openzwave/0001-Fix-compilation-of-MinOZW.patch b/package/openzwave/0001-Fix-compilation-of-MinOZW.patch
deleted file mode 100644
index 773672e0ba..0000000000
--- a/package/openzwave/0001-Fix-compilation-of-MinOZW.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 599e2a11c6f48dde744012ec45686c08e15f3059 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fabrice.fontaine@orange.com>
-Date: Mon, 3 Oct 2016 10:35:52 +0200
-Subject: [PATCH] Fix compilation of MinOZW (#991)
-
-LIBDIR was used in cpp/examples/MinOZW/Makefile to add dynamic
-libraries. However, as it was unset by default, the cross-compilation
-could fail if the host had a library such as libnss3.so in /.
-To fix this issue, this patch sets LIBDIR to top_buildir if it is unset
-
-Fixes:
- http://autobuild.buildroot.net/results/68719fdf1320a69310bada6d3c47654dacdb5898
-
-Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
-[Upstream commit: https://github.com/OpenZWave/open-zwave/commit/599e2a11c6f48dde744012ec45686c08e15f3059]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- cpp/examples/MinOZW/Makefile | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/cpp/examples/MinOZW/Makefile b/cpp/examples/MinOZW/Makefile
-index e575632a3..95d684b77 100644
---- a/cpp/examples/MinOZW/Makefile
-+++ b/cpp/examples/MinOZW/Makefile
-@@ -17,9 +17,11 @@ DEBUG_LDFLAGS := -g
-
- top_srcdir := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../../)
-
-+#where is put the temporary library
-+LIBDIR ?= $(top_builddir)
-
- INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/tinyxml/ -I $(top_srcdir)/cpp/hidapi/hidapi/
--LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/*.so $(top_builddir)/*.dylib $(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib )
-+LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib )
- LIBSDIR = $(abspath $(dir $(firstword $(LIBS))))
- minozwsrc := $(notdir $(wildcard $(top_srcdir)/cpp/examples/MinOZW/*.cpp))
- VPATH := $(top_srcdir)/cpp/examples/MinOZW
diff --git a/package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch b/package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch
new file mode 100644
index 0000000000..51a06a20f1
--- /dev/null
+++ b/package/openzwave/0001-Fix-issue-1783-Most-Compilers-Get-it-Some-need-a-little-help.patch
@@ -0,0 +1,26 @@
+From 3b029a467e83bc7f0054e4dbba1e77e6eac7bc7f Mon Sep 17 00:00:00 2001
+From: Justin Hammond <Justin@dynam.ac>
+Date: Sat, 4 May 2019 02:58:15 +0800
+Subject: [PATCH] Fix issue #1783 - Most Compilers Get it, Some need a little
+ help
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved from
+https://github.com/OpenZWave/open-zwave/commit/3b029a467e83bc7f0054e4dbba1e77e6eac7bc7f]
+---
+ cpp/src/CompatOptionManager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cpp/src/CompatOptionManager.cpp b/cpp/src/CompatOptionManager.cpp
+index 90c87b54d..2d9ac435e 100644
+--- a/cpp/src/CompatOptionManager.cpp
++++ b/cpp/src/CompatOptionManager.cpp
+@@ -237,7 +237,7 @@ void CompatOptionManager::WriteXML
+ {
+ TiXmlElement* valElement = new TiXmlElement( it->first.c_str() );
+ char str[32];
+- TiXmlText * text;
++ TiXmlText * text = NULL;
+ // std::cout << "Name " << it->first << " Type: " << m_CompatVals[it->second].type << std::endl;
+ switch (m_CompatVals[it->second].type) {
+ case COMPAT_FLAG_TYPE_BOOL:
diff --git a/package/openzwave/0002-Fix-warning-on-wcsdup-implicit-declaration.patch b/package/openzwave/0002-Fix-warning-on-wcsdup-implicit-declaration.patch
deleted file mode 100644
index 1fe30e41d8..0000000000
--- a/package/openzwave/0002-Fix-warning-on-wcsdup-implicit-declaration.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0878d933223158343af3fe13e03bcd128e8b4cbc Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fabrice.fontaine@orange.com>
-Date: Fri, 22 Apr 2016 17:06:27 +0200
-Subject: [PATCH 1/1] Fix warning on wcsdup implicit declaration
-
-Define __GNU_SOURCE in cpp/hidapi/linux/hid.c (like already done in
-cpp/hidapi/libusb/hid.c) to fix implicit declaration of wcsdup function
-
-Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
----
- cpp/hidapi/linux/hid.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/cpp/hidapi/linux/hid.c b/cpp/hidapi/linux/hid.c
-index dbf9b9b..c3eb22b 100644
---- a/cpp/hidapi/linux/hid.c
-+++ b/cpp/hidapi/linux/hid.c
-@@ -21,6 +21,8 @@
- http://github.com/signal11/hidapi .
- ********************************************************/
-
-+#define _GNU_SOURCE /* needed for wcsdup() before glibc 2.10 */
-+
- /* C */
- #include <stdio.h>
- #include <string.h>
---
-1.9.1
-
diff --git a/package/openzwave/0002-update-spec-files.patch b/package/openzwave/0002-update-spec-files.patch
new file mode 100644
index 0000000000..0ba74ab108
--- /dev/null
+++ b/package/openzwave/0002-update-spec-files.patch
@@ -0,0 +1,445 @@
+From 601e5fb16232a7984885e67fdddaf5b9c9dd8105 Mon Sep 17 00:00:00 2001
+From: Justin Hammond <justin@dynam.ac>
+Date: Mon, 6 May 2019 17:05:17 +0800
+Subject: [PATCH] update spec files
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved from:
+https://github.com/OpenZWave/open-zwave/commit/601e5fb16232a7984885e67fdddaf5b9c9dd8105]
+---
+ cpp/build/Makefile | 22 ++-
+ cpp/build/support.mk | 7 +-
+ cpp/src/command_classes/DoorLockLogging.cpp | 4 +-
+ cpp/src/command_classes/UserCode.cpp | 4 +-
+ dist/libopenzwave.spec | 152 --------------------
+ dist/openzwave.spec.in | 145 +++++++++++++++++++
+ distfiles.mk | 2 +-
+ 7 files changed, 174 insertions(+), 162 deletions(-)
+ delete mode 100644 dist/libopenzwave.spec
+ create mode 100644 dist/openzwave.spec.in
+
+diff --git a/cpp/build/Makefile b/cpp/build/Makefile
+index bd9463c86..b404a87fd 100644
+--- a/cpp/build/Makefile
++++ b/cpp/build/Makefile
+@@ -84,7 +84,19 @@ endif
+ #where to put the temporary library
+ LIBDIR ?= $(top_builddir)
+
+-INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/tinyxml/
++INCLUDES := -I $(top_srcdir)/cpp/src
++
++
++ifeq ($(USE_BI_TXML), 1)
++INCLUDES += -I $(top_srcdir)/cpp/tinyxml/
++SOURCES_TXML =$(top_srcdir)/cpp/tinyxml/
++tinyxml := $(notdir $(wildcard $(top_srcdir)/cpp/tinyxml/*.cpp))
++else
++LIBS+= -ltinyxml
++endif
++
++
++
+
+
+ ifeq ($(USE_HID),1)
+@@ -105,12 +117,11 @@ LIBS += -ludev
+ endif
+ endif # USE_HID
+
+-SOURCES := $(top_srcdir)/cpp/src $(top_srcdir)/cpp/src/command_classes $(top_srcdir)/cpp/tinyxml \
++SOURCES := $(top_srcdir)/cpp/src $(top_srcdir)/cpp/src/command_classes $(SOURCES_TXML) \
+ $(top_srcdir)/cpp/src/value_classes $(top_srcdir)/cpp/src/platform $(top_srcdir)/cpp/src/platform/unix $(SOURCES_HIDAPI) $(top_srcdir)/cpp/src/aes/
+-VPATH = $(top_srcdir)/cpp/src:$(top_srcdir)/cpp/src/command_classes:$(top_srcdir)/cpp/tinyxml:\
++VPATH = $(top_srcdir)/cpp/src:$(top_srcdir)/cpp/src/command_classes:$(SOURCES_TXML):\
+ $(top_srcdir)/cpp/src/value_classes:$(top_srcdir)/cpp/src/platform:$(top_srcdir)/cpp/src/platform/unix:$(SOURCES_HIDAPI):$(top_srcdir)/cpp/src/aes/
+
+-tinyxml := $(notdir $(wildcard $(top_srcdir)/cpp/tinyxml/*.cpp))
+
+ ifeq ($(USE_HID),1)
+ ifeq ($(UNAME),Darwin)
+@@ -163,6 +174,9 @@ $(top_srcdir)/cpp/src/vers.cpp:
+ @echo 'uint16_t ozw_vers_minor = $(VERSION_MIN);' >> $(top_srcdir)/cpp/src/vers.cpp
+ @echo 'uint16_t ozw_vers_revision = $(VERSION_REV);' >> $(top_srcdir)/cpp/src/vers.cpp
+ @echo 'char ozw_version_string[] = "$(GITVERSION)";' >> $(top_srcdir)/cpp/src/vers.cpp
++ @$(SED) \
++ -e 's|[@]VERSION@|$(VERSION).$(VERSION_REV)|g' \
++ < "$(top_srcdir)/dist/openzwave.spec.in" > "$(top_srcdir)/dist/openzwave.spec"
+
+
+ #$(OBJDIR)/vers.o: $(top_builddir)/vers.cpp
+diff --git a/cpp/build/support.mk b/cpp/build/support.mk
+index 562a9b280..3ffd17e48 100644
+--- a/cpp/build/support.mk
++++ b/cpp/build/support.mk
+@@ -8,8 +8,11 @@ BUILD ?= release
+ #the prefix to install the library into
+ PREFIX ?= /usr/local
+
+-# build HID support by default
+-USE_HID ?= 1
++# dont build HID support by default
++USE_HID ?= 0
++
++# use builtin tinyXML by default
++USE_BI_TXML ?= 1
+
+ #the System we are building on
+ UNAME := $(shell uname -s)
+diff --git a/cpp/src/command_classes/DoorLockLogging.cpp b/cpp/src/command_classes/DoorLockLogging.cpp
+index a8d824cd5..f318b3e59 100644
+--- a/cpp/src/command_classes/DoorLockLogging.cpp
++++ b/cpp/src/command_classes/DoorLockLogging.cpp
+@@ -268,13 +268,13 @@ bool DoorLockLogging::HandleMsg
+ }
+ uint8 userid = (_data[10]);
+ uint8 usercodelength = (_data[11]);
+- char usercode[254], tmpusercode[254];
++ char usercode[254], tmpusercode[10];
+ snprintf(usercode, sizeof(usercode), "UserCode:");
+ if (usercodelength > 0)
+ for (int i = 0; i < usercodelength; i++ )
+ {
+ snprintf(tmpusercode, sizeof(tmpusercode), "%d", (int)_data[12+i]);
+- strncat(usercode, tmpusercode, sizeof(usercode) - strlen(usercode) - 1 );
++ strncat(usercode, tmpusercode, 10);
+ }
+
+ if (valid) {
+diff --git a/cpp/src/command_classes/UserCode.cpp b/cpp/src/command_classes/UserCode.cpp
+index a58091aca..dab006731 100644
+--- a/cpp/src/command_classes/UserCode.cpp
++++ b/cpp/src/command_classes/UserCode.cpp
+@@ -466,7 +466,9 @@ bool UserCode::HandleMsg
+ node->CreateValueString( ValueID::ValueGenre_User, GetCommandClassId(), _instance, i, str, "", false, false, data, 0 );
+ }
+ m_userCode[i].status = UserCode_Available;
+- memcpy(&m_userCode[i].usercode, 0, 10);
++ /* silly compilers */
++ for (int j = 0; j < 10; j++)
++ m_userCode[i].usercode[i] = 0;
+ }
+ if (m_com.GetFlagBool(COMPAT_FLAG_UC_EXPOSERAWVALUE)) {
+ node->CreateValueRaw( ValueID::ValueGenre_User, GetCommandClassId(), _instance, UserCodeIndex_RawValue, "Raw UserCode", "", false, false, 0, 0, 0);
+diff --git a/dist/libopenzwave.spec b/dist/libopenzwave.spec
+deleted file mode 100644
+index 3f29473dd..000000000
+--- a/dist/libopenzwave.spec
++++ /dev/null
+@@ -1,152 +0,0 @@
+-Name: libopenzwave
+-%if 0%{?fedora} > 0
+-Group: Development/Libraries
+-%else
+-Group: Productivity/Networking/Other
+-%endif
+-Summary: Library to access Z-Wave interfaces
+-URL:http://code.google.com/p/open-zwave/
+-%if 0%{?suse_version} > 0
+-License: LGPL-2.0+
+-%else
+-License: LGPLv2+
+-%endif
+-Version: 1.6.0
+-Release: 1
+-BuildRequires: gcc-c++ make libudev-devel doxygen graphviz
+-%if 0%{?fedora} >= 18
+-BuildRequires: systemd-devel pkgconfig
+-%else
+-%if 0%{?suse_version} >= 1220
+-BuildRequires: systemd-devel pkg-config
+-%else
+-BuildRequires: libudev-devel pkgconfig
+-%endif
+-%endif
+-Source0: open-zwave-%{version}.tar.gz
+-
+-
+-BuildRoot: %{_tmppath}/libopenzwave-root
+-
+-%description
+-OpenZWave is an open-source, cross-platform library designed to enable anyone to
+-add support for Z-Wave home-automation devices to their applications, without
+-requiring any in depth knowledge of the Z-Wave protocol.
+-
+-Z-Wave employs a proprietary protocol which the owners, Sigma Designs, have
+-chosen not to release into the public domain. There is also no official free
+-or low-cost SDK that can be used to develop applications (The ControlThink SDK
+-is now tied exclusively to their own Z-Wave PC interface). The only way to
+-obtain the protocol documentation and sample code is to purchase an expensive
+-development kit, and sign a non-disclosure agreement (NDA) preventing the
+-release of that knowledge.
+-
+-OpenZWave was created to fill that gap. We do not have the official
+-documentation, have signed no NDA, and are free to develop the library as we
+-see fit. Our knowledge comes from existing bodies of open-source code
+-(principally the Z-Wave parts of LinuxMCE), and through examining the
+-messages sent by Z-Wave devices.
+-
+-The goal of the project is to make a positive contribution to the Z-Wave
+-community by creating a library that supports as much of the Z-Wave
+-specification as possible, and that can be used as a "black-box" solution
+-by anyone wanting to add Z-Wave to their application. It is NOT our aim
+-to publish alternative documentation of the Z-Wave protocol, or to
+-attempt to "punish" Sigma Designs for their decision to keep the
+-protocol closed.
+-
+-%package -n libopenzwave-devel
+-Summary: Open-ZWave header files
+-%if 0%{?fedora} > 0
+-Group: Development/Libraries
+-%else
+-Group: Development/Libraries/C and C++
+-%endif
+-Requires: %{name} = %{version}-%{release}
+-
+-%description -n libopenzwave-devel
+-header files needed when you want to compile your own
+-applications using openzwave
+-
+-%package -n openzwave
+-Summary: Open-ZWave Sample Executables
+-%if 0%{?fedora} > 0
+-Group: Development/Libraries
+-%else
+-Group: Development/Libraries/C and C++
+-%endif
+-Requires: %{name} = %{version}-%{release}
+-
+-%description -n openzwave
+-Sample Executables for OpenZWave
+-
+-%prep
+-
+-%setup -q -n open-zwave-%{version}
+-
+-
+-
+-
+-%build
+-major_ver=$(echo %{version} | awk -F \. {'print $1'})
+-minor_ver=$(echo %{version} | awk -F \. {'print $2'})
+-revision=$(echo %{version} | awk -F \. {'print $3'})
+-CPPFLAGS=-g VERSION_MAJ=$major_ver VERSION_MIN=$minor_ver VERSION_REV=$revision PREFIX=/usr sysconfdir=%{_sysconfdir}/openzwave/ includedir=%{_includedir} docdir=%{_defaultdocdir}/openzwave-%{version} instlibdir=%{_libdir} make %{?_smp_mflags}
+-
+-%install
+-rm -rf %{buildroot}/*
+-major_ver=$(echo %{version} | awk -F \. {'print $1'})
+-minor_ver=$(echo %{version} | awk -F \. {'print $2'})
+-revision=$(echo %{version} | awk -F \. {'print $3'})
+-mkdir -p %{buildroot}/%{_bindir}
+-mkdir -p %{buildroot}/%{_libdir}
+-mkdir -p %{buildroot}/%{_defaultdocdir}/openzwave-%{version}/
+-mkdir -p %{buildroot}/%{_sysconfdir}/
+-mkdir -p %{buildroot}/%{_includedir}/openzwave/
+-DESTDIR=%{buildroot} VERSION_MAJ=$major_ver VERSION_MIN=$minor_ver VERSION_REV=$revision PREFIX=/usr sysconfdir=%{_sysconfdir}/openzwave/ includedir=%{_includedir}/openzwave/ docdir=%{_defaultdocdir}/openzwave-%{version} instlibdir=%{_libdir} make install
+-cp -p INSTALL %{buildroot}/%{_defaultdocdir}/openzwave-%{version}/
+-cp -pr license %{buildroot}/%{_defaultdocdir}/openzwave-%{version}/
+-rm %{buildroot}%{_defaultdocdir}/openzwave-%{version}/Doxyfile.in
+-rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/html/
+-
+-%files
+-%defattr(-,root,root,-)
+-%{_libdir}/libopenzwave.so.*
+-%dir %{_defaultdocdir}/openzwave-%{version}
+-%doc %{_defaultdocdir}/openzwave-%{version}/default.htm
+-%doc %{_defaultdocdir}/openzwave-%{version}/general/
+-%doc %{_defaultdocdir}/openzwave-%{version}/images+css/
+-%doc %{_defaultdocdir}/openzwave-%{version}/license/
+-%doc %{_defaultdocdir}/openzwave-%{version}/INSTALL
+-%config(noreplace) %{_sysconfdir}/openzwave/
+-
+-
+-
+-%files -n libopenzwave-devel
+-%defattr(-,root,root,-)
+-%{_bindir}/ozw_config
+-%{_includedir}/openzwave/
+-%{_libdir}/libopenzwave.so
+-%{_libdir}/pkgconfig/libopenzwave.pc
+-%dir %{_defaultdocdir}/openzwave-%{version}
+-%doc %{_defaultdocdir}/openzwave-%{version}/api/
+-
+-
+-%files -n openzwave
+-%defattr(-,root,root,-)
+-%{_bindir}/MinOZW
+-
+-
+-%post
+-/sbin/ldconfig
+-
+-%post -n libopenzwave-devel
+-/sbin/ldconfig
+-
+-%postun
+-/sbin/ldconfig
+-
+-%changelog
+-* Tue Feb 04 2014 Justin Hammond+justin@dynam.ac - 1.0.730-1
+-- Initial Release
+-
+diff --git a/dist/openzwave.spec.in b/dist/openzwave.spec.in
+new file mode 100644
+index 000000000..4d7d22151
+--- /dev/null
++++ b/dist/openzwave.spec.in
+@@ -0,0 +1,145 @@
++Name: openzwave
++Version: @VERSION@
++Release: 1.0%{?dist}
++Summary: Sample Executables for OpenZWave
++URL: http://www.openzwave.net
++License: LGPLv3+
++Source0: http://old.openzwave.com/downloads/openzwave-%{version}.tar.gz
++
++# Use system tinyxml
++#Patch1: openzwave-tinyxml.patch
++# Use system hidapi
++#Patch2: openzwave-hidapi.patch
++# Fix FTBFS
++#Patch3: openzwave-1.5.0-format.patch
++
++BuildRequires: gcc-c++
++BuildRequires: doxygen
++BuildRequires: graphviz
++BuildRequires: hidapi-devel
++BuildRequires: systemd-devel
++BuildRequires: tinyxml-devel
++
++
++%description
++OpenZWave is an open-source, cross-platform library designed to enable anyone to
++add support for Z-Wave home-automation devices to their applications, without
++requiring any in depth knowledge of the Z-Wave protocol.
++
++
++%package -n libopenzwave
++Summary: Library to access Z-Wave interfaces
++
++
++%description -n libopenzwave
++OpenZWave is an open-source, cross-platform library designed to enable anyone to
++add support for Z-Wave home-automation devices to their applications, without
++requiring any in depth knowledge of the Z-Wave protocol.
++
++
++%package -n libopenzwave-devel
++Summary: Open-ZWave header files
++Requires: libopenzwave%{?_isa} = %{version}-%{release}
++
++
++%description -n libopenzwave-devel
++Header files needed when you want to compile your own
++applications using openzwave
++
++
++%package -n libopenzwave-devel-doc
++Summary: Open-ZWave API documentation files
++Requires: libopenzwave-devel%{?_isa} = %{version}-%{release}
++
++
++%description -n libopenzwave-devel-doc
++API documentation files needed when you want to compile your own
++applications using openzwave
++
++
++%prep
++%setup -q -n openzwave-%{version}
++#%patch1 -p1 -b.tinyxml
++#%patch2 -p1 -b.hidapi
++#%patch3 -p1 -b.format
++
++
++%build
++major_ver=$(echo %{version} | awk -F \. {'print $1'})
++minor_ver=$(echo %{version} | awk -F \. {'print $2'})
++revision=$(echo %{version} | awk -F \. {'print $3'})
++CPPFLAGS="%{optflags} -Wformat -DOPENZWAVE_ENABLE_EXCEPTIONS" LDFLAGS="%{__global_ldflags}" VERSION_MAJ=$major_ver VERSION_MIN=$minor_ver VERSION_REV=$revision PREFIX=/usr sysconfdir=%{_sysconfdir}/openzwave/ includedir=%{_includedir} docdir=%{_defaultdocdir}/openzwave-%{version} instlibdir=%{_libdir} make %{?_smp_mflags}
++
++
++%install
++rm -rf %{buildroot}/*
++major_ver=$(echo %{version} | awk -F \. {'print $1'})
++minor_ver=$(echo %{version} | awk -F \. {'print $2'})
++revision=$(echo %{version} | awk -F \. {'print $3'})
++mkdir -p %{buildroot}/%{_bindir}
++mkdir -p %{buildroot}/%{_libdir}
++mkdir -p %{buildroot}/%{_defaultdocdir}/openzwave-%{version}/
++mkdir -p %{buildroot}/%{_sysconfdir}/
++mkdir -p %{buildroot}/%{_includedir}/openzwave/
++DESTDIR=%{buildroot} VERSION_MAJ=$major_ver VERSION_MIN=$minor_ver VERSION_REV=$revision PREFIX=/usr sysconfdir=%{_sysconfdir}/openzwave/ includedir=%{_includedir}/openzwave/ docdir=%{_defaultdocdir}/openzwave-%{version} instlibdir=%{_libdir} make install
++rm %{buildroot}%{_defaultdocdir}/openzwave-%{version}/Doxyfile.in
++rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/html/
++rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/default.htm
++rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/general/
++rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/images+css/
++rm -rf %{buildroot}%{_defaultdocdir}/openzwave-%{version}/api/
++
++
++%files
++%{_bindir}/MinOZW
++
++
++%files -n libopenzwave
++%license license/*.txt
++%doc docs/default.htm docs/general/ docs/images+css/
++%{_libdir}/libopenzwave.so.*
++%dir %{_sysconfdir}/openzwave/
++%config(noreplace) %{_sysconfdir}/openzwave/*
++
++
++%files -n libopenzwave-devel
++%{_bindir}/ozw_config
++%{_includedir}/openzwave/
++%{_libdir}/libopenzwave.so
++%{_libdir}/pkgconfig/libopenzwave.pc
++
++
++%files -n libopenzwave-devel-doc
++%doc docs/api/
++
++
++%ldconfig_scriptlets -n libopenzwave
++
++
++%changelog
++* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-0.20180624git1e36dcc.0
++- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
++
++* Wed Jul 18 2018 Michael Cronenworth <mike@cchtml.com> - 1.5.0-0.20180623git1e36dcc.0
++- Update to 20180623 git checkout to fix FTBFS
++- Drop patches that revert BARRIER_OPERATOR support and use newer version
++
++* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-0.20171212gitc3b0e31.0
++- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
++
++* Mon Feb 26 2018 Michael Cronenworth <mike@cchtml.com> - 1.5.0-0.20171211gitc3b0e31.0
++- Update to 20171211 git checkout
++- Revert new BARRIER_OPERATOR support and use older version
++
++* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-0.20170725gitde1c0e6
++- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
++
++* Mon Jul 31 2017 Michael Cronenworth <mike@cchtml.com> - 1.5.0-0.20170724gitde1c0e6
++- Update to a git checkout, execeptions patch is upstream
++- Fixes crashing issues with domoticz
++
++* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.164-2
++- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
++
++* Wed Jul 12 2017 Michael Cronenworth <mike@cchtml.com> - 1.4.164-1
++- Initial spec
+diff --git a/distfiles.mk b/distfiles.mk
+index e68082967..9cf436a6f 100644
+--- a/distfiles.mk
++++ b/distfiles.mk
+@@ -1273,7 +1273,7 @@ DISTFILES = .gitignore \
+ debian/watch \
+ dist.mk \
+ dist/libopenzwave.changes \
+- dist/libopenzwave.spec \
++ dist/openzwave.spec \
+ distfiles.mk \
+ docs/Doxyfile.in \
+ docs/default.htm \
diff --git a/package/openzwave/0003-Ensure-correct-git-repository-path.patch b/package/openzwave/0003-Ensure-correct-git-repository-path.patch
deleted file mode 100644
index 6c40ec9d0f..0000000000
--- a/package/openzwave/0003-Ensure-correct-git-repository-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 89cdc83307f61422db21cc7965ea294862c128bf Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fabrice.fontaine@orange.com>
-Date: Mon, 30 May 2016 10:37:42 +0200
-Subject: [PATCH 2/2] Ensure correct git repository path
-
-Add "--git-dir ./.git" to ensure the correct git repository path is used (this
-fix a bug when trying to add openzwave to buildroot build system)
-
-Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
----
- cpp/build/support.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cpp/build/support.mk b/cpp/build/support.mk
-index 3f74c7e..f529b25 100644
---- a/cpp/build/support.mk
-+++ b/cpp/build/support.mk
-@@ -29,7 +29,7 @@ GIT := $(shell which git)
- ifeq ($(GIT),)
- VERSION_REV ?= 0
- else
--GITVERSION := $(shell $(GIT) describe --long --tags --dirty 2>/dev/null | sed s/^v//)
-+GITVERSION := $(shell $(GIT) --git-dir ./.git describe --long --tags --dirty 2>/dev/null | sed s/^v//)
- ifeq ($(GITVERSION),)
- GITVERSION := $(VERSION_MAJ).$(VERSION_MIN).-1
- VERSION_REV := 0
---
-2.7.4
-
diff --git a/package/openzwave/0004-Fix-compilation-error-in-regards-to-Werror-restrict.patch b/package/openzwave/0004-Fix-compilation-error-in-regards-to-Werror-restrict.patch
deleted file mode 100644
index b3dbd8f88e..0000000000
--- a/package/openzwave/0004-Fix-compilation-error-in-regards-to-Werror-restrict.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 14164e9920ce3482747483fc16654c82d3ce445f Mon Sep 17 00:00:00 2001
-From: pipiche38 <pipiche38@users.noreply.github.com>
-Date: Fri, 8 Jun 2018 15:13:39 +0200
-Subject: [PATCH] Fix compilation error in regards to -Werror=restrict
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-/usr/share/domoticz/open-zwave/cpp/src/command_classes/DoorLockLogging.cpp: In member function �virtual bool OpenZWave::DoorLockLogging::HandleMsg(const uint8*, uint32, uint32)�:
-/usr/share/domoticz/open-zwave/cpp/src/command_classes/DoorLockLogging.cpp:312:15: error: passing argument 1 to restrict-qualified parameter aliases with argument 4 [-Werror=restrict]
- snprintf(usercode, sizeof(usercode), "%s %d", usercode, (int)_data[12+i]);
- ^~~~~~~~ ~~~~~~~~
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://github.com/OpenZWave/open-zwave/commit/14164e9920ce3482747483fc16654c82d3ce445f]
----
- cpp/src/command_classes/DoorLockLogging.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/cpp/src/command_classes/DoorLockLogging.cpp b/cpp/src/command_classes/DoorLockLogging.cpp
-index c235a8497..418f61b7d 100644
---- a/cpp/src/command_classes/DoorLockLogging.cpp
-+++ b/cpp/src/command_classes/DoorLockLogging.cpp
-@@ -304,12 +304,13 @@ bool DoorLockLogging::HandleMsg
- }
- uint8 userid = (_data[10]);
- uint8 usercodelength = (_data[11]);
-- char usercode[254];
-+ char usercode[254], tmpusercode[254];
- snprintf(usercode, sizeof(usercode), "UserCode:");
- if (usercodelength > 0)
- for (int i = 0; i < usercodelength; i++ )
- {
-- snprintf(usercode, sizeof(usercode), "%s %d", usercode, (int)_data[12+i]);
-+ strncpy(tmpusercode, usercode, sizeof(tmpusercode));
-+ snprintf(usercode, sizeof(usercode), "%s %d", tmpusercode, (int)_data[12+i]);
- }
-
- if (valid) {
diff --git a/package/openzwave/Config.in b/package/openzwave/Config.in
index 86f45dc7b6..d86d358723 100644
--- a/package/openzwave/Config.in
+++ b/package/openzwave/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_OPENZWAVE
bool "openzwave"
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_PACKAGE_HAS_UDEV
depends on BR2_USE_WCHAR
+ select BR2_PACKAGE_TINYXML
help
Free software library that interfaces with selected Z-Wave
PC controllers, allowing anyone to create applications that
@@ -12,6 +12,6 @@ config BR2_PACKAGE_OPENZWAVE
http://www.openzwave.net
-comment "openzwave needs udev and a toolchain w/ C++, threads, wchar"
+comment "openzwave needs a toolchain w/ C++, threads, wchar"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
- !BR2_PACKAGE_HAS_UDEV || !BR2_USE_WCHAR
+ !BR2_USE_WCHAR
diff --git a/package/openzwave/openzwave.hash b/package/openzwave/openzwave.hash
index f3a677bd47..154a6443c0 100644
--- a/package/openzwave/openzwave.hash
+++ b/package/openzwave/openzwave.hash
@@ -1,5 +1,5 @@
# Locally computed:
-sha256 abfb4c7e7728e86ba374c2e0ef7de912594eb24a8c44935457352df844530238 openzwave-V1.5.tar.gz
+sha256 3b11dffa7608359c8c848451863e0287e17f5f101aeee7c2e89b7dc16f87050b openzwave-v1.6.tar.gz
sha256 c8db08727d03bea1213cdb29459b4b489b0d68a0866765df40ff205c6cd7224b license/license.txt
sha256 4da452226e9064b597020ad404e1c78d8175bc31ad7c1908485a92c0a4d70284 license/lgpl.txt
sha256 33ffdead480674d5f33e2934822a3b93c93e3f8c894667a3bf30bd1195b38f83 license/gpl.txt
diff --git a/package/openzwave/openzwave.mk b/package/openzwave/openzwave.mk
index 38515e3899..3f9e177198 100644
--- a/package/openzwave/openzwave.mk
+++ b/package/openzwave/openzwave.mk
@@ -4,13 +4,13 @@
#
################################################################################
-OPENZWAVE_VERSION = V1.5
+OPENZWAVE_VERSION = v1.6
OPENZWAVE_SITE = $(call github,OpenZWave,open-zwave,$(OPENZWAVE_VERSION))
OPENZWAVE_LICENSE = LGPL-3.0+, GPL-3.0 (examples), Apache-2.0 (sh2ju.sh)
OPENZWAVE_LICENSE_FILES = license/license.txt license/lgpl.txt \
license/gpl.txt license/Apache-License-2.0.txt
+OPENZWAVE_DEPENDENCIES = tinyxml
-OPENZWAVE_DEPENDENCIES = host-pkgconf udev
OPENZWAVE_INSTALL_STAGING = YES
# Set instlibdir to install libopenzwave.so* in the correct directory
@@ -29,7 +29,15 @@ OPENZWAVE_MAKE_OPTS = \
instlibdir=/usr/lib \
pkgconfigdir=/usr/lib/pkgconfig \
sysconfdir=/etc/openzwave \
- DOXYGEN=
+ DOXYGEN= \
+ USE_BI_TXML=0
+
+ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
+OPENZWAVE_DEPENDENCIES += host-pkgconf udev
+OPENZWAVE_MAKE_OPTS += USE_HID=1
+else
+OPENZWAVE_MAKE_OPTS += USE_HID=0
+endif
define OPENZWAVE_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(OPENZWAVE_MAKE_OPTS) -C $(@D)
diff --git a/package/oprofile/0002-oparchive-replace-basename-with-op_basename.patch b/package/oprofile/0002-oparchive-replace-basename-with-op_basename.patch
deleted file mode 100644
index a2b580dad7..0000000000
--- a/package/oprofile/0002-oparchive-replace-basename-with-op_basename.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5da92e18a538c630cb06a3dbb2affd9bfc128901 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Tue, 5 Jun 2018 13:31:34 +0200
-Subject: [PATCH] oparchive: replace basename with op_basename
-
-Use op_basename instead of basename in oparchive function.
-This seems to be the intended use as there is no include on libgen.h for
-the standard basename and the argument is a const char* instead of a
-char*.
-
-Fixes:
- - http://autobuild.buildroot.net/results/06fbff267063e09f7bc06adb08c896f861ecdb1d
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- pp/oparchive.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pp/oparchive.cpp b/pp/oparchive.cpp
-index 6221e148..274152ba 100644
---- a/pp/oparchive.cpp
-+++ b/pp/oparchive.cpp
-@@ -261,7 +261,7 @@ int oparchive(options::spec const & spec)
- /* determine the session name of sample file */
- int offset = sample_name.find('{');
- string base_samples_dir = sample_name.substr(0, offset-1);
-- string session = basename(base_samples_dir.c_str());
-+ string session = op_basename(base_samples_dir.c_str());
- /* Get rid of the the archive_path from the name */
- string sample_base = sample_name.substr(offset);
- string sample_archive_file = dest_samples_dir + "/" + session + "/" + sample_base;
---
-2.14.1
-
diff --git a/package/oprofile/oprofile.hash b/package/oprofile/oprofile.hash
index 737137e0dd..d1d96c6232 100644
--- a/package/oprofile/oprofile.hash
+++ b/package/oprofile/oprofile.hash
@@ -1,6 +1,6 @@
-# From http://sourceforge.net/projects/oprofile/files/oprofile/oprofile-1.2.0/
-sha1 7bf28b74953bd042ff23dc53c399be96d37f144c oprofile-1.2.0.tar.gz
-md5 4fcd3920984dcb607314b2e225086c3a oprofile-1.2.0.tar.gz
+# From http://sourceforge.net/projects/oprofile/files/oprofile/oprofile-1.3.0/
+sha1 7daa0cca8587e399cb3df9eb817c6a39ffea2082 oprofile-1.3.0.tar.gz
+md5 bd998df5521ebedae31e71cd3fb6200b oprofile-1.3.0.tar.gz
# Hash for license file:
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index 2b82194406..cc41e5c6da 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPROFILE_VERSION = 1.2.0
+OPROFILE_VERSION = 1.3.0
OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION)
OPROFILE_LICENSE = GPL-2.0+
OPROFILE_LICENSE_FILES = COPYING
diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash
index c3c41b69da..eb4004ba6d 100644
--- a/package/optee-benchmark/optee-benchmark.hash
+++ b/package/optee-benchmark/optee-benchmark.hash
@@ -1,2 +1,4 @@
-# From https://github.com/linaro-swg/optee_benchmark/archive/3.4.0.tar.gz
-sha256 e5e868a06a9dcc8cc444b3e72c65f57670b0811091be62edbe0d03d13c75e716 optee-benchmark-3.4.0.tar.gz
+# From https://github.com/linaro-swg/optee_benchmark/archive/3.5.0.tar.gz
+sha256 678fd4d3f65d7e18952f4505a1caad6c7ebfef67458a2e92fb51f8c098e7f439 optee-benchmark-3.5.0.tar.gz
+# Locally computed
+sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE
diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk
index 4ebab4498e..5f6fac4a05 100644
--- a/package/optee-benchmark/optee-benchmark.mk
+++ b/package/optee-benchmark/optee-benchmark.mk
@@ -4,9 +4,10 @@
#
################################################################################
-OPTEE_BENCHMARK_VERSION = 3.4.0
+OPTEE_BENCHMARK_VERSION = 3.5.0
OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION))
OPTEE_BENCHMARK_LICENSE = BSD-2-Clause
+OPTEE_BENCHMARK_LICENSE_FILES = LICENSE
OPTEE_BENCHMARK_DEPENDENCIES = optee-client libyaml
diff --git a/package/optee-client/0001-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch b/package/optee-client/0001-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch
deleted file mode 100644
index b62357f52b..0000000000
--- a/package/optee-client/0001-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From e2d82d46b33b693305978dfe64d84148314aef46 Mon Sep 17 00:00:00 2001
-From: Etienne Carriere <etienne.carriere@linaro.org>
-Date: Wed, 6 Mar 2019 11:46:07 +0100
-Subject: [PATCH] cmake: support BUILD_STATIC_LIBS/BUILD_SHARED_LIBS
-
-CMake variables BUILD_STATIC_LIBS and BUILD_SHARED_LIBS
-set constraints on libraries and executable linkage.
-
-With this change OP-TEE client CMake script builds and installs the
-embedded files with the expected linkage configuration.
-
-Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
-Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
----
- libteec/CMakeLists.txt | 5 +++--
- tee-supplicant/CMakeLists.txt | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/libteec/CMakeLists.txt b/libteec/CMakeLists.txt
-index 3ec8f66..e3495fb 100644
---- a/libteec/CMakeLists.txt
-+++ b/libteec/CMakeLists.txt
-@@ -33,7 +33,7 @@ endif()
- ################################################################################
- # Built library
- ################################################################################
--add_library (teec SHARED ${SRC})
-+add_library (teec ${SRC})
-
- set_target_properties (teec PROPERTIES
- VERSION ${PROJECT_VERSION}
-@@ -71,4 +71,5 @@ target_link_libraries (teec
- ################################################################################
- # FIXME: This should in someway harmonize with CFG_TEE_CLIENT_LOAD_PATH
- # FIXME: Should we change this to /usr/local/lib?
--install (TARGETS teec DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install (TARGETS teec LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-diff --git a/tee-supplicant/CMakeLists.txt b/tee-supplicant/CMakeLists.txt
-index d2d3afd..e663be9 100644
---- a/tee-supplicant/CMakeLists.txt
-+++ b/tee-supplicant/CMakeLists.txt
-@@ -85,4 +85,4 @@ target_link_libraries (${PROJECT_NAME}
- ################################################################################
- # Install targets
- ################################################################################
--install (TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_SBINDIR})
-+install (TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
---
-2.17.1
-
diff --git a/package/optee-client/0002-libteec-fix-build-warnings.patch b/package/optee-client/0002-libteec-fix-build-warnings.patch
deleted file mode 100644
index e76b718e57..0000000000
--- a/package/optee-client/0002-libteec-fix-build-warnings.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 076522d57a1de87008762ad5cf8bfb0f5e40bb6a Mon Sep 17 00:00:00 2001
-From: Etienne Carriere <etienne.carriere@linaro.org>
-Date: Wed, 20 Mar 2019 10:01:23 +0100
-Subject: [PATCH] libteec: fix build warnings
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix build warnings reported by the Buildroot team [1]:
-
-/home/thomas/projets/outputs/armv5-ctng-linux-gnueabi/build/optee-client-3.4.0/libteec/src/tee_client_api.c: In function 'TEEC_InitializeContext':
-/home/thomas/projets/outputs/armv5-ctng-linux-gnueabi/build/optee-client-3.4.0/libteec/src/tee_client_api.c:149:28: error: 'gen_caps' may be used uninitialized in this function [-Werror=maybe-uninitialized]
- ctx->reg_mem = gen_caps & TEE_GEN_CAP_REG_MEM;
- ^
-/home/thomas/projets/buildroot/output/build/optee-client-3.4.0/libteec/src/tee_client_api.c: In function ‘TEEC_OpenSession’:
-/home/thomas/projets/buildroot/output/build/optee-client-3.4.0/libteec/src/tee_client_api.c:507:8: error: cast increases required alignment of target type [-Werror=cast-align]
- arg = (struct tee_ioctl_open_session_arg *)buf;
- ^
-/home/thomas/projets/buildroot/output/build/optee-client-3.4.0/libteec/src/tee_client_api.c: In function ‘TEEC_InvokeCommand’:
-/home/thomas/projets/buildroot/output/build/optee-client-3.4.0/libteec/src/tee_client_api.c:581:8: error: cast increases required alignment of target type [-Werror=cast-align]
- arg = (struct tee_ioctl_invoke_arg *)buf;
- ^
-
-[1] http://lists.busybox.net/pipermail/buildroot/2019-February/243437.html
-
-Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
-Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (HiKey960 32, 64)
-Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
-Upstream: https://github.com/OP-TEE/optee_client/commit/9dbc61b3767ab1c3dfd0a19af02926b92ae09247
----
- libteec/src/tee_client_api.c | 34 +++++++++++++++++++++-------------
- 1 file changed, 21 insertions(+), 13 deletions(-)
-
-diff --git a/libteec/src/tee_client_api.c b/libteec/src/tee_client_api.c
-index 698092b..cf0b1f7 100644
---- a/libteec/src/tee_client_api.c
-+++ b/libteec/src/tee_client_api.c
-@@ -140,7 +140,7 @@ TEEC_Result TEEC_InitializeContext(const char *name, TEEC_Context *ctx)
- return TEEC_ERROR_BAD_PARAMETERS;
-
- for (n = 0; n < TEEC_MAX_DEV_SEQ; n++) {
-- uint32_t gen_caps;
-+ uint32_t gen_caps = 0;
-
- snprintf(devname, sizeof(devname), "/dev/tee%zu", n);
- fd = teec_open_dev(devname, name, &gen_caps);
-@@ -481,10 +481,12 @@ TEEC_Result TEEC_OpenSession(TEEC_Context *ctx, TEEC_Session *session,
- uint32_t connection_method, const void *connection_data,
- TEEC_Operation *operation, uint32_t *ret_origin)
- {
-- uint64_t buf[(sizeof(struct tee_ioctl_open_session_arg) +
-- TEEC_CONFIG_PAYLOAD_REF_COUNT *
-- sizeof(struct tee_ioctl_param)) /
-- sizeof(uint64_t)] = { 0 };
-+ size_t p_sz = TEEC_CONFIG_PAYLOAD_REF_COUNT *
-+ sizeof(struct tee_ioctl_param);
-+ union {
-+ struct tee_ioctl_open_session_arg arg;
-+ uint8_t data[sizeof(struct tee_ioctl_open_session_arg) + p_sz];
-+ } buf;
- struct tee_ioctl_buf_data buf_data;
- struct tee_ioctl_open_session_arg *arg;
- struct tee_ioctl_param *params;
-@@ -493,6 +495,8 @@ TEEC_Result TEEC_OpenSession(TEEC_Context *ctx, TEEC_Session *session,
- TEEC_SharedMemory shm[TEEC_CONFIG_PAYLOAD_REF_COUNT];
- int rc;
-
-+ memset(&buf, 0, sizeof(buf));
-+
- (void)&connection_data;
-
- if (!ctx || !session) {
-@@ -501,10 +505,10 @@ TEEC_Result TEEC_OpenSession(TEEC_Context *ctx, TEEC_Session *session,
- goto out;
- }
-
-- buf_data.buf_ptr = (uintptr_t)buf;
-+ buf_data.buf_ptr = (uintptr_t)&buf;
- buf_data.buf_len = sizeof(buf);
-
-- arg = (struct tee_ioctl_open_session_arg *)buf;
-+ arg = &buf.arg;
- arg->num_params = TEEC_CONFIG_PAYLOAD_REF_COUNT;
- params = (struct tee_ioctl_param *)(arg + 1);
-
-@@ -555,10 +559,12 @@ void TEEC_CloseSession(TEEC_Session *session)
- TEEC_Result TEEC_InvokeCommand(TEEC_Session *session, uint32_t cmd_id,
- TEEC_Operation *operation, uint32_t *error_origin)
- {
-- uint64_t buf[(sizeof(struct tee_ioctl_invoke_arg) +
-- TEEC_CONFIG_PAYLOAD_REF_COUNT *
-- sizeof(struct tee_ioctl_param)) /
-- sizeof(uint64_t)] = { 0 };
-+ size_t p_sz = TEEC_CONFIG_PAYLOAD_REF_COUNT *
-+ sizeof(struct tee_ioctl_param);
-+ union {
-+ struct tee_ioctl_invoke_arg arg;
-+ uint8_t data[sizeof(struct tee_ioctl_invoke_arg) + p_sz];
-+ } buf;
- struct tee_ioctl_buf_data buf_data;
- struct tee_ioctl_invoke_arg *arg;
- struct tee_ioctl_param *params;
-@@ -567,6 +573,8 @@ TEEC_Result TEEC_InvokeCommand(TEEC_Session *session, uint32_t cmd_id,
- TEEC_SharedMemory shm[TEEC_CONFIG_PAYLOAD_REF_COUNT];
- int rc;
-
-+ memset(&buf, 0, sizeof(buf));
-+
- if (!session) {
- eorig = TEEC_ORIGIN_API;
- res = TEEC_ERROR_BAD_PARAMETERS;
-@@ -575,10 +583,10 @@ TEEC_Result TEEC_InvokeCommand(TEEC_Session *session, uint32_t cmd_id,
-
- bm_timestamp();
-
-- buf_data.buf_ptr = (uintptr_t)buf;
-+ buf_data.buf_ptr = (uintptr_t)&buf;
- buf_data.buf_len = sizeof(buf);
-
-- arg = (struct tee_ioctl_invoke_arg *)buf;
-+ arg = &buf.arg;
- arg->num_params = TEEC_CONFIG_PAYLOAD_REF_COUNT;
- params = (struct tee_ioctl_param *)(arg + 1);
-
---
-2.17.1
-
diff --git a/package/optee-client/0003-libteec-fix-clang-build-errors.patch b/package/optee-client/0003-libteec-fix-clang-build-errors.patch
deleted file mode 100644
index 1c845a1e2c..0000000000
--- a/package/optee-client/0003-libteec-fix-clang-build-errors.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From d6f79741803dd31b34960dbc59999eb2482df9c1 Mon Sep 17 00:00:00 2001
-From: Victor Chong <victor.chong@linaro.org>
-Date: Fri, 22 Mar 2019 06:37:13 +0000
-Subject: [PATCH] libteec: fix clang build errors
-
-external/optee_client/libteec/src/tee_client_api.c:488:11: error: fields must have a constant size: 'variable length array in structure' extension will never be supported
- uint8_t data[sizeof(struct tee_ioctl_open_session_arg) + p_sz];
- ^
-external/optee_client/libteec/src/tee_client_api.c:566:11: error: fields must have a constant size: 'variable length array in structure' extension will never be supported
- uint8_t data[sizeof(struct tee_ioctl_invoke_arg) + p_sz];
- ^
-
-Fixes: 9dbc61b3 ("libteec: fix build warnings")
-Fixes: https://github.com/OP-TEE/optee_client/issues/152
-
-Signed-off-by: Victor Chong <victor.chong@linaro.org>
-Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
-
-Upstream: https://github.com/OP-TEE/optee_client/commit/16c8f548786c70df04d3a1e61bf89abce9b92389
-[fix conflict]
-Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
----
- libteec/src/tee_client_api.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/libteec/src/tee_client_api.c b/libteec/src/tee_client_api.c
-index cf0b1f7..4d7b134 100644
---- a/libteec/src/tee_client_api.c
-+++ b/libteec/src/tee_client_api.c
-@@ -481,11 +481,12 @@ TEEC_Result TEEC_OpenSession(TEEC_Context *ctx, TEEC_Session *session,
- uint32_t connection_method, const void *connection_data,
- TEEC_Operation *operation, uint32_t *ret_origin)
- {
-- size_t p_sz = TEEC_CONFIG_PAYLOAD_REF_COUNT *
-- sizeof(struct tee_ioctl_param);
-+ const size_t arg_size = sizeof(struct tee_ioctl_open_session_arg) +
-+ TEEC_CONFIG_PAYLOAD_REF_COUNT *
-+ sizeof(struct tee_ioctl_param);
- union {
- struct tee_ioctl_open_session_arg arg;
-- uint8_t data[sizeof(struct tee_ioctl_open_session_arg) + p_sz];
-+ uint8_t data[arg_size];
- } buf;
- struct tee_ioctl_buf_data buf_data;
- struct tee_ioctl_open_session_arg *arg;
-@@ -559,11 +560,12 @@ void TEEC_CloseSession(TEEC_Session *session)
- TEEC_Result TEEC_InvokeCommand(TEEC_Session *session, uint32_t cmd_id,
- TEEC_Operation *operation, uint32_t *error_origin)
- {
-- size_t p_sz = TEEC_CONFIG_PAYLOAD_REF_COUNT *
-- sizeof(struct tee_ioctl_param);
-+ const size_t arg_size = sizeof(struct tee_ioctl_invoke_arg) +
-+ TEEC_CONFIG_PAYLOAD_REF_COUNT *
-+ sizeof(struct tee_ioctl_param);
- union {
- struct tee_ioctl_invoke_arg arg;
-- uint8_t data[sizeof(struct tee_ioctl_invoke_arg) + p_sz];
-+ uint8_t data[arg_size];
- } buf;
- struct tee_ioctl_buf_data buf_data;
- struct tee_ioctl_invoke_arg *arg;
---
-2.17.1
-
diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash
index 0da25ced2d..010eb69275 100644
--- a/package/optee-client/optee-client.hash
+++ b/package/optee-client/optee-client.hash
@@ -1,4 +1,4 @@
-# From https://github.com/OP-TEE/optee_client/archive/3.4.0.tar.gz
-sha256 7c131a44f4d73acb8816fba88bcd7e6a18537f0a522ae426a20e2ca7dc46a6ec optee-client-3.4.0.tar.gz
+# From https://github.com/OP-TEE/optee_client/archive/3.5.0.tar.gz
+sha256 b7f6f8ac57c0c9b0cc59c34a2622b9ff3ae85676d2da10176fb2eaaa10716083 optee-client-3.5.0.tar.gz
# Locally computed
sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE
diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk
index 0a9fafd0d3..cf52b8e87e 100644
--- a/package/optee-client/optee-client.mk
+++ b/package/optee-client/optee-client.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPTEE_CLIENT_VERSION = 3.4.0
+OPTEE_CLIENT_VERSION = 3.5.0
OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION))
OPTEE_CLIENT_LICENSE = BSD-2-Clause
OPTEE_CLIENT_LICENSE_FILES = LICENSE
diff --git a/package/optee-examples/0001-fix-deprecated-size_t-type-for-size.patch b/package/optee-examples/0001-fix-deprecated-size_t-type-for-size.patch
deleted file mode 100644
index 4f1fb38305..0000000000
--- a/package/optee-examples/0001-fix-deprecated-size_t-type-for-size.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1a2713ac698410fb1a889941d52df12a7bd75f3b Mon Sep 17 00:00:00 2001
-From: Etienne Carriere <etienne.carriere@linaro.org>
-Date: Sun, 17 Feb 2019 22:17:21 +0100
-Subject: [PATCH] secure_storage: fix deprecated size_t type for size
-
-size_t types is an deprecated type used in GPD API v1.0.
-Update
-
-Error reported by GCC 7.3-2018.05:
- secure_storage_ta.c:203:6: warning: passing argument 4 of 'TEE_ReadObjectData' from incompatible pointer type [-Wincompatible-pointer-types]
- &read_bytes);
-
-Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
----
- secure_storage/ta/secure_storage_ta.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/secure_storage/ta/secure_storage_ta.c b/secure_storage/ta/secure_storage_ta.c
-index d120e47..3ccc12d 100644
---- a/secure_storage/ta/secure_storage_ta.c
-+++ b/secure_storage/ta/secure_storage_ta.c
-@@ -146,7 +146,7 @@ static TEE_Result read_raw_object(uint32_t param_types, TEE_Param params[4])
- TEE_ObjectHandle object;
- TEE_ObjectInfo object_info;
- TEE_Result res;
-- size_t read_bytes;
-+ uint32_t read_bytes;
- char *obj_id;
- size_t obj_id_sz;
- char *data;
-@@ -202,7 +202,7 @@ static TEE_Result read_raw_object(uint32_t param_types, TEE_Param params[4])
- res = TEE_ReadObjectData(object, data, object_info.dataSize,
- &read_bytes);
- if (res != TEE_SUCCESS || read_bytes != object_info.dataSize) {
-- EMSG("TEE_ReadObjectData failed 0x%08x, read %u over %u",
-+ EMSG("TEE_ReadObjectData failed 0x%08x, read %" PRIu32 " over %u",
- res, read_bytes, object_info.dataSize);
- goto exit;
- }
---
-2.20.1
-
diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash
index 077fd9757c..980595eb69 100644
--- a/package/optee-examples/optee-examples.hash
+++ b/package/optee-examples/optee-examples.hash
@@ -1,4 +1,4 @@
-# From https://github.com/linaro-swg/optee_examples/archive/3.4.0.tar.gz
-sha256 d833753980ac438c1675787857bb8352997352212334274de9419770097ce039 optee-examples-3.4.0.tar.gz
+# From https://github.com/linaro-swg/optee_examples/archive/3.5.0.tar.gz
+sha256 5b7cf07f6d4b19a8557cfa9ab7a0d98b9e199832694c65c8a74e928926821862 optee-examples-3.5.0.tar.gz
# Locally computed
sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE
diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk
index f2163b8643..7d08209ce8 100644
--- a/package/optee-examples/optee-examples.mk
+++ b/package/optee-examples/optee-examples.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPTEE_EXAMPLES_VERSION = 3.4.0
+OPTEE_EXAMPLES_VERSION = 3.5.0
OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION))
OPTEE_EXAMPLES_LICENSE = BSD-2-Clause
OPTEE_EXAMPLES_LICENSE_FILES = LICENSE
diff --git a/package/optee-test/0001-regression-4100-update-string-conversion-loop.patch b/package/optee-test/0001-regression-4100-update-string-conversion-loop.patch
deleted file mode 100644
index 62862867be..0000000000
--- a/package/optee-test/0001-regression-4100-update-string-conversion-loop.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 88714fc174b91950c9e1c53a9832fc6d4ffa6e2a Mon Sep 17 00:00:00 2001
-From: Etienne Carriere <etienne.carriere@linaro.org>
-Date: Sun, 17 Feb 2019 22:44:44 +0100
-Subject: [PATCH] regression 4100: update string conversion loop
-
-Change the loop used to convert string into numerical value.
-The original loop was fine but its implementation hits toolchain
-unsafe-loop-optimizations feature. The new implementation
-proposed here simplifies a bit the loop and prevents toolchain
-from complaining when directive -Werror=unsafe-loop-optimizations
-is enabled.
-
-Issue reported by the Buildroot cross toolchain [1] with the
-following error traces:
-
-build/armv7/build/optee-test-3.4.0/host/xtest/regression_4100.c:447:8: error: missed loop optimization, the loop counter may overflow [-Werror=unsafe-loop-optimizations]
- while (spos) {
- ^
-build/optee-test-3.4.0/host/xtest/regression_4100.c:454:6: error: missed loop optimization, the loop counter may overflow [-Werror=unsafe-loop-optimizations]
- if (!spos)
- ^
-
-[1] arm-buildroot-linux-uclibcgnueabihf-gcc.br_real (Buildroot 2019.02-git-00933-gb75e93c) 7.4.0
-
-Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
----
- host/xtest/regression_4100.c | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/host/xtest/regression_4100.c b/host/xtest/regression_4100.c
-index b477f38..88346d4 100644
---- a/host/xtest/regression_4100.c
-+++ b/host/xtest/regression_4100.c
-@@ -445,21 +445,24 @@ static TEEC_Result convert_from_string(ADBG_Case_t *c, TEEC_Session *s,
- return TEEC_ERROR_OUT_OF_MEMORY;
-
- while (spos) {
-- spos--;
-- nibble = digit_value(str[spos]);
-- if (nibble == -1)
-+ nibble = digit_value(str[spos - 1]);
-+ if (nibble == -1) {
-+ spos--;
- break;
-+ }
- os[ospos] = nibble;
-
-- if (!spos)
-- break;
-+ if (spos > 1) {
-+ nibble = digit_value(str[spos - 2]);
-+ if (nibble == -1) {
-+ spos -= 2;
-+ break;
-+ }
-+ os[ospos] |= nibble << 4;
-+ ospos--;
-+ spos--;
-+ }
- spos--;
-- nibble = digit_value(str[spos]);
-- if (nibble == -1)
-- break;
--
-- os[ospos] |= nibble << 4;
-- ospos--;
- }
-
- if (spos)
---
-2.20.1
-
diff --git a/package/optee-test/0001-regression-41xx-prevent-unsafe-loop-optimizations-bu.patch b/package/optee-test/0001-regression-41xx-prevent-unsafe-loop-optimizations-bu.patch
new file mode 100644
index 0000000000..8b6871f4e3
--- /dev/null
+++ b/package/optee-test/0001-regression-41xx-prevent-unsafe-loop-optimizations-bu.patch
@@ -0,0 +1,63 @@
+From 5a83a50c47c46c54a443aa18ed6456416fa27a98 Mon Sep 17 00:00:00 2001
+From: Etienne Carriere <etienne.carriere@linaro.org>
+Date: Thu, 25 Apr 2019 10:19:05 +0200
+Subject: [PATCH] regression 41xx: prevent unsafe-loop-optimizations build
+ error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add -Wno-unsafe-loop-optimizations directive since regression_4100.c
+fails to build on some recent toolchains as GCC 7.3.0 and 7.4.0 with
+an error trace like below. Note building with GCC 8.2.1 does not
+reproduce the build issue.
+
+/path/to/optee_test/host/xtest/regression_4100.c: In function ‘convert_from_string’:
+/path/to/optee_test/host/xtest/regression_4100.c:448:8: error: missed loop optimization, the loop counter may overflow [-Werror=unsafe-loop-optimizations]
+ while (spos) {
+ ^
+/path/to/optee_test/host/xtest/regression_4100.c:455:6: error: missed loop optimization, the loop counter may overflow [-Werror=unsafe-loop-optimizations]
+ if (!spos)
+ ^
+
+The GNU Makefile build sequence defines -Wno-unsafe-loop-optimizations
+for the whole xtest sources while CMake build sequence defines it
+specifically for regression_4100.c among xtest source files.
+
+Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
+Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
+---
+ host/xtest/CMakeLists.txt | 4 ++++
+ host/xtest/Makefile | 1 +
+ 2 files changed, 5 insertions(+)
+
+diff --git a/host/xtest/CMakeLists.txt b/host/xtest/CMakeLists.txt
+index 1f3a6f4..3868bcd 100644
+--- a/host/xtest/CMakeLists.txt
++++ b/host/xtest/CMakeLists.txt
+@@ -61,6 +61,10 @@ set (SRC
+ xtest_test.c
+ )
+
++set_source_files_properties(
++ regression_4100.c PROPERTIES COMPILE_FLAGS -Wno-unsafe-loop-optimizations
++)
++
+ if (CFG_GP_SOCKETS)
+ list (APPEND SRC
+ regression_2000.c
+diff --git a/host/xtest/Makefile b/host/xtest/Makefile
+index f226500..e930d9c 100644
+--- a/host/xtest/Makefile
++++ b/host/xtest/Makefile
+@@ -155,6 +155,7 @@ CFLAGS += -Wall -Wcast-align -Werror \
+ -Wshadow -Wstrict-prototypes -Wswitch-default \
+ -Wwrite-strings \
+ -Wno-declaration-after-statement \
++ -Wno-unsafe-loop-optimizations \
+ -Wno-missing-field-initializers -Wno-format-zero-length
+ endif
+
+--
+2.17.1
+
diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash
index c8ae51b8ee..a99cf0bd40 100644
--- a/package/optee-test/optee-test.hash
+++ b/package/optee-test/optee-test.hash
@@ -1,4 +1,4 @@
-# From https://github.com/OP-TEE/optee_test/archive/3.4.0.tar.gz
-sha256 755904c5b845763a2460c32c21100a57c713009b6b88cc3fc21f0e5be8645e2b optee-test-3.4.0.tar.gz
+# From https://github.com/OP-TEE/optee_test/archive/3.5.0.tar.gz
+sha256 19118b7002a618bb2519cf7d0d61feb90e8574148f69b29260344119ac855520 optee-test-3.5.0.tar.gz
# Locally computed
sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md
diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk
index abed09d5e3..935cdfa860 100644
--- a/package/optee-test/optee-test.mk
+++ b/package/optee-test/optee-test.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPTEE_TEST_VERSION = 3.4.0
+OPTEE_TEST_VERSION = 3.5.0
OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION))
OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause,
OPTEE_TEST_LICENSE_FILES = LICENSE.md
diff --git a/package/parted/parted.hash b/package/parted/parted.hash
index e31ae3c4ce..7b04128bea 100644
--- a/package/parted/parted.hash
+++ b/package/parted/parted.hash
@@ -1,2 +1,5 @@
# Locally calculated after checking pgp signature
sha256 858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 parted-3.2.tar.xz
+
+# Locally calculated
+sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index e44f5d913c..3b5ee7b356 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -337,6 +337,8 @@ $(BUILD_DIR)/%/.stamp_target_installed:
$($(PKG)_INSTALL_INIT_SYSTEMD))
$(if $(BR2_INIT_SYSV)$(BR2_INIT_BUSYBOX),\
$($(PKG)_INSTALL_INIT_SYSV))
+ $(if $(BR2_INIT_OPENRC), \
+ $($(PKG)_INSTALL_INIT_OPENRC))
$(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep))
$(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \
$(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ; \
diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash
index 1fe8607fbf..6368091c4a 100644
--- a/package/polkit/polkit.hash
+++ b/package/polkit/polkit.hash
@@ -1,2 +1,5 @@
# Locally calculated after checking pgp signature
sha256 8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df polkit-0.105.tar.gz
+
+# Locally calculated
+sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING
diff --git a/package/poppler/0001-Form.cc-include-ctype.h-to-fix-build-error.patch b/package/poppler/0001-Form.cc-include-ctype.h-to-fix-build-error.patch
deleted file mode 100644
index 8d210dab99..0000000000
--- a/package/poppler/0001-Form.cc-include-ctype.h-to-fix-build-error.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f40143f7acca81b7d39d774ed4c349aec8d9310b Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sat, 23 Sep 2017 11:37:23 +0200
-Subject: [PATCH] Form.cc: include ctype.h to fix build error
-
-Fixes
-Form.cc:546:28: error: 'isdigit' was not declared in this scope
-Form.cc:548:34: error: 'isxdigit' was not declared in this scope
-Form.cc:575:40: error: 'isxdigit' was not declared in this scope
-
-detected by buildroot autobuilders:
-http://autobuild.buildroot.net/results/a6a/a6a336f8b6a0136b204a34091e33dc4598178125/
-when cross-compiling with
-gcc version 4.7.3 (crosstool-NG hg+-c65fcf8a34b7)
-
-Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=102951
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- poppler/Form.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/poppler/Form.cc b/poppler/Form.cc
-index 83bceb20..e7efae95 100644
---- a/poppler/Form.cc
-+++ b/poppler/Form.cc
-@@ -32,6 +32,7 @@
- #include <stddef.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <ctype.h>
- #include "goo/gmem.h"
- #include "goo/GooString.h"
- #include "Error.h"
---
-2.11.0
-
diff --git a/package/poppler/Config.in b/package/poppler/Config.in
index 4a553df721..3fa244fbae 100644
--- a/package/poppler/Config.in
+++ b/package/poppler/Config.in
@@ -2,9 +2,8 @@ config BR2_PACKAGE_POPPLER
bool "poppler"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14, constexpr
select BR2_PACKAGE_FONTCONFIG
- select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
help
Poppler is a PDF rendering library based on the xpdf-3.0
code base.
@@ -22,7 +21,13 @@ config BR2_PACKAGE_POPPLER_QT5
help
Build Qt support into the Poppler library
+config BR2_PACKAGE_POPPLER_UTILS
+ bool "command line utils"
+ help
+ Compile poppler command line utils.
+
endif
-comment "poppler needs a toolchain w/ C++, threads"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+comment "poppler needs a toolchain w/ C++, threads, gcc >= 5"
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
+ !BR2_TOOLCHAIN_GCC_AT_LEAST_5
diff --git a/package/poppler/poppler.hash b/package/poppler/poppler.hash
index 7aa14c681c..2d01754f5c 100644
--- a/package/poppler/poppler.hash
+++ b/package/poppler/poppler.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 poppler-0.59.0.tar.xz
+sha256 7267eb4cbccd64a58244b8211603c1c1b6bf32c7f6a4ced2642865346102f36b poppler-0.77.0.tar.xz
diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
index be1c0e4821..a2bb7e3049 100644
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk
@@ -4,102 +4,110 @@
#
################################################################################
-POPPLER_VERSION = 0.59.0
+POPPLER_VERSION = 0.77.0
POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
POPPLER_SITE = http://poppler.freedesktop.org
POPPLER_DEPENDENCIES = fontconfig host-pkgconf
POPPLER_LICENSE = GPL-2.0+
POPPLER_LICENSE_FILES = COPYING
POPPLER_INSTALL_STAGING = YES
-POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \
- --enable-xpdf-headers --disable-poppler-qt4
+
+POPPLER_CONF_OPTS = \
+ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+ -DBUILD_GTK_TESTS=OFF \
+ -DBUILD_QT5_TESTS=OFF \
+ -DBUILD_CPP_TESTS=OFF \
+ -DENABLE_GOBJECT_INTROSPECTION=OFF \
+ -DENABLE_GTK_DOC=OFF
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
-POPPLER_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -latomic"
+POPPLER_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
endif
-ifeq ($(BR2_PACKAGE_CAIRO),y)
-POPPLER_CONF_OPTS += --enable-cairo-output
-POPPLER_DEPENDENCIES += cairo
+ifeq ($(BR2_PACKAGE_JPEG),y)
+POPPLER_DEPENDENCIES += jpeg
+POPPLER_CONF_OPTS += -DENABLE_DCTDECODER=libjpeg -DWITH_JPEG=ON
+else
+POPPLER_CONF_OPTS += -DENABLE_DCTDECODER=none -DWITH_JPEG=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+POPPLER_DEPENDENCIES += libpng
+POPPLER_CONF_OPTS += -DWITH_PNG=ON
else
-POPPLER_CONF_OPTS += --disable-cairo-output
+POPPLER_CONF_OPTS += -DWITH_PNG=OFF
endif
ifeq ($(BR2_PACKAGE_LCMS2),y)
-POPPLER_CONF_OPTS += --enable-cms=lcms2
POPPLER_DEPENDENCIES += lcms2
+POPPLER_CONF_OPTS += -DENABLE_CMS=lcms2
else
-POPPLER_CONF_OPTS += --enable-cms=none
+POPPLER_CONF_OPTS += -DENABLE_CMS=none
endif
-ifeq ($(BR2_PACKAGE_CAIRO)$(BR2_PACKAGE_LIBGLIB2),yy)
-POPPLER_CONF_OPTS += --enable-poppler-glib
-POPPLER_DEPENDENCIES += libglib2
+ifeq ($(BR2_PACKAGE_OPENJPEG),y)
+POPPLER_DEPENDENCIES += openjpeg
+POPPLER_CONF_OPTS += -DENABLE_LIBOPENJPEG=openjpeg2
else
-POPPLER_CONF_OPTS += --disable-poppler-glib
+POPPLER_CONF_OPTS += -DENABLE_LIBOPENJPEG=none
endif
-ifeq ($(BR2_PACKAGE_TIFF),y)
-POPPLER_CONF_OPTS += --enable-libtiff
-# Help poppler to find libtiff in static linking scenarios
-POPPLER_CONF_ENV += \
- LIBTIFF_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtiff-4`"
-POPPLER_DEPENDENCIES += tiff
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+POPPLER_DEPENDENCIES += libcurl
+POPPLER_CONF_OPTS += -DENABLE_LIBCURL=ON
else
-POPPLER_CONF_OPTS += --disable-libtiff
+POPPLER_CONF_OPTS += -DENABLE_LIBCURL=OFF
endif
-ifeq ($(BR2_PACKAGE_JPEG),y)
-POPPLER_CONF_OPTS += --enable-dctdecoder=libjpeg
-POPPLER_DEPENDENCIES += jpeg
+ifeq ($(BR2_PACKAGE_POPPLER_QT5),y)
+POPPLER_DEPENDENCIES += qt5base
+POPPLER_CONF_OPTS += -DENABLE_QT5=ON
else
-POPPLER_CONF_OPTS += --enable-dctdecoder=none
+POPPLER_CONF_OPTS += -DENABLE_QT5=OFF
endif
-ifeq ($(BR2_PACKAGE_LIBPNG),y)
-POPPLER_CONF_OPTS += --enable-libpng
-POPPLER_DEPENDENCIES += libpng
+ifeq ($(BR2_PACKAGE_POPPLER_UTILS),y)
+POPPLER_CONF_OPTS += -DENABLE_UTILS=ON
else
-POPPLER_CONF_OPTS += --disable-libpng
+POPPLER_CONF_OPTS += -DENABLE_UTILS=OFF
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
-POPPLER_CONF_OPTS += --enable-zlib
POPPLER_DEPENDENCIES += zlib
+POPPLER_CONF_OPTS += -DENABLE_ZLIB=ON
else
-POPPLER_CONF_OPTS += --disable-zlib
+POPPLER_CONF_OPTS += -DENABLE_ZLIB=OFF
endif
-ifeq ($(BR2_PACKAGE_LIBCURL),y)
-POPPLER_CONF_OPTS += --enable-libcurl
-POPPLER_DEPENDENCIES += libcurl
+ifeq ($(BR2_PACKAGE_CAIRO),y)
+POPPLER_DEPENDENCIES += cairo
+POPPLER_CONF_OPTS += -DWITH_Cairo=ON
else
-POPPLER_CONF_OPTS += --disable-libcurl
+POPPLER_CONF_OPTS += -DWITH_Cairo=OFF
endif
-ifeq ($(BR2_PACKAGE_XORG7),y)
-POPPLER_CONF_OPTS += --with-x
-POPPLER_DEPENDENCIES += xlib_libX11 xlib_libXext
+ifeq ($(BR2_PACKAGE_TIFF),y)
+POPPLER_DEPENDENCIES += tiff
+POPPLER_CONF_OPTS += -DWITH_TIFF=ON
else
-POPPLER_CONF_OPTS += --without-x
+POPPLER_CONF_OPTS += -DWITH_TIFF=OFF
endif
-ifeq ($(BR2_PACKAGE_POPPLER_QT5),y)
-POPPLER_DEPENDENCIES += qt5base
-POPPLER_CONF_OPTS += --enable-poppler-qt5
-# since Qt5.7.x c++11 is needed (LTS Qt5.6.x is the last one without this requirement)
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-POPPLER_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
+ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
+POPPLER_DEPENDENCIES += libglib2
endif
+
+ifeq ($(BR2_PACKAGE_LIBNSS),y)
+POPPLER_DEPENDENCIES += libnss
+POPPLER_CONF_OPTS += -DWITH_NSS3=ON
else
-POPPLER_CONF_OPTS += --disable-poppler-qt5
+POPPLER_CONF_OPTS += -DWITH_NSS3=OFF
endif
-ifeq ($(BR2_PACKAGE_OPENJPEG),y)
-POPPLER_DEPENDENCIES += openjpeg
-POPPLER_CONF_OPTS += --enable-libopenjpeg=openjpeg2
+ifeq ($(BR2_SOFT_FLOAT),y)
+POPPLER_CONF_OPTS += -USE_FIXEDPOINT=ON -DUSE_FLOAT=OFF
else
-POPPLER_CONF_OPTS += --enable-libopenjpeg=none
+POPPLER_CONF_OPTS += -USE_FIXEDPOINT=OFF -DUSE_FLOAT=ON
endif
-$(eval $(autotools-package))
+$(eval $(cmake-package))
diff --git a/package/powertop/0002-wakeup_xxx.h-include-limits.h.patch b/package/powertop/0002-wakeup_xxx.h-include-limits.h.patch
new file mode 100644
index 0000000000..821de8b948
--- /dev/null
+++ b/package/powertop/0002-wakeup_xxx.h-include-limits.h.patch
@@ -0,0 +1,54 @@
+From 4c24fdd8e0a42359df7308155b2d43c28a5e02fd Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Mon, 20 May 2019 20:25:00 +0200
+Subject: [PATCH] wakeup_xxx.h: include limits.h
+
+limits.h must be included to define PATH_MAX otherwise build will fail
+on:
+
+In file included from wakeup/wakeup_ethernet.cpp:45:0:
+wakeup/wakeup_ethernet.h:35:16: error: 'PATH_MAX' was not declared in this scope
+ char eth_path[PATH_MAX];
+
+In file included from wakeup/wakeup_usb.cpp:45:0:
+wakeup/wakeup_usb.h:35:16: error: 'PATH_MAX' was not declared in this scope
+ char usb_path[PATH_MAX];
+
+Fixes:
+ - http://autobuild.buildroot.org/results/a0b3337cf4a827e6566f8b15b6bb180f0dcef7a3
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status:
+https://lists.01.org/pipermail/powertop/2019-May/002052.html]
+---
+ src/wakeup/wakeup_ethernet.h | 1 +
+ src/wakeup/wakeup_usb.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/wakeup/wakeup_ethernet.h b/src/wakeup/wakeup_ethernet.h
+index 682bf95..e0fa628 100644
+--- a/src/wakeup/wakeup_ethernet.h
++++ b/src/wakeup/wakeup_ethernet.h
+@@ -25,6 +25,7 @@
+ #ifndef _INCLUDE_GUARD_ETHERNET_WAKEUP_H
+ #define _INCLUDE_GUARD_ETHERNET_WAKEUP_H
+
++#include <limits.h>
+ #include <vector>
+
+ #include "wakeup.h"
+diff --git a/src/wakeup/wakeup_usb.h b/src/wakeup/wakeup_usb.h
+index f7a1f7e..15898e3 100644
+--- a/src/wakeup/wakeup_usb.h
++++ b/src/wakeup/wakeup_usb.h
+@@ -25,6 +25,7 @@
+ #ifndef _INCLUDE_GUARD_USB_WAKEUP_H
+ #define _INCLUDE_GUARD_USB_WAKEUP_H
+
++#include <limits.h>
+ #include <vector>
+
+ #include "wakeup.h"
+--
+2.20.1
+
diff --git a/package/powertop/powertop.hash b/package/powertop/powertop.hash
index 0f9acdc277..13e938d505 100644
--- a/package/powertop/powertop.hash
+++ b/package/powertop/powertop.hash
@@ -1,2 +1,3 @@
# Locally-generated hash
-sha256 aa7fb7d8e9a00f05e7d8a7a2866d85929741e0d03a5bf40cab22d2021c959250 powertop-v2.9.tar.gz
+sha256 d3b7459eaba7d01c8841dd33a3b4d369416c01e9bd8951b0d88234cf18fe4a75 powertop-v2.10.tar.gz
+sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING
diff --git a/package/powertop/powertop.mk b/package/powertop/powertop.mk
index cf5e8d4ffb..e4472080e8 100644
--- a/package/powertop/powertop.mk
+++ b/package/powertop/powertop.mk
@@ -4,8 +4,8 @@
#
################################################################################
-POWERTOP_VERSION = 2.9
-POWERTOP_SITE = https://01.org/sites/default/files/downloads/powertop
+POWERTOP_VERSION = 2.10
+POWERTOP_SITE = https://01.org/sites/default/files/downloads
POWERTOP_SOURCE = powertop-v$(POWERTOP_VERSION).tar.gz
POWERTOP_DEPENDENCIES = pciutils ncurses libnl host-pkgconf \
$(TARGET_NLS_DEPENDENCIES)
diff --git a/package/pptp-linux/0003-pqueue.h-include-sys-types.h.patch b/package/pptp-linux/0003-pqueue.h-include-sys-types.h.patch
deleted file mode 100644
index 1036b3c895..0000000000
--- a/package/pptp-linux/0003-pqueue.h-include-sys-types.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 060ad28b9ca5e99d7c6e8010132da58a3a8a0585 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Fri, 22 Jan 2016 10:19:18 -0300
-Subject: [PATCH] pqueue.h: include sys/types.h
-
-We're using u_int32_t here, this breaks on musl libc builds otherwise.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-Patch status: applied upstream:
-https://sourceforge.net/p/pptpclient/git/ci/ee8ef349d9543cb48045a27d1cdd801fc6e910e8/
-
- pqueue.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pqueue.h b/pqueue.h
-index a56590f..8c60c62 100644
---- a/pqueue.h
-+++ b/pqueue.h
-@@ -3,6 +3,7 @@
-
- #include <time.h>
- #include <sys/time.h>
-+#include <sys/types.h>
-
- /* wait this many seconds for missing packets before forgetting about them */
- #define DEFAULT_PACKET_TIMEOUT 0.3
---
-2.4.10
-
diff --git a/package/pptp-linux/pptp-linux.hash b/package/pptp-linux/pptp-linux.hash
index 6200ef151f..668e01c30b 100644
--- a/package/pptp-linux/pptp-linux.hash
+++ b/package/pptp-linux/pptp-linux.hash
@@ -1,3 +1,7 @@
-# From http://sourceforge.net/projects/pptpclient/files/pptp/pptp-1.9.0/
-md5 b2117b377f65294a9786f80f0235d308 pptp-1.9.0.tar.gz
-sha1 047bb9812be477b44c94ffb1dc95c34658eedc24 pptp-1.9.0.tar.gz
+# From http://sourceforge.net/projects/pptpclient/files/pptp/pptp-1.10.0/
+md5 8d25341352fdae5ad5b36b9f18254908 pptp-1.10.0.tar.gz
+sha1 173c9b7d204c89fd1538116f165bba1e9101b51c pptp-1.10.0.tar.gz
+
+# Locally calculated
+sha256 82492db8e487ce73b182ee7f444251d20c44f5c26d6e96c553ec7093aefb5af4 pptp-1.10.0.tar.gz
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk
index 25f3037f88..7fd0733977 100644
--- a/package/pptp-linux/pptp-linux.mk
+++ b/package/pptp-linux/pptp-linux.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PPTP_LINUX_VERSION = 1.9.0
+PPTP_LINUX_VERSION = 1.10.0
PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION)
PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz
PPTP_LINUX_MAKE = $(MAKE1)
diff --git a/package/python-cycler/Config.in b/package/python-cycler/Config.in
new file mode 100644
index 0000000000..854873c969
--- /dev/null
+++ b/package/python-cycler/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_CYCLER
+ bool "python-cycler"
+ depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+ help
+ Creates a Cycler objects much like cycler, but
+ includes input validation.
+
+ https://matplotlib.org/cycler/
diff --git a/package/python-cycler/python-cycler.hash b/package/python-cycler/python-cycler.hash
new file mode 100644
index 0000000000..8255458b26
--- /dev/null
+++ b/package/python-cycler/python-cycler.hash
@@ -0,0 +1,4 @@
+# sha256 from https://pypi.org/project/cyclic/#files
+sha256 cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8 cycler-0.10.0.tar.gz
+# Locally computed sha256 checksums
+sha256 f1218143d766da3fea66f13396b7f15df46a83303f29bf96ba6e98eb4d42f408 LICENSE
diff --git a/package/python-cycler/python-cycler.mk b/package/python-cycler/python-cycler.mk
new file mode 100644
index 0000000000..4f1f40191f
--- /dev/null
+++ b/package/python-cycler/python-cycler.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-cycler
+#
+################################################################################
+
+PYTHON_CYCLER_VERSION = 0.10.0
+PYTHON_CYCLER_SOURCE = cycler-$(PYTHON_CYCLER_VERSION).tar.gz
+PYTHON_CYCLER_SITE = https://files.pythonhosted.org/packages/c2/4b/137dea450d6e1e3d474e1d873cd1d4f7d3beed7e0dc973b06e8e10d32488
+PYTHON_CYCLER_LICENSE = BSD
+PYTHON_CYCLER_LICENSE_FILES = LICENSE
+PYTHON_CYCLER_SETUP_TYPE = setuptools
+
+$(eval $(python-package))
diff --git a/package/python-falcon/Config.in b/package/python-falcon/Config.in
index ffd66eec1b..1bf93064bb 100644
--- a/package/python-falcon/Config.in
+++ b/package/python-falcon/Config.in
@@ -1,9 +1,7 @@
config BR2_PACKAGE_PYTHON_FALCON
bool "python-falcon"
- select BR2_PACKAGE_PYTHON_SIX # runtime
- select BR2_PACKAGE_PYTHON_MIMEPARSE # runtime
help
An unladen web framework for building APIs and app
backends.
- http://falconframework.org
+ https://falconframework.org
diff --git a/package/python-falcon/python-falcon.hash b/package/python-falcon/python-falcon.hash
index 7f6ee6ea3d..68b8d4cb2c 100644
--- a/package/python-falcon/python-falcon.hash
+++ b/package/python-falcon/python-falcon.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/falcon/json
-md5 3cb880665ee2cd52143cf8a7790a35e6 falcon-1.4.1.tar.gz
-sha256 3981f609c0358a9fcdb25b0e7fab3d9e23019356fb429c635ce4133135ae1bc4 falcon-1.4.1.tar.gz
+md5 77c52c144dd284e6259d257c6f008072 falcon-2.0.0.tar.gz
+sha256 eea593cf466b9c126ce667f6d30503624ef24459f118c75594a69353b6c3d5fc falcon-2.0.0.tar.gz
# Locally computed sha256 checksums
sha256 e9e7f1a7ba764f042e56afce6f3563c2be9c4fffbb1404b20f8050ae051f577c LICENSE
diff --git a/package/python-falcon/python-falcon.mk b/package/python-falcon/python-falcon.mk
index b724ffadbe..1d7c869d6d 100644
--- a/package/python-falcon/python-falcon.mk
+++ b/package/python-falcon/python-falcon.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_FALCON_VERSION = 1.4.1
+PYTHON_FALCON_VERSION = 2.0.0
PYTHON_FALCON_SOURCE = falcon-$(PYTHON_FALCON_VERSION).tar.gz
-PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/2f/e6/5045da9df509b9259037f065d15608930fd6c997ee930ad230f9fbfecf15
+PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/19/30/edff5a1fea7a8e9876c8391e170263e1bb207875b6a65cd619818487b27b
PYTHON_FALCON_SETUP_TYPE = setuptools
PYTHON_FALCON_LICENSE = Apache-2.0
PYTHON_FALCON_LICENSE_FILES = LICENSE
diff --git a/package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch b/package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch
new file mode 100644
index 0000000000..b10bfb326f
--- /dev/null
+++ b/package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch
@@ -0,0 +1,29 @@
+From b0232c3cf1051749dd1e2bd0ec7c5c0a3a008d2f Mon Sep 17 00:00:00 2001
+From: Jugurtha BELKALEM <jugurtha.belkalem@smile.fr>
+Date: Thu, 9 May 2019 15:06:36 +0200
+Subject: [PATCH] Fix invalid inclusion headers
+
+By default, matplotlib includes headers from host
+machine which breaks the build process.
+
+Signed-off-by: Jugurtha BELKALEM <jugurtha.belkalem@smile.fr>
+---
+ python-matplotlib-3.0.3/setupext.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setupext.py b/setupext.py
+index fc82d5d..eb978d2 100644
+--- a/setupext.py
++++ b/setupext.py
+@@ -267,7 +267,7 @@ def get_base_dirs():
+ 'gnu0': ['/usr'],
+ 'aix5': ['/usr/local'],
+ }
+- return basedir_map.get(sys.platform, ['/usr/local', '/usr'])
++ return basedir_map.get(sys.platform, [])
+
+
+ def get_include_dirs():
+--
+2.7.4
+
diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in
new file mode 100644
index 0000000000..c5cb94dac7
--- /dev/null
+++ b/package/python-matplotlib/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_PYTHON_MATPLOTLIB
+ bool "python-matplotlib"
+ depends on BR2_PACKAGE_PYTHON3
+ depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
+ select BR2_PACKAGE_FREETYPE # runtime
+ select BR2_PACKAGE_LIBPNG # runtime
+ select BR2_PACKAGE_PYTHON_CYCLER
+ select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
+ select BR2_PACKAGE_PYTHON_DATEUTIL # runtime
+ select BR2_PACKAGE_PYTHON_NUMPY # runtime
+ select BR2_PACKAGE_PYTHON_PYPARSING # runtime
+ select BR2_PACKAGE_PYTHON3_ZLIB # runtime
+ select BR2_PACKAGE_ZLIB # runtime
+ help
+ Matplotlib strives to produce publication quality 2D
+ graphics for interactive graphing, scientific publishing,
+ user interface development and web application servers
+ targeting multiple user interfaces and hardcopy output
+ formats.
+
+ https://matplotlib.org/
diff --git a/package/python-matplotlib/python-matplotlib.hash b/package/python-matplotlib/python-matplotlib.hash
new file mode 100644
index 0000000000..ccb22eefa5
--- /dev/null
+++ b/package/python-matplotlib/python-matplotlib.hash
@@ -0,0 +1,4 @@
+# sha256 from https://pypi.org/project/matplotlib/#files
+sha256 e1d33589e32f482d0a7d1957bf473d43341115d40d33f578dad44432e47df7b7 matplotlib-3.0.3.tar.gz
+# Locally computed sha256 checksums
+sha256 5a1a81ea301728c8bba2933da832c0cd62229daf20893a024ab3d53244468dbc LICENSE/LICENSE
diff --git a/package/python-matplotlib/python-matplotlib.mk b/package/python-matplotlib/python-matplotlib.mk
new file mode 100644
index 0000000000..7082637d09
--- /dev/null
+++ b/package/python-matplotlib/python-matplotlib.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# python-matplotlib
+#
+################################################################################
+
+PYTHON_MATPLOTLIB_VERSION = 3.0.3
+PYTHON_MATPLOTLIB_SOURCE = matplotlib-$(PYTHON_MATPLOTLIB_VERSION).tar.gz
+PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/26/04/8b381d5b166508cc258632b225adbafec49bbe69aa9a4fa1f1b461428313
+PYTHON_MATPLOTLIB_LICENSE = Python-2.0
+PYTHON_MATPLOTLIB_LICENSE_FILES = LICENSE/LICENSE
+PYTHON_MATPLOTLIB_DEPENDENCIES = host-pkgconf freetype host-python-numpy \
+ libpng python-cycler
+PYTHON_MATPLOTLIB_SETUP_TYPE = setuptools
+
+$(eval $(python-package))
diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash
index 46f62c75c5..42f45d3a44 100644
--- a/package/python-requests/python-requests.hash
+++ b/package/python-requests/python-requests.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/requests/json
-md5 1bcd0e0977c3f8db1848ba0e2b7ab904 requests-2.21.0.tar.gz
-sha256 502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e requests-2.21.0.tar.gz
+md5 ee28bee2de76e9198fc41e48f3a7dd47 requests-2.22.0.tar.gz
+sha256 11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 requests-2.22.0.tar.gz
# Locally computed sha256 checksums
sha256 be41abac2c40f8530307e8d172c590b476f4a488bc6a68f8de57b7cf64786687 LICENSE
diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk
index 3d8542fcdf..e64db94523 100644
--- a/package/python-requests/python-requests.mk
+++ b/package/python-requests/python-requests.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_REQUESTS_VERSION = 2.21.0
+PYTHON_REQUESTS_VERSION = 2.22.0
PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz
-PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/52/2c/514e4ac25da2b08ca5a464c50463682126385c4272c18193876e91f4bc38
+PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/01/62/ddcf76d1d19885e8579acb1b1df26a852b03472c0e46d2b959a714c90608
PYTHON_REQUESTS_SETUP_TYPE = setuptools
PYTHON_REQUESTS_LICENSE = Apache-2.0
PYTHON_REQUESTS_LICENSE_FILES = LICENSE
diff --git a/package/python-socketio/python-socketio.hash b/package/python-socketio/python-socketio.hash
index 659d4d540c..a6948659c7 100644
--- a/package/python-socketio/python-socketio.hash
+++ b/package/python-socketio/python-socketio.hash
@@ -1,4 +1,5 @@
-# md5 from https://pypi.python.org/pypi/python-socketio/json
-md5 44fd24e839dc3102920765f345740646 python-socketio-1.4.1.tar.gz
-# sha256 calculated by scanpypi
-sha256 ebd0984d831d602c8ec6d586ecde4466972cc7ed37dbbfe613192864e8263779 python-socketio-1.4.1.tar.gz
+# md5, sha256 from https://pypi.org/pypi/python-socketio/json
+md5 51d3820673710afa5caa442c17b08635 python-socketio-4.0.2.tar.gz
+sha256 7bb11f79981eaad08f33b98ffcd501590e5a2c645fdd7bb3fb0a5d9078e08bbc python-socketio-4.0.2.tar.gz
+# Locally computed sha256 checksums
+sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE
diff --git a/package/python-socketio/python-socketio.mk b/package/python-socketio/python-socketio.mk
index 57dc1f8b48..d68e76a2e3 100644
--- a/package/python-socketio/python-socketio.mk
+++ b/package/python-socketio/python-socketio.mk
@@ -4,8 +4,8 @@
#
################################################################################
-PYTHON_SOCKETIO_VERSION = 1.4.1
-PYTHON_SOCKETIO_SITE = https://pypi.python.org/packages/da/00/66103df6a116a2ce3ea662a9c8c80f337d43d7f138caf04e9af6dec24ba7
+PYTHON_SOCKETIO_VERSION = 4.0.2
+PYTHON_SOCKETIO_SITE = https://files.pythonhosted.org/packages/41/94/f59c7c61e4544d27ad0cdca354a20b4fc12674fae18c4f6a00e34a88007e
PYTHON_SOCKETIO_SETUP_TYPE = setuptools
PYTHON_SOCKETIO_LICENSE = MIT
PYTHON_SOCKETIO_LICENSE_FILES = LICENSE
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index e73b8931aa..e4ae120631 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -253,6 +253,13 @@ QT5BASE_CONFIGURE_OPTS += -no-gtk
endif
endif
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+QT5BASE_CONFIGURE_OPTS += -journald
+QT5BASE_DEPENDENCIES += systemd
+else
+QT5BASE_CONFIGURE_OPTS += -no-journald
+endif
+
# Build the list of libraries to be installed on the target
QT5BASE_INSTALL_LIBS_y += Qt5Core
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XCB) += Qt5XcbQpa
diff --git a/package/redis/0001-uclibc.patch b/package/redis/0001-uclibc.patch
index a0534d5748..3329a60edc 100644
--- a/package/redis/0001-uclibc.patch
+++ b/package/redis/0001-uclibc.patch
@@ -8,6 +8,8 @@ against uclibc. Patch originates from:
Signed-off-by: Daniel Price <daniel.price@gmail.com>
[Martin: adapt to 3.0.3]
Signed-off-by: Martin Bark <martin@barkynet.com>
+[Titouan: adapt to 5.0.4]
+Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
=========================================================================
diff -ur old/src/config.h new/src/config.h
@@ -17,7 +19,8 @@ diff -ur old/src/config.h new/src/config.h
#endif
/* Test for backtrace() */
--#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__))
-+#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__) && !defined(__UCLIBC__))
+-#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) || \
++#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__) && !defined(__UCLIBC__)) || \
+ defined(__FreeBSD__) || (defined(__OpenBSD__) && defined(USE_BACKTRACE))\
+ || defined(__DragonFly__)
#define HAVE_BACKTRACE 1
- #endif
diff --git a/package/redis/redis.hash b/package/redis/redis.hash
index 0b4e25c61d..9ec243d7dd 100644
--- a/package/redis/redis.hash
+++ b/package/redis/redis.hash
@@ -1,5 +1,5 @@
# From https://github.com/antirez/redis-hashes/blob/master/README
-sha256 fc53e73ae7586bcdacb4b63875d1ff04f68c5474c1ddeda78f00e5ae2eed1bbb redis-4.0.11.tar.gz
+sha256 3ce9ceff5a23f60913e1573f6dfcd4aa53b42d4a2789e28fa53ec2bd28c987dd redis-5.0.4.tar.gz
# Locally calculated
sha256 cbf420a3672475a6e2765e3c0984c1f81efe0212afb94a3c998ee63bfd661063 COPYING
diff --git a/package/redis/redis.mk b/package/redis/redis.mk
index da2307d693..372676438a 100644
--- a/package/redis/redis.mk
+++ b/package/redis/redis.mk
@@ -4,7 +4,7 @@
#
################################################################################
-REDIS_VERSION = 4.0.11
+REDIS_VERSION = 5.0.4
REDIS_SITE = http://download.redis.io/releases
REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components)
REDIS_LICENSE_FILES = COPYING
diff --git a/package/rubix/Config.in b/package/rubix/Config.in
index 7afc0ae7b9..e814a95f57 100644
--- a/package/rubix/Config.in
+++ b/package/rubix/Config.in
@@ -5,4 +5,4 @@ config BR2_PACKAGE_RUBIX
help
A 3D rubiks cube game for X
- http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Rubix
+ http://sed.free.fr/rubix
diff --git a/package/rubix/rubix.hash b/package/rubix/rubix.hash
index 90fc9cd11e..3992110c32 100644
--- a/package/rubix/rubix.hash
+++ b/package/rubix/rubix.hash
@@ -1,2 +1,3 @@
# Locally calculated
-sha256 d3c6bf8bfa891e72baac0250a79d26045ddb4412b72d90de7c46091c07516b43 rubix-1.0.5.tar.bz2
+sha256 ccff4c98373f76c6bab751f5f5a60df7ad8691c79b56157e4aba2dd76f501a87 rubix-1.0.6.tar.bz2
+sha256 429d04118c02bc92d834c430601f8c0c8df1ab27e3617ec73ad3f66c5953475d LICENCE
diff --git a/package/rubix/rubix.mk b/package/rubix/rubix.mk
index b808bc0b87..937339f546 100644
--- a/package/rubix/rubix.mk
+++ b/package/rubix/rubix.mk
@@ -4,9 +4,9 @@
#
################################################################################
-RUBIX_VERSION = 1.0.5
+RUBIX_VERSION = 1.0.6
RUBIX_SOURCE = rubix-$(RUBIX_VERSION).tar.bz2
-RUBIX_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Rubix
+RUBIX_SITE = http://sed.free.fr/rubix
RUBIX_LICENSE = Public Domain
RUBIX_LICENSE_FILES = LICENCE
RUBIX_DEPENDENCIES = xlib_libX11
@@ -18,4 +18,13 @@ RUBIX_MAKE_OPTS = \
RUBIX_INSTALL_TARGET_OPTS = GAMESDIR=$(TARGET_DIR)/usr/games install
-$(eval $(autotools-package))
+define RUBIX_BUILD_CMDS
+ $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(RUBIX_MAKE_OPTS) rubix
+endef
+
+define RUBIX_INSTALL_TARGET_CMDS
+ $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(RUBIX_MAKE_OPTS) \
+ $(RUBIX_INSTALL_TARGET_OPTS)
+endef
+
+$(eval $(generic-package))
diff --git a/package/samba4/Config.in b/package/samba4/Config.in
index 4ccd22aa2d..f65cdc47b6 100644
--- a/package/samba4/Config.in
+++ b/package/samba4/Config.in
@@ -9,10 +9,11 @@ config BR2_PACKAGE_SAMBA4
depends on BR2_USE_MMU # fork()
depends on BR2_USE_WCHAR # python
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # python -> libffi
- depends on !BR2_STATIC_LIBS # python, gnutls
+ depends on !BR2_STATIC_LIBS # cmocka, python, gnutls
depends on !BR2_nios2 # binary too large, relocations don't fit
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_TOOLCHAIN_USES_MUSL
+ select BR2_PACKAGE_CMOCKA
select BR2_PACKAGE_E2FSPROGS
select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_PACKAGE_POPT
diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk
index d2f89e2c82..4ca3aaa615 100644
--- a/package/samba4/samba4.mk
+++ b/package/samba4/samba4.mk
@@ -12,7 +12,7 @@ SAMBA4_LICENSE = GPL-3.0+
SAMBA4_LICENSE_FILES = COPYING
SAMBA4_DEPENDENCIES = \
host-e2fsprogs host-heimdal host-python host-nfs-utils \
- e2fsprogs popt python zlib \
+ cmocka e2fsprogs popt python zlib \
$(if $(BR2_PACKAGE_LIBAIO),libaio) \
$(if $(BR2_PACKAGE_LIBCAP),libcap) \
$(if $(BR2_PACKAGE_READLINE),readline) \
diff --git a/package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch b/package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch
index a0d3fb0fb3..4fe7f52174 100644
--- a/package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch
+++ b/package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch
@@ -23,6 +23,8 @@ This patch is similar to the patch used by the Yocto Project at
http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Upstream status:
+https://gitlab.freedesktop.org/xdg/shared-mime-info/merge_requests/18]
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/shared-mime-info/shared-mime-info.hash b/package/shared-mime-info/shared-mime-info.hash
index cf6c8f3eb7..b86499cd58 100644
--- a/package/shared-mime-info/shared-mime-info.hash
+++ b/package/shared-mime-info/shared-mime-info.hash
@@ -1,2 +1,3 @@
# Locally calculated
-sha256 2af55ef1a0319805b74ab40d331a3962c905477d76c086f49e34dc96363589e9 shared-mime-info-1.8.tar.xz
+sha256 18b2f0fe07ed0d6f81951a5fd5ece44de9c8aeb4dc5bb20d4f595f6cc6bd403e shared-mime-info-1.12.tar.xz
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
index e68d631a2e..9932bd2db0 100644
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/package/shared-mime-info/shared-mime-info.mk
@@ -4,9 +4,10 @@
#
################################################################################
-SHARED_MIME_INFO_VERSION = 1.8
+SHARED_MIME_INFO_VERSION = 1.12
SHARED_MIME_INFO_SOURCE = shared-mime-info-$(SHARED_MIME_INFO_VERSION).tar.xz
-SHARED_MIME_INFO_SITE = https://people.freedesktop.org/~hadess
+SHARED_MIME_INFO_SITE = \
+ https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51
SHARED_MIME_INFO_INSTALL_STAGING = YES
# 0001-Remove-incorrect-dependency-from-install-data-hook.patch
SHARED_MIME_INFO_AUTORECONF = YES
diff --git a/package/skeleton-init-openrc/Config.in b/package/skeleton-init-openrc/Config.in
new file mode 100644
index 0000000000..8f4dd17ebd
--- /dev/null
+++ b/package/skeleton-init-openrc/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_SKELETON_INIT_OPENRC
+ bool
+ select BR2_PACKAGE_HAS_SKELETON
+ select BR2_PACKAGE_SKELETON_INIT_COMMON
+
+config BR2_PACKAGE_PROVIDES_SKELETON
+ default "skeleton-init-openrc" if BR2_PACKAGE_SKELETON_INIT_OPENRC
diff --git a/package/skeleton-init-openrc/skeleton-init-openrc.mk b/package/skeleton-init-openrc/skeleton-init-openrc.mk
new file mode 100644
index 0000000000..5ee2192093
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton-init-openrc.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# skeleton-init-openrc
+#
+################################################################################
+
+# The skeleton can't depend on the toolchain, since all packages depends on the
+# skeleton and the toolchain is a target package, as is skeleton.
+# Hence, skeleton would depends on the toolchain and the toolchain would depend
+# on skeleton.
+SKELETON_INIT_OPENRC_ADD_TOOLCHAIN_DEPENDENCY = NO
+SKELETON_INIT_OPENRC_ADD_SKELETON_DEPENDENCY = NO
+
+SKELETON_INIT_OPENRC_DEPENDENCIES = skeleton-init-common
+
+SKELETON_INIT_OPENRC_PROVIDES = skeleton
+
+define SKELETON_INIT_OPENRC_INSTALL_TARGET_CMDS
+ $(call SYSTEM_RSYNC,$(SKELETON_INIT_OPENRC_PKGDIR)/skeleton,$(TARGET_DIR))
+endef
+
+$(eval $(generic-package))
diff --git a/package/skeleton-init-openrc/skeleton/dev/log b/package/skeleton-init-openrc/skeleton/dev/log
new file mode 120000
index 0000000000..d96b3b1cb8
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/dev/log
@@ -0,0 +1 @@
+../tmp/log \ No newline at end of file
diff --git a/package/skeleton-init-openrc/skeleton/etc/fstab b/package/skeleton-init-openrc/skeleton/etc/fstab
new file mode 100644
index 0000000000..3ec96cf634
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/etc/fstab
@@ -0,0 +1,3 @@
+# <file system> <mount pt> <type> <options> <dump> <pass>
+tmpfs /tmp tmpfs mode=1777 0 0
+tmpfs /run tmpfs mode=0755,nosuid,nodev 0 0
diff --git a/package/skeleton-init-openrc/skeleton/var/cache b/package/skeleton-init-openrc/skeleton/var/cache
new file mode 120000
index 0000000000..1431b0e432
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/var/cache
@@ -0,0 +1 @@
+../tmp \ No newline at end of file
diff --git a/package/skeleton-init-openrc/skeleton/var/lib/misc b/package/skeleton-init-openrc/skeleton/var/lib/misc
new file mode 120000
index 0000000000..f1fde8c107
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/var/lib/misc
@@ -0,0 +1 @@
+../../tmp \ No newline at end of file
diff --git a/package/skeleton-init-openrc/skeleton/var/lock b/package/skeleton-init-openrc/skeleton/var/lock
new file mode 120000
index 0000000000..1431b0e432
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/var/lock
@@ -0,0 +1 @@
+../tmp \ No newline at end of file
diff --git a/package/skeleton-init-openrc/skeleton/var/log b/package/skeleton-init-openrc/skeleton/var/log
new file mode 120000
index 0000000000..1431b0e432
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/var/log
@@ -0,0 +1 @@
+../tmp \ No newline at end of file
diff --git a/package/skeleton-init-openrc/skeleton/var/run b/package/skeleton-init-openrc/skeleton/var/run
new file mode 120000
index 0000000000..84ba55b912
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/var/run
@@ -0,0 +1 @@
+../run \ No newline at end of file
diff --git a/package/skeleton-init-openrc/skeleton/var/spool b/package/skeleton-init-openrc/skeleton/var/spool
new file mode 120000
index 0000000000..1431b0e432
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/var/spool
@@ -0,0 +1 @@
+../tmp \ No newline at end of file
diff --git a/package/skeleton-init-openrc/skeleton/var/tmp b/package/skeleton-init-openrc/skeleton/var/tmp
new file mode 120000
index 0000000000..1431b0e432
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/var/tmp
@@ -0,0 +1 @@
+../tmp \ No newline at end of file
diff --git a/package/speexdsp/0001-port-resample-neon-to-aarch64.patch b/package/speexdsp/0001-port-resample-neon-to-aarch64.patch
deleted file mode 100644
index 7f3da9c407..0000000000
--- a/package/speexdsp/0001-port-resample-neon-to-aarch64.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-From: Frank Barchard <fbarchard@google.com>
-Date: Thu, 21 Jul 2016 23:01:19 +0000 (-0700)
-Subject: resample: port resample_neon.h to aarch64
-X-Git-Url: https://git.xiph.org/?p=speexdsp.git;a=commitdiff_plain;h=3282cc7c3cd30cd1c092ad1e7ff03bd20d75c088
-
-resample: port resample_neon.h to aarch64
-
-port optimized inner_product_single and WORD2INT(x) for fixed
-and floating point from 32 bit armv7 NEON to aarch64 NEON.
-
-Patch downloaded from upstream repo to fix aarch64 build error:
-https://git.xiph.org/?p=speexdsp.git;a=commitdiff;h=3282cc7c3cd30cd1c092ad1e7ff03bd20d75c088#patch1
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
-
-diff --git a/libspeexdsp/resample_neon.h b/libspeexdsp/resample_neon.h
-index 0acbd27..e14ffe1 100644
---- a/libspeexdsp/resample_neon.h
-+++ b/libspeexdsp/resample_neon.h
-@@ -36,14 +36,24 @@
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
--#include <arm_neon.h>
--
- #ifdef FIXED_POINT
--#ifdef __thumb2__
-+#if defined(__aarch64__)
-+static inline int32_t saturate_32bit_to_16bit(int32_t a) {
-+ int32_t ret;
-+ asm ("fmov s0, %w[a]\n"
-+ "sqxtn h0, s0\n"
-+ "sxtl v0.4s, v0.4h\n"
-+ "fmov %w[ret], s0\n"
-+ : [ret] "=r" (ret)
-+ : [a] "r" (a)
-+ : "v0" );
-+ return ret;
-+}
-+#elif defined(__thumb2__)
- static inline int32_t saturate_32bit_to_16bit(int32_t a) {
- int32_t ret;
- asm ("ssat %[ret], #16, %[a]"
-- : [ret] "=&r" (ret)
-+ : [ret] "=r" (ret)
- : [a] "r" (a)
- : );
- return ret;
-@@ -54,7 +64,7 @@ static inline int32_t saturate_32bit_to_16bit(int32_t a) {
- asm ("vmov.s32 d0[0], %[a]\n"
- "vqmovn.s32 d0, q0\n"
- "vmov.s16 %[ret], d0[0]\n"
-- : [ret] "=&r" (ret)
-+ : [ret] "=r" (ret)
- : [a] "r" (a)
- : "q0");
- return ret;
-@@ -64,7 +74,63 @@ static inline int32_t saturate_32bit_to_16bit(int32_t a) {
- #define WORD2INT(x) (saturate_32bit_to_16bit(x))
-
- #define OVERRIDE_INNER_PRODUCT_SINGLE
--/* Only works when len % 4 == 0 */
-+/* Only works when len % 4 == 0 and len >= 4 */
-+#if defined(__aarch64__)
-+static inline int32_t inner_product_single(const int16_t *a, const int16_t *b, unsigned int len)
-+{
-+ int32_t ret;
-+ uint32_t remainder = len % 16;
-+ len = len - remainder;
-+
-+ asm volatile (" cmp %w[len], #0\n"
-+ " b.ne 1f\n"
-+ " ld1 {v16.4h}, [%[b]], #8\n"
-+ " ld1 {v20.4h}, [%[a]], #8\n"
-+ " subs %w[remainder], %w[remainder], #4\n"
-+ " smull v0.4s, v16.4h, v20.4h\n"
-+ " b.ne 4f\n"
-+ " b 5f\n"
-+ "1:"
-+ " ld1 {v16.4h, v17.4h, v18.4h, v19.4h}, [%[b]], #32\n"
-+ " ld1 {v20.4h, v21.4h, v22.4h, v23.4h}, [%[a]], #32\n"
-+ " subs %w[len], %w[len], #16\n"
-+ " smull v0.4s, v16.4h, v20.4h\n"
-+ " smlal v0.4s, v17.4h, v21.4h\n"
-+ " smlal v0.4s, v18.4h, v22.4h\n"
-+ " smlal v0.4s, v19.4h, v23.4h\n"
-+ " b.eq 3f\n"
-+ "2:"
-+ " ld1 {v16.4h, v17.4h, v18.4h, v19.4h}, [%[b]], #32\n"
-+ " ld1 {v20.4h, v21.4h, v22.4h, v23.4h}, [%[a]], #32\n"
-+ " subs %w[len], %w[len], #16\n"
-+ " smlal v0.4s, v16.4h, v20.4h\n"
-+ " smlal v0.4s, v17.4h, v21.4h\n"
-+ " smlal v0.4s, v18.4h, v22.4h\n"
-+ " smlal v0.4s, v19.4h, v23.4h\n"
-+ " b.ne 2b\n"
-+ "3:"
-+ " cmp %w[remainder], #0\n"
-+ " b.eq 5f\n"
-+ "4:"
-+ " ld1 {v18.4h}, [%[b]], #8\n"
-+ " ld1 {v22.4h}, [%[a]], #8\n"
-+ " subs %w[remainder], %w[remainder], #4\n"
-+ " smlal v0.4s, v18.4h, v22.4h\n"
-+ " b.ne 4b\n"
-+ "5:"
-+ " saddlv d0, v0.4s\n"
-+ " sqxtn s0, d0\n"
-+ " sqrshrn h0, s0, #15\n"
-+ " sxtl v0.4s, v0.4h\n"
-+ " fmov %w[ret], s0\n"
-+ : [ret] "=r" (ret), [a] "+r" (a), [b] "+r" (b),
-+ [len] "+r" (len), [remainder] "+r" (remainder)
-+ :
-+ : "cc", "v0",
-+ "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23");
-+ return ret;
-+}
-+#else
- static inline int32_t inner_product_single(const int16_t *a, const int16_t *b, unsigned int len)
- {
- int32_t ret;
-@@ -112,33 +178,104 @@ static inline int32_t inner_product_single(const int16_t *a, const int16_t *b, u
- " vqmovn.s64 d0, q0\n"
- " vqrshrn.s32 d0, q0, #15\n"
- " vmov.s16 %[ret], d0[0]\n"
-- : [ret] "=&r" (ret), [a] "+r" (a), [b] "+r" (b),
-+ : [ret] "=r" (ret), [a] "+r" (a), [b] "+r" (b),
- [len] "+r" (len), [remainder] "+r" (remainder)
- :
- : "cc", "q0",
-- "d16", "d17", "d18", "d19",
-- "d20", "d21", "d22", "d23");
-+ "d16", "d17", "d18", "d19", "d20", "d21", "d22", "d23");
-
- return ret;
- }
--#elif defined(FLOATING_POINT)
-+#endif // !defined(__aarch64__)
-
-+#elif defined(FLOATING_POINT)
-+#if defined(__aarch64__)
-+static inline int32_t saturate_float_to_16bit(float a) {
-+ int32_t ret;
-+ asm ("fcvtas s1, %s[a]\n"
-+ "sqxtn h1, s1\n"
-+ "sxtl v1.4s, v1.4h\n"
-+ "fmov %w[ret], s1\n"
-+ : [ret] "=r" (ret)
-+ : [a] "w" (a)
-+ : "v1");
-+ return ret;
-+}
-+#else
- static inline int32_t saturate_float_to_16bit(float a) {
- int32_t ret;
- asm ("vmov.f32 d0[0], %[a]\n"
- "vcvt.s32.f32 d0, d0, #15\n"
- "vqrshrn.s32 d0, q0, #15\n"
- "vmov.s16 %[ret], d0[0]\n"
-- : [ret] "=&r" (ret)
-+ : [ret] "=r" (ret)
- : [a] "r" (a)
- : "q0");
- return ret;
- }
-+#endif
-+
- #undef WORD2INT
- #define WORD2INT(x) (saturate_float_to_16bit(x))
-
- #define OVERRIDE_INNER_PRODUCT_SINGLE
--/* Only works when len % 4 == 0 */
-+/* Only works when len % 4 == 0 and len >= 4 */
-+#if defined(__aarch64__)
-+static inline float inner_product_single(const float *a, const float *b, unsigned int len)
-+{
-+ float ret;
-+ uint32_t remainder = len % 16;
-+ len = len - remainder;
-+
-+ asm volatile (" cmp %w[len], #0\n"
-+ " b.ne 1f\n"
-+ " ld1 {v16.4s}, [%[b]], #16\n"
-+ " ld1 {v20.4s}, [%[a]], #16\n"
-+ " subs %w[remainder], %w[remainder], #4\n"
-+ " fmul v1.4s, v16.4s, v20.4s\n"
-+ " b.ne 4f\n"
-+ " b 5f\n"
-+ "1:"
-+ " ld1 {v16.4s, v17.4s, v18.4s, v19.4s}, [%[b]], #64\n"
-+ " ld1 {v20.4s, v21.4s, v22.4s, v23.4s}, [%[a]], #64\n"
-+ " subs %w[len], %w[len], #16\n"
-+ " fmul v1.4s, v16.4s, v20.4s\n"
-+ " fmul v2.4s, v17.4s, v21.4s\n"
-+ " fmul v3.4s, v18.4s, v22.4s\n"
-+ " fmul v4.4s, v19.4s, v23.4s\n"
-+ " b.eq 3f\n"
-+ "2:"
-+ " ld1 {v16.4s, v17.4s, v18.4s, v19.4s}, [%[b]], #64\n"
-+ " ld1 {v20.4s, v21.4s, v22.4s, v23.4s}, [%[a]], #64\n"
-+ " subs %w[len], %w[len], #16\n"
-+ " fmla v1.4s, v16.4s, v20.4s\n"
-+ " fmla v2.4s, v17.4s, v21.4s\n"
-+ " fmla v3.4s, v18.4s, v22.4s\n"
-+ " fmla v4.4s, v19.4s, v23.4s\n"
-+ " b.ne 2b\n"
-+ "3:"
-+ " fadd v16.4s, v1.4s, v2.4s\n"
-+ " fadd v17.4s, v3.4s, v4.4s\n"
-+ " cmp %w[remainder], #0\n"
-+ " fadd v1.4s, v16.4s, v17.4s\n"
-+ " b.eq 5f\n"
-+ "4:"
-+ " ld1 {v18.4s}, [%[b]], #16\n"
-+ " ld1 {v22.4s}, [%[a]], #16\n"
-+ " subs %w[remainder], %w[remainder], #4\n"
-+ " fmla v1.4s, v18.4s, v22.4s\n"
-+ " b.ne 4b\n"
-+ "5:"
-+ " faddp v1.4s, v1.4s, v1.4s\n"
-+ " faddp %[ret].4s, v1.4s, v1.4s\n"
-+ : [ret] "=w" (ret), [a] "+r" (a), [b] "+r" (b),
-+ [len] "+r" (len), [remainder] "+r" (remainder)
-+ :
-+ : "cc", "v1", "v2", "v3", "v4",
-+ "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23");
-+ return ret;
-+}
-+#else
- static inline float inner_product_single(const float *a, const float *b, unsigned int len)
- {
- float ret;
-@@ -191,11 +328,12 @@ static inline float inner_product_single(const float *a, const float *b, unsigne
- " vadd.f32 d0, d0, d1\n"
- " vpadd.f32 d0, d0, d0\n"
- " vmov.f32 %[ret], d0[0]\n"
-- : [ret] "=&r" (ret), [a] "+r" (a), [b] "+r" (b),
-+ : [ret] "=r" (ret), [a] "+r" (a), [b] "+r" (b),
- [len] "+l" (len), [remainder] "+l" (remainder)
- :
-- : "cc", "q0", "q1", "q2", "q3", "q4", "q5", "q6", "q7", "q8",
-- "q9", "q10", "q11");
-+ : "cc", "q0", "q1", "q2", "q3",
-+ "q4", "q5", "q6", "q7", "q8", "q9", "q10", "q11");
- return ret;
- }
-+#endif // defined(__aarch64__)
- #endif
diff --git a/package/speexdsp/speexdsp.hash b/package/speexdsp/speexdsp.hash
index 5c3d6b96f3..955c4c0a0c 100644
--- a/package/speexdsp/speexdsp.hash
+++ b/package/speexdsp/speexdsp.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 e896489e045d11933723a94b9dd6f8e7d3d4e0d4b34c9612bcb2f4204261130c speexdsp-20ed3452074664ad07e380e51321b148acebdf20.tar.gz
+sha256 3f3997997f3af3e7382b44abc9d2a55db5bd8754b22e798e2d16ac309cd6474a speexdsp-SpeexDSP-1.2.0.tar.gz
sha256 671bb5d8fd3c6b05a2e831d90f978ac27965c92bd8ea6d16b3df76e3440c0e9f COPYING
diff --git a/package/speexdsp/speexdsp.mk b/package/speexdsp/speexdsp.mk
index 09c8285688..f5a46cd9de 100644
--- a/package/speexdsp/speexdsp.mk
+++ b/package/speexdsp/speexdsp.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SPEEXDSP_VERSION = 20ed3452074664ad07e380e51321b148acebdf20
+SPEEXDSP_VERSION = SpeexDSP-1.2.0
SPEEXDSP_SITE = https://git.xiph.org/speexdsp.git
SPEEXDSP_SITE_METHOD = git
SPEEXDSP_LICENSE = BSD-3-Clause
diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk
index d0a5f82347..6e29a99189 100644
--- a/package/sslh/sslh.mk
+++ b/package/sslh/sslh.mk
@@ -27,6 +27,13 @@ else
SSLH_MAKE_OPTS += USELIBPCRE=
endif
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+SSLH_DEPENDENCIES += systemd
+SSLH_MAKE_OPTS += USESYSTEMD=1
+else
+SSLH_MAKE_OPTS += USESYSTEMD=
+endif
+
define SSLH_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(SSLH_MAKE_OPTS) -C $(@D)
endef
diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash
index fd7ab42224..4356f55849 100644
--- a/package/stress-ng/stress-ng.hash
+++ b/package/stress-ng/stress-ng.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 3430e007c4d27c5d79ff177a209d81acc7d3242dbf28effb05ecb92b32a8a03f stress-ng-0.09.55.tar.xz
+sha256 ea1ba0e96637d7ecc0d2b08c981c4fcb3e7753ca7d64d76210154440b9a194e6 stress-ng-0.09.58.tar.xz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk
index 767af79f25..c5adf99ae5 100644
--- a/package/stress-ng/stress-ng.mk
+++ b/package/stress-ng/stress-ng.mk
@@ -4,7 +4,7 @@
#
################################################################################
-STRESS_NG_VERSION = 0.09.55
+STRESS_NG_VERSION = 0.09.58
STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz
STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng
STRESS_NG_LICENSE = GPL-2.0+
diff --git a/package/swig/swig.hash b/package/swig/swig.hash
index 77c93a96d6..8a3e476c61 100644
--- a/package/swig/swig.hash
+++ b/package/swig/swig.hash
@@ -1,2 +1,5 @@
# Locally computed:
sha256 7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d swig-3.0.12.tar.gz
+sha256 f53abaeed775018d519a1b9615f0ca17894772bd9ca21c2a156bf340ac41c13e LICENSE
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE-GPL
+sha256 7f50d942373a871211c5efee03f3db2f9efd1cff1002b0ef8e3748baa611a5c2 LICENSE-UNIVERSITIES
diff --git a/package/swig/swig.mk b/package/swig/swig.mk
index 157d3a39a6..892b0abe30 100644
--- a/package/swig/swig.mk
+++ b/package/swig/swig.mk
@@ -7,9 +7,9 @@
SWIG_VERSION_MAJOR = 3.0
SWIG_VERSION = $(SWIG_VERSION_MAJOR).12
SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION)
-HOST_SWIG_DEPENDENCIES = host-bison
+HOST_SWIG_DEPENDENCIES = host-bison host-pcre
HOST_SWIG_CONF_OPTS = \
- --without-pcre \
+ --with-pcre \
--disable-ccache \
--without-octave
SWIG_LICENSE = GPL-3.0+, BSD-2-Clause, BSD-3-Clause
diff --git a/package/tcl/0001-dont-build-compat.patch b/package/tcl/0001-dont-build-compat.patch
index 85c5c57df4..c0d5d85da7 100644
--- a/package/tcl/0001-dont-build-compat.patch
+++ b/package/tcl/0001-dont-build-compat.patch
@@ -7,20 +7,13 @@ anything buildroot is using as a standard C library will be good enough
to not have broken behavior.
Signed-off-by: Andrew Ruder <andrew.ruder@elecsyscorp.com>
+[Fabrice: Update for 8.6.9]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
diff --git a/unix/tcl.m4 b/unix/tcl.m4
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
-@@ -2466,7 +2466,7 @@ AC_DEFUN([SC_BUGGY_STRTOD], [
- }
- exit(0);
- }], tcl_cv_strtod_buggy=ok, tcl_cv_strtod_buggy=buggy,
-- tcl_cv_strtod_buggy=buggy)])
-+ tcl_cv_strtod_buggy=ok)])
- if test "$tcl_cv_strtod_buggy" = buggy; then
- AC_LIBOBJ([fixstrtod])
- USE_COMPAT=1
@@ -2725,7 +2725,7 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[
if test ["$tcl_ok"] = 1; then
AC_CACHE_CHECK([proper ]$1[ implementation], [tcl_cv_]$1[_unbroken],
diff --git a/package/tcl/tcl.hash b/package/tcl/tcl.hash
index 359b5433c2..913190b95c 100644
--- a/package/tcl/tcl.hash
+++ b/package/tcl/tcl.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 a265409781e4b3edcc4ef822533071b34c3dc6790b893963809b9fe221befe07 tcl8.6.6-src.tar.gz
+sha256 ad0cd2de2c87b9ba8086b43957a0de3eb2eb565c7159d5f53ccbba3feb915f4e tcl8.6.9-src.tar.gz
sha256 c0a69a2bfd757361ec7e6143973b103c90409316b49e9c88db26ad6388e79f16 license.terms
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index b9fb7afbc6..6d750b3cd2 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -5,7 +5,7 @@
################################################################################
TCL_VERSION_MAJOR = 8.6
-TCL_VERSION = $(TCL_VERSION_MAJOR).6
+TCL_VERSION = $(TCL_VERSION_MAJOR).9
TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz
TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION)
TCL_LICENSE = TCL
diff --git a/package/terminology/terminology.hash b/package/terminology/terminology.hash
index 6b96ed72ad..45885ca301 100644
--- a/package/terminology/terminology.hash
+++ b/package/terminology/terminology.hash
@@ -1,3 +1,3 @@
-# From https://sourceforge.net/p/enlightenment/mailman/message/36626985/
-sha256 ed5904ba5eb11c67790964306ec260b4134e2a443ef5abd5105610d9943b3e60 terminology-1.4.0.tar.xz
+# From https://www.enlightenment.org/news/2019-05-24-terminology-1.4.1
+sha256 d7b8b35fa38cb6a8746435c44f3517c47324d4c8362b35878ec90c9254d9a956 terminology-1.4.1.tar.xz
sha256 a907d434f4691990ed8f2826ff7546672e9934a26c798351da12ed544dadc628 COPYING
diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk
index 09b4e536a9..633daf5a02 100644
--- a/package/terminology/terminology.mk
+++ b/package/terminology/terminology.mk
@@ -4,7 +4,7 @@
#
################################################################################
-TERMINOLOGY_VERSION = 1.4.0
+TERMINOLOGY_VERSION = 1.4.1
TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz
TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology
TERMINOLOGY_LICENSE = BSD-2-Clause
diff --git a/package/udisks/udisks.hash b/package/udisks/udisks.hash
index 7ad4326b1c..b40161e323 100644
--- a/package/udisks/udisks.hash
+++ b/package/udisks/udisks.hash
@@ -1,2 +1,3 @@
# Locally calculated
sha256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 udisks-1.0.5.tar.gz
+sha256 7d30f41a79a9b453b4972a6d7e3425ff104b39232891bde8ba659f1adb21f771 COPYING
diff --git a/package/usbutils/0001-add-gpl-license-files.patch b/package/usbutils/0001-add-gpl-license-files.patch
deleted file mode 100644
index e6e335f14d..0000000000
--- a/package/usbutils/0001-add-gpl-license-files.patch
+++ /dev/null
@@ -1,1030 +0,0 @@
-Add GPL-2.0 and GPL-3.0 license files
-
-This patch is equivalent to upstream commit 747db4bc75e1 (Makefile.am: add
-files with licenses to archive). The license files are in upstream commit, but
-missing from the tar archive.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-
-diff -Nuar usbutils-010.orig/LICENSES/GPL-2.0.txt usbutils-010/LICENSES/GPL-2.0.txt
---- usbutils-010.orig/LICENSES/GPL-2.0.txt 1970-01-01 02:00:00.000000000 +0200
-+++ usbutils-010/LICENSES/GPL-2.0.txt 2018-05-29 14:49:22.351783751 +0300
-@@ -0,0 +1,339 @@
-+ GNU GENERAL PUBLIC LICENSE
-+ Version 2, June 1991
-+
-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+ Preamble
-+
-+ The licenses for most software are designed to take away your
-+freedom to share and change it. By contrast, the GNU General Public
-+License is intended to guarantee your freedom to share and change free
-+software--to make sure the software is free for all its users. This
-+General Public License applies to most of the Free Software
-+Foundation's software and to any other program whose authors commit to
-+using it. (Some other Free Software Foundation software is covered by
-+the GNU Lesser General Public License instead.) You can apply it to
-+your programs, too.
-+
-+ When we speak of free software, we are referring to freedom, not
-+price. Our General Public Licenses are designed to make sure that you
-+have the freedom to distribute copies of free software (and charge for
-+this service if you wish), that you receive source code or can get it
-+if you want it, that you can change the software or use pieces of it
-+in new free programs; and that you know you can do these things.
-+
-+ To protect your rights, we need to make restrictions that forbid
-+anyone to deny you these rights or to ask you to surrender the rights.
-+These restrictions translate to certain responsibilities for you if you
-+distribute copies of the software, or if you modify it.
-+
-+ For example, if you distribute copies of such a program, whether
-+gratis or for a fee, you must give the recipients all the rights that
-+you have. You must make sure that they, too, receive or can get the
-+source code. And you must show them these terms so they know their
-+rights.
-+
-+ We protect your rights with two steps: (1) copyright the software, and
-+(2) offer you this license which gives you legal permission to copy,
-+distribute and/or modify the software.
-+
-+ Also, for each author's protection and ours, we want to make certain
-+that everyone understands that there is no warranty for this free
-+software. If the software is modified by someone else and passed on, we
-+want its recipients to know that what they have is not the original, so
-+that any problems introduced by others will not reflect on the original
-+authors' reputations.
-+
-+ Finally, any free program is threatened constantly by software
-+patents. We wish to avoid the danger that redistributors of a free
-+program will individually obtain patent licenses, in effect making the
-+program proprietary. To prevent this, we have made it clear that any
-+patent must be licensed for everyone's free use or not licensed at all.
-+
-+ The precise terms and conditions for copying, distribution and
-+modification follow.
-+
-+ GNU GENERAL PUBLIC LICENSE
-+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-+
-+ 0. This License applies to any program or other work which contains
-+a notice placed by the copyright holder saying it may be distributed
-+under the terms of this General Public License. The "Program", below,
-+refers to any such program or work, and a "work based on the Program"
-+means either the Program or any derivative work under copyright law:
-+that is to say, a work containing the Program or a portion of it,
-+either verbatim or with modifications and/or translated into another
-+language. (Hereinafter, translation is included without limitation in
-+the term "modification".) Each licensee is addressed as "you".
-+
-+Activities other than copying, distribution and modification are not
-+covered by this License; they are outside its scope. The act of
-+running the Program is not restricted, and the output from the Program
-+is covered only if its contents constitute a work based on the
-+Program (independent of having been made by running the Program).
-+Whether that is true depends on what the Program does.
-+
-+ 1. You may copy and distribute verbatim copies of the Program's
-+source code as you receive it, in any medium, provided that you
-+conspicuously and appropriately publish on each copy an appropriate
-+copyright notice and disclaimer of warranty; keep intact all the
-+notices that refer to this License and to the absence of any warranty;
-+and give any other recipients of the Program a copy of this License
-+along with the Program.
-+
-+You may charge a fee for the physical act of transferring a copy, and
-+you may at your option offer warranty protection in exchange for a fee.
-+
-+ 2. You may modify your copy or copies of the Program or any portion
-+of it, thus forming a work based on the Program, and copy and
-+distribute such modifications or work under the terms of Section 1
-+above, provided that you also meet all of these conditions:
-+
-+ a) You must cause the modified files to carry prominent notices
-+ stating that you changed the files and the date of any change.
-+
-+ b) You must cause any work that you distribute or publish, that in
-+ whole or in part contains or is derived from the Program or any
-+ part thereof, to be licensed as a whole at no charge to all third
-+ parties under the terms of this License.
-+
-+ c) If the modified program normally reads commands interactively
-+ when run, you must cause it, when started running for such
-+ interactive use in the most ordinary way, to print or display an
-+ announcement including an appropriate copyright notice and a
-+ notice that there is no warranty (or else, saying that you provide
-+ a warranty) and that users may redistribute the program under
-+ these conditions, and telling the user how to view a copy of this
-+ License. (Exception: if the Program itself is interactive but
-+ does not normally print such an announcement, your work based on
-+ the Program is not required to print an announcement.)
-+
-+These requirements apply to the modified work as a whole. If
-+identifiable sections of that work are not derived from the Program,
-+and can be reasonably considered independent and separate works in
-+themselves, then this License, and its terms, do not apply to those
-+sections when you distribute them as separate works. But when you
-+distribute the same sections as part of a whole which is a work based
-+on the Program, the distribution of the whole must be on the terms of
-+this License, whose permissions for other licensees extend to the
-+entire whole, and thus to each and every part regardless of who wrote it.
-+
-+Thus, it is not the intent of this section to claim rights or contest
-+your rights to work written entirely by you; rather, the intent is to
-+exercise the right to control the distribution of derivative or
-+collective works based on the Program.
-+
-+In addition, mere aggregation of another work not based on the Program
-+with the Program (or with a work based on the Program) on a volume of
-+a storage or distribution medium does not bring the other work under
-+the scope of this License.
-+
-+ 3. You may copy and distribute the Program (or a work based on it,
-+under Section 2) in object code or executable form under the terms of
-+Sections 1 and 2 above provided that you also do one of the following:
-+
-+ a) Accompany it with the complete corresponding machine-readable
-+ source code, which must be distributed under the terms of Sections
-+ 1 and 2 above on a medium customarily used for software interchange; or,
-+
-+ b) Accompany it with a written offer, valid for at least three
-+ years, to give any third party, for a charge no more than your
-+ cost of physically performing source distribution, a complete
-+ machine-readable copy of the corresponding source code, to be
-+ distributed under the terms of Sections 1 and 2 above on a medium
-+ customarily used for software interchange; or,
-+
-+ c) Accompany it with the information you received as to the offer
-+ to distribute corresponding source code. (This alternative is
-+ allowed only for noncommercial distribution and only if you
-+ received the program in object code or executable form with such
-+ an offer, in accord with Subsection b above.)
-+
-+The source code for a work means the preferred form of the work for
-+making modifications to it. For an executable work, complete source
-+code means all the source code for all modules it contains, plus any
-+associated interface definition files, plus the scripts used to
-+control compilation and installation of the executable. However, as a
-+special exception, the source code distributed need not include
-+anything that is normally distributed (in either source or binary
-+form) with the major components (compiler, kernel, and so on) of the
-+operating system on which the executable runs, unless that component
-+itself accompanies the executable.
-+
-+If distribution of executable or object code is made by offering
-+access to copy from a designated place, then offering equivalent
-+access to copy the source code from the same place counts as
-+distribution of the source code, even though third parties are not
-+compelled to copy the source along with the object code.
-+
-+ 4. You may not copy, modify, sublicense, or distribute the Program
-+except as expressly provided under this License. Any attempt
-+otherwise to copy, modify, sublicense or distribute the Program is
-+void, and will automatically terminate your rights under this License.
-+However, parties who have received copies, or rights, from you under
-+this License will not have their licenses terminated so long as such
-+parties remain in full compliance.
-+
-+ 5. You are not required to accept this License, since you have not
-+signed it. However, nothing else grants you permission to modify or
-+distribute the Program or its derivative works. These actions are
-+prohibited by law if you do not accept this License. Therefore, by
-+modifying or distributing the Program (or any work based on the
-+Program), you indicate your acceptance of this License to do so, and
-+all its terms and conditions for copying, distributing or modifying
-+the Program or works based on it.
-+
-+ 6. Each time you redistribute the Program (or any work based on the
-+Program), the recipient automatically receives a license from the
-+original licensor to copy, distribute or modify the Program subject to
-+these terms and conditions. You may not impose any further
-+restrictions on the recipients' exercise of the rights granted herein.
-+You are not responsible for enforcing compliance by third parties to
-+this License.
-+
-+ 7. If, as a consequence of a court judgment or allegation of patent
-+infringement or for any other reason (not limited to patent issues),
-+conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License. If you cannot
-+distribute so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you
-+may not distribute the Program at all. For example, if a patent
-+license would not permit royalty-free redistribution of the Program by
-+all those who receive copies directly or indirectly through you, then
-+the only way you could satisfy both it and this License would be to
-+refrain entirely from distribution of the Program.
-+
-+If any portion of this section is held invalid or unenforceable under
-+any particular circumstance, the balance of the section is intended to
-+apply and the section as a whole is intended to apply in other
-+circumstances.
-+
-+It is not the purpose of this section to induce you to infringe any
-+patents or other property right claims or to contest validity of any
-+such claims; this section has the sole purpose of protecting the
-+integrity of the free software distribution system, which is
-+implemented by public license practices. Many people have made
-+generous contributions to the wide range of software distributed
-+through that system in reliance on consistent application of that
-+system; it is up to the author/donor to decide if he or she is willing
-+to distribute software through any other system and a licensee cannot
-+impose that choice.
-+
-+This section is intended to make thoroughly clear what is believed to
-+be a consequence of the rest of this License.
-+
-+ 8. If the distribution and/or use of the Program is restricted in
-+certain countries either by patents or by copyrighted interfaces, the
-+original copyright holder who places the Program under this License
-+may add an explicit geographical distribution limitation excluding
-+those countries, so that distribution is permitted only in or among
-+countries not thus excluded. In such case, this License incorporates
-+the limitation as if written in the body of this License.
-+
-+ 9. The Free Software Foundation may publish revised and/or new versions
-+of the General Public License from time to time. Such new versions will
-+be similar in spirit to the present version, but may differ in detail to
-+address new problems or concerns.
-+
-+Each version is given a distinguishing version number. If the Program
-+specifies a version number of this License which applies to it and "any
-+later version", you have the option of following the terms and conditions
-+either of that version or of any later version published by the Free
-+Software Foundation. If the Program does not specify a version number of
-+this License, you may choose any version ever published by the Free Software
-+Foundation.
-+
-+ 10. If you wish to incorporate parts of the Program into other free
-+programs whose distribution conditions are different, write to the author
-+to ask for permission. For software which is copyrighted by the Free
-+Software Foundation, write to the Free Software Foundation; we sometimes
-+make exceptions for this. Our decision will be guided by the two goals
-+of preserving the free status of all derivatives of our free software and
-+of promoting the sharing and reuse of software generally.
-+
-+ NO WARRANTY
-+
-+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-+REPAIR OR CORRECTION.
-+
-+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-+POSSIBILITY OF SUCH DAMAGES.
-+
-+ END OF TERMS AND CONDITIONS
-+
-+ How to Apply These Terms to Your New Programs
-+
-+ If you develop a new program, and you want it to be of the greatest
-+possible use to the public, the best way to achieve this is to make it
-+free software which everyone can redistribute and change under these terms.
-+
-+ To do so, attach the following notices to the program. It is safest
-+to attach them to the start of each source file to most effectively
-+convey the exclusion of warranty; and each file should have at least
-+the "copyright" line and a pointer to where the full notice is found.
-+
-+ <one line to give the program's name and a brief idea of what it does.>
-+ Copyright (C) <year> <name of author>
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License along
-+ with this program; if not, write to the Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+
-+Also add information on how to contact you by electronic and paper mail.
-+
-+If the program is interactive, make it output a short notice like this
-+when it starts in an interactive mode:
-+
-+ Gnomovision version 69, Copyright (C) year name of author
-+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-+ This is free software, and you are welcome to redistribute it
-+ under certain conditions; type `show c' for details.
-+
-+The hypothetical commands `show w' and `show c' should show the appropriate
-+parts of the General Public License. Of course, the commands you use may
-+be called something other than `show w' and `show c'; they could even be
-+mouse-clicks or menu items--whatever suits your program.
-+
-+You should also get your employer (if you work as a programmer) or your
-+school, if any, to sign a "copyright disclaimer" for the program, if
-+necessary. Here is a sample; alter the names:
-+
-+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
-+
-+ <signature of Ty Coon>, 1 April 1989
-+ Ty Coon, President of Vice
-+
-+This General Public License does not permit incorporating your program into
-+proprietary programs. If your program is a subroutine library, you may
-+consider it more useful to permit linking proprietary applications with the
-+library. If this is what you want to do, use the GNU Lesser General
-+Public License instead of this License.
-diff -Nuar usbutils-010.orig/LICENSES/GPL-3.0.txt usbutils-010/LICENSES/GPL-3.0.txt
---- usbutils-010.orig/LICENSES/GPL-3.0.txt 1970-01-01 02:00:00.000000000 +0200
-+++ usbutils-010/LICENSES/GPL-3.0.txt 2018-05-29 15:21:15.923738330 +0300
-@@ -0,0 +1,674 @@
-+ GNU GENERAL PUBLIC LICENSE
-+ Version 3, 29 June 2007
-+
-+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+ Preamble
-+
-+ The GNU General Public License is a free, copyleft license for
-+software and other kinds of works.
-+
-+ The licenses for most software and other practical works are designed
-+to take away your freedom to share and change the works. By contrast,
-+the GNU General Public License is intended to guarantee your freedom to
-+share and change all versions of a program--to make sure it remains free
-+software for all its users. We, the Free Software Foundation, use the
-+GNU General Public License for most of our software; it applies also to
-+any other work released this way by its authors. You can apply it to
-+your programs, too.
-+
-+ When we speak of free software, we are referring to freedom, not
-+price. Our General Public Licenses are designed to make sure that you
-+have the freedom to distribute copies of free software (and charge for
-+them if you wish), that you receive source code or can get it if you
-+want it, that you can change the software or use pieces of it in new
-+free programs, and that you know you can do these things.
-+
-+ To protect your rights, we need to prevent others from denying you
-+these rights or asking you to surrender the rights. Therefore, you have
-+certain responsibilities if you distribute copies of the software, or if
-+you modify it: responsibilities to respect the freedom of others.
-+
-+ For example, if you distribute copies of such a program, whether
-+gratis or for a fee, you must pass on to the recipients the same
-+freedoms that you received. You must make sure that they, too, receive
-+or can get the source code. And you must show them these terms so they
-+know their rights.
-+
-+ Developers that use the GNU GPL protect your rights with two steps:
-+(1) assert copyright on the software, and (2) offer you this License
-+giving you legal permission to copy, distribute and/or modify it.
-+
-+ For the developers' and authors' protection, the GPL clearly explains
-+that there is no warranty for this free software. For both users' and
-+authors' sake, the GPL requires that modified versions be marked as
-+changed, so that their problems will not be attributed erroneously to
-+authors of previous versions.
-+
-+ Some devices are designed to deny users access to install or run
-+modified versions of the software inside them, although the manufacturer
-+can do so. This is fundamentally incompatible with the aim of
-+protecting users' freedom to change the software. The systematic
-+pattern of such abuse occurs in the area of products for individuals to
-+use, which is precisely where it is most unacceptable. Therefore, we
-+have designed this version of the GPL to prohibit the practice for those
-+products. If such problems arise substantially in other domains, we
-+stand ready to extend this provision to those domains in future versions
-+of the GPL, as needed to protect the freedom of users.
-+
-+ Finally, every program is threatened constantly by software patents.
-+States should not allow patents to restrict development and use of
-+software on general-purpose computers, but in those that do, we wish to
-+avoid the special danger that patents applied to a free program could
-+make it effectively proprietary. To prevent this, the GPL assures that
-+patents cannot be used to render the program non-free.
-+
-+ The precise terms and conditions for copying, distribution and
-+modification follow.
-+
-+ TERMS AND CONDITIONS
-+
-+ 0. Definitions.
-+
-+ "This License" refers to version 3 of the GNU General Public License.
-+
-+ "Copyright" also means copyright-like laws that apply to other kinds of
-+works, such as semiconductor masks.
-+
-+ "The Program" refers to any copyrightable work licensed under this
-+License. Each licensee is addressed as "you". "Licensees" and
-+"recipients" may be individuals or organizations.
-+
-+ To "modify" a work means to copy from or adapt all or part of the work
-+in a fashion requiring copyright permission, other than the making of an
-+exact copy. The resulting work is called a "modified version" of the
-+earlier work or a work "based on" the earlier work.
-+
-+ A "covered work" means either the unmodified Program or a work based
-+on the Program.
-+
-+ To "propagate" a work means to do anything with it that, without
-+permission, would make you directly or secondarily liable for
-+infringement under applicable copyright law, except executing it on a
-+computer or modifying a private copy. Propagation includes copying,
-+distribution (with or without modification), making available to the
-+public, and in some countries other activities as well.
-+
-+ To "convey" a work means any kind of propagation that enables other
-+parties to make or receive copies. Mere interaction with a user through
-+a computer network, with no transfer of a copy, is not conveying.
-+
-+ An interactive user interface displays "Appropriate Legal Notices"
-+to the extent that it includes a convenient and prominently visible
-+feature that (1) displays an appropriate copyright notice, and (2)
-+tells the user that there is no warranty for the work (except to the
-+extent that warranties are provided), that licensees may convey the
-+work under this License, and how to view a copy of this License. If
-+the interface presents a list of user commands or options, such as a
-+menu, a prominent item in the list meets this criterion.
-+
-+ 1. Source Code.
-+
-+ The "source code" for a work means the preferred form of the work
-+for making modifications to it. "Object code" means any non-source
-+form of a work.
-+
-+ A "Standard Interface" means an interface that either is an official
-+standard defined by a recognized standards body, or, in the case of
-+interfaces specified for a particular programming language, one that
-+is widely used among developers working in that language.
-+
-+ The "System Libraries" of an executable work include anything, other
-+than the work as a whole, that (a) is included in the normal form of
-+packaging a Major Component, but which is not part of that Major
-+Component, and (b) serves only to enable use of the work with that
-+Major Component, or to implement a Standard Interface for which an
-+implementation is available to the public in source code form. A
-+"Major Component", in this context, means a major essential component
-+(kernel, window system, and so on) of the specific operating system
-+(if any) on which the executable work runs, or a compiler used to
-+produce the work, or an object code interpreter used to run it.
-+
-+ The "Corresponding Source" for a work in object code form means all
-+the source code needed to generate, install, and (for an executable
-+work) run the object code and to modify the work, including scripts to
-+control those activities. However, it does not include the work's
-+System Libraries, or general-purpose tools or generally available free
-+programs which are used unmodified in performing those activities but
-+which are not part of the work. For example, Corresponding Source
-+includes interface definition files associated with source files for
-+the work, and the source code for shared libraries and dynamically
-+linked subprograms that the work is specifically designed to require,
-+such as by intimate data communication or control flow between those
-+subprograms and other parts of the work.
-+
-+ The Corresponding Source need not include anything that users
-+can regenerate automatically from other parts of the Corresponding
-+Source.
-+
-+ The Corresponding Source for a work in source code form is that
-+same work.
-+
-+ 2. Basic Permissions.
-+
-+ All rights granted under this License are granted for the term of
-+copyright on the Program, and are irrevocable provided the stated
-+conditions are met. This License explicitly affirms your unlimited
-+permission to run the unmodified Program. The output from running a
-+covered work is covered by this License only if the output, given its
-+content, constitutes a covered work. This License acknowledges your
-+rights of fair use or other equivalent, as provided by copyright law.
-+
-+ You may make, run and propagate covered works that you do not
-+convey, without conditions so long as your license otherwise remains
-+in force. You may convey covered works to others for the sole purpose
-+of having them make modifications exclusively for you, or provide you
-+with facilities for running those works, provided that you comply with
-+the terms of this License in conveying all material for which you do
-+not control copyright. Those thus making or running the covered works
-+for you must do so exclusively on your behalf, under your direction
-+and control, on terms that prohibit them from making any copies of
-+your copyrighted material outside their relationship with you.
-+
-+ Conveying under any other circumstances is permitted solely under
-+the conditions stated below. Sublicensing is not allowed; section 10
-+makes it unnecessary.
-+
-+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-+
-+ No covered work shall be deemed part of an effective technological
-+measure under any applicable law fulfilling obligations under article
-+11 of the WIPO copyright treaty adopted on 20 December 1996, or
-+similar laws prohibiting or restricting circumvention of such
-+measures.
-+
-+ When you convey a covered work, you waive any legal power to forbid
-+circumvention of technological measures to the extent such circumvention
-+is effected by exercising rights under this License with respect to
-+the covered work, and you disclaim any intention to limit operation or
-+modification of the work as a means of enforcing, against the work's
-+users, your or third parties' legal rights to forbid circumvention of
-+technological measures.
-+
-+ 4. Conveying Verbatim Copies.
-+
-+ You may convey verbatim copies of the Program's source code as you
-+receive it, in any medium, provided that you conspicuously and
-+appropriately publish on each copy an appropriate copyright notice;
-+keep intact all notices stating that this License and any
-+non-permissive terms added in accord with section 7 apply to the code;
-+keep intact all notices of the absence of any warranty; and give all
-+recipients a copy of this License along with the Program.
-+
-+ You may charge any price or no price for each copy that you convey,
-+and you may offer support or warranty protection for a fee.
-+
-+ 5. Conveying Modified Source Versions.
-+
-+ You may convey a work based on the Program, or the modifications to
-+produce it from the Program, in the form of source code under the
-+terms of section 4, provided that you also meet all of these conditions:
-+
-+ a) The work must carry prominent notices stating that you modified
-+ it, and giving a relevant date.
-+
-+ b) The work must carry prominent notices stating that it is
-+ released under this License and any conditions added under section
-+ 7. This requirement modifies the requirement in section 4 to
-+ "keep intact all notices".
-+
-+ c) You must license the entire work, as a whole, under this
-+ License to anyone who comes into possession of a copy. This
-+ License will therefore apply, along with any applicable section 7
-+ additional terms, to the whole of the work, and all its parts,
-+ regardless of how they are packaged. This License gives no
-+ permission to license the work in any other way, but it does not
-+ invalidate such permission if you have separately received it.
-+
-+ d) If the work has interactive user interfaces, each must display
-+ Appropriate Legal Notices; however, if the Program has interactive
-+ interfaces that do not display Appropriate Legal Notices, your
-+ work need not make them do so.
-+
-+ A compilation of a covered work with other separate and independent
-+works, which are not by their nature extensions of the covered work,
-+and which are not combined with it such as to form a larger program,
-+in or on a volume of a storage or distribution medium, is called an
-+"aggregate" if the compilation and its resulting copyright are not
-+used to limit the access or legal rights of the compilation's users
-+beyond what the individual works permit. Inclusion of a covered work
-+in an aggregate does not cause this License to apply to the other
-+parts of the aggregate.
-+
-+ 6. Conveying Non-Source Forms.
-+
-+ You may convey a covered work in object code form under the terms
-+of sections 4 and 5, provided that you also convey the
-+machine-readable Corresponding Source under the terms of this License,
-+in one of these ways:
-+
-+ a) Convey the object code in, or embodied in, a physical product
-+ (including a physical distribution medium), accompanied by the
-+ Corresponding Source fixed on a durable physical medium
-+ customarily used for software interchange.
-+
-+ b) Convey the object code in, or embodied in, a physical product
-+ (including a physical distribution medium), accompanied by a
-+ written offer, valid for at least three years and valid for as
-+ long as you offer spare parts or customer support for that product
-+ model, to give anyone who possesses the object code either (1) a
-+ copy of the Corresponding Source for all the software in the
-+ product that is covered by this License, on a durable physical
-+ medium customarily used for software interchange, for a price no
-+ more than your reasonable cost of physically performing this
-+ conveying of source, or (2) access to copy the
-+ Corresponding Source from a network server at no charge.
-+
-+ c) Convey individual copies of the object code with a copy of the
-+ written offer to provide the Corresponding Source. This
-+ alternative is allowed only occasionally and noncommercially, and
-+ only if you received the object code with such an offer, in accord
-+ with subsection 6b.
-+
-+ d) Convey the object code by offering access from a designated
-+ place (gratis or for a charge), and offer equivalent access to the
-+ Corresponding Source in the same way through the same place at no
-+ further charge. You need not require recipients to copy the
-+ Corresponding Source along with the object code. If the place to
-+ copy the object code is a network server, the Corresponding Source
-+ may be on a different server (operated by you or a third party)
-+ that supports equivalent copying facilities, provided you maintain
-+ clear directions next to the object code saying where to find the
-+ Corresponding Source. Regardless of what server hosts the
-+ Corresponding Source, you remain obligated to ensure that it is
-+ available for as long as needed to satisfy these requirements.
-+
-+ e) Convey the object code using peer-to-peer transmission, provided
-+ you inform other peers where the object code and Corresponding
-+ Source of the work are being offered to the general public at no
-+ charge under subsection 6d.
-+
-+ A separable portion of the object code, whose source code is excluded
-+from the Corresponding Source as a System Library, need not be
-+included in conveying the object code work.
-+
-+ A "User Product" is either (1) a "consumer product", which means any
-+tangible personal property which is normally used for personal, family,
-+or household purposes, or (2) anything designed or sold for incorporation
-+into a dwelling. In determining whether a product is a consumer product,
-+doubtful cases shall be resolved in favor of coverage. For a particular
-+product received by a particular user, "normally used" refers to a
-+typical or common use of that class of product, regardless of the status
-+of the particular user or of the way in which the particular user
-+actually uses, or expects or is expected to use, the product. A product
-+is a consumer product regardless of whether the product has substantial
-+commercial, industrial or non-consumer uses, unless such uses represent
-+the only significant mode of use of the product.
-+
-+ "Installation Information" for a User Product means any methods,
-+procedures, authorization keys, or other information required to install
-+and execute modified versions of a covered work in that User Product from
-+a modified version of its Corresponding Source. The information must
-+suffice to ensure that the continued functioning of the modified object
-+code is in no case prevented or interfered with solely because
-+modification has been made.
-+
-+ If you convey an object code work under this section in, or with, or
-+specifically for use in, a User Product, and the conveying occurs as
-+part of a transaction in which the right of possession and use of the
-+User Product is transferred to the recipient in perpetuity or for a
-+fixed term (regardless of how the transaction is characterized), the
-+Corresponding Source conveyed under this section must be accompanied
-+by the Installation Information. But this requirement does not apply
-+if neither you nor any third party retains the ability to install
-+modified object code on the User Product (for example, the work has
-+been installed in ROM).
-+
-+ The requirement to provide Installation Information does not include a
-+requirement to continue to provide support service, warranty, or updates
-+for a work that has been modified or installed by the recipient, or for
-+the User Product in which it has been modified or installed. Access to a
-+network may be denied when the modification itself materially and
-+adversely affects the operation of the network or violates the rules and
-+protocols for communication across the network.
-+
-+ Corresponding Source conveyed, and Installation Information provided,
-+in accord with this section must be in a format that is publicly
-+documented (and with an implementation available to the public in
-+source code form), and must require no special password or key for
-+unpacking, reading or copying.
-+
-+ 7. Additional Terms.
-+
-+ "Additional permissions" are terms that supplement the terms of this
-+License by making exceptions from one or more of its conditions.
-+Additional permissions that are applicable to the entire Program shall
-+be treated as though they were included in this License, to the extent
-+that they are valid under applicable law. If additional permissions
-+apply only to part of the Program, that part may be used separately
-+under those permissions, but the entire Program remains governed by
-+this License without regard to the additional permissions.
-+
-+ When you convey a copy of a covered work, you may at your option
-+remove any additional permissions from that copy, or from any part of
-+it. (Additional permissions may be written to require their own
-+removal in certain cases when you modify the work.) You may place
-+additional permissions on material, added by you to a covered work,
-+for which you have or can give appropriate copyright permission.
-+
-+ Notwithstanding any other provision of this License, for material you
-+add to a covered work, you may (if authorized by the copyright holders of
-+that material) supplement the terms of this License with terms:
-+
-+ a) Disclaiming warranty or limiting liability differently from the
-+ terms of sections 15 and 16 of this License; or
-+
-+ b) Requiring preservation of specified reasonable legal notices or
-+ author attributions in that material or in the Appropriate Legal
-+ Notices displayed by works containing it; or
-+
-+ c) Prohibiting misrepresentation of the origin of that material, or
-+ requiring that modified versions of such material be marked in
-+ reasonable ways as different from the original version; or
-+
-+ d) Limiting the use for publicity purposes of names of licensors or
-+ authors of the material; or
-+
-+ e) Declining to grant rights under trademark law for use of some
-+ trade names, trademarks, or service marks; or
-+
-+ f) Requiring indemnification of licensors and authors of that
-+ material by anyone who conveys the material (or modified versions of
-+ it) with contractual assumptions of liability to the recipient, for
-+ any liability that these contractual assumptions directly impose on
-+ those licensors and authors.
-+
-+ All other non-permissive additional terms are considered "further
-+restrictions" within the meaning of section 10. If the Program as you
-+received it, or any part of it, contains a notice stating that it is
-+governed by this License along with a term that is a further
-+restriction, you may remove that term. If a license document contains
-+a further restriction but permits relicensing or conveying under this
-+License, you may add to a covered work material governed by the terms
-+of that license document, provided that the further restriction does
-+not survive such relicensing or conveying.
-+
-+ If you add terms to a covered work in accord with this section, you
-+must place, in the relevant source files, a statement of the
-+additional terms that apply to those files, or a notice indicating
-+where to find the applicable terms.
-+
-+ Additional terms, permissive or non-permissive, may be stated in the
-+form of a separately written license, or stated as exceptions;
-+the above requirements apply either way.
-+
-+ 8. Termination.
-+
-+ You may not propagate or modify a covered work except as expressly
-+provided under this License. Any attempt otherwise to propagate or
-+modify it is void, and will automatically terminate your rights under
-+this License (including any patent licenses granted under the third
-+paragraph of section 11).
-+
-+ However, if you cease all violation of this License, then your
-+license from a particular copyright holder is reinstated (a)
-+provisionally, unless and until the copyright holder explicitly and
-+finally terminates your license, and (b) permanently, if the copyright
-+holder fails to notify you of the violation by some reasonable means
-+prior to 60 days after the cessation.
-+
-+ Moreover, your license from a particular copyright holder is
-+reinstated permanently if the copyright holder notifies you of the
-+violation by some reasonable means, this is the first time you have
-+received notice of violation of this License (for any work) from that
-+copyright holder, and you cure the violation prior to 30 days after
-+your receipt of the notice.
-+
-+ Termination of your rights under this section does not terminate the
-+licenses of parties who have received copies or rights from you under
-+this License. If your rights have been terminated and not permanently
-+reinstated, you do not qualify to receive new licenses for the same
-+material under section 10.
-+
-+ 9. Acceptance Not Required for Having Copies.
-+
-+ You are not required to accept this License in order to receive or
-+run a copy of the Program. Ancillary propagation of a covered work
-+occurring solely as a consequence of using peer-to-peer transmission
-+to receive a copy likewise does not require acceptance. However,
-+nothing other than this License grants you permission to propagate or
-+modify any covered work. These actions infringe copyright if you do
-+not accept this License. Therefore, by modifying or propagating a
-+covered work, you indicate your acceptance of this License to do so.
-+
-+ 10. Automatic Licensing of Downstream Recipients.
-+
-+ Each time you convey a covered work, the recipient automatically
-+receives a license from the original licensors, to run, modify and
-+propagate that work, subject to this License. You are not responsible
-+for enforcing compliance by third parties with this License.
-+
-+ An "entity transaction" is a transaction transferring control of an
-+organization, or substantially all assets of one, or subdividing an
-+organization, or merging organizations. If propagation of a covered
-+work results from an entity transaction, each party to that
-+transaction who receives a copy of the work also receives whatever
-+licenses to the work the party's predecessor in interest had or could
-+give under the previous paragraph, plus a right to possession of the
-+Corresponding Source of the work from the predecessor in interest, if
-+the predecessor has it or can get it with reasonable efforts.
-+
-+ You may not impose any further restrictions on the exercise of the
-+rights granted or affirmed under this License. For example, you may
-+not impose a license fee, royalty, or other charge for exercise of
-+rights granted under this License, and you may not initiate litigation
-+(including a cross-claim or counterclaim in a lawsuit) alleging that
-+any patent claim is infringed by making, using, selling, offering for
-+sale, or importing the Program or any portion of it.
-+
-+ 11. Patents.
-+
-+ A "contributor" is a copyright holder who authorizes use under this
-+License of the Program or a work on which the Program is based. The
-+work thus licensed is called the contributor's "contributor version".
-+
-+ A contributor's "essential patent claims" are all patent claims
-+owned or controlled by the contributor, whether already acquired or
-+hereafter acquired, that would be infringed by some manner, permitted
-+by this License, of making, using, or selling its contributor version,
-+but do not include claims that would be infringed only as a
-+consequence of further modification of the contributor version. For
-+purposes of this definition, "control" includes the right to grant
-+patent sublicenses in a manner consistent with the requirements of
-+this License.
-+
-+ Each contributor grants you a non-exclusive, worldwide, royalty-free
-+patent license under the contributor's essential patent claims, to
-+make, use, sell, offer for sale, import and otherwise run, modify and
-+propagate the contents of its contributor version.
-+
-+ In the following three paragraphs, a "patent license" is any express
-+agreement or commitment, however denominated, not to enforce a patent
-+(such as an express permission to practice a patent or covenant not to
-+sue for patent infringement). To "grant" such a patent license to a
-+party means to make such an agreement or commitment not to enforce a
-+patent against the party.
-+
-+ If you convey a covered work, knowingly relying on a patent license,
-+and the Corresponding Source of the work is not available for anyone
-+to copy, free of charge and under the terms of this License, through a
-+publicly available network server or other readily accessible means,
-+then you must either (1) cause the Corresponding Source to be so
-+available, or (2) arrange to deprive yourself of the benefit of the
-+patent license for this particular work, or (3) arrange, in a manner
-+consistent with the requirements of this License, to extend the patent
-+license to downstream recipients. "Knowingly relying" means you have
-+actual knowledge that, but for the patent license, your conveying the
-+covered work in a country, or your recipient's use of the covered work
-+in a country, would infringe one or more identifiable patents in that
-+country that you have reason to believe are valid.
-+
-+ If, pursuant to or in connection with a single transaction or
-+arrangement, you convey, or propagate by procuring conveyance of, a
-+covered work, and grant a patent license to some of the parties
-+receiving the covered work authorizing them to use, propagate, modify
-+or convey a specific copy of the covered work, then the patent license
-+you grant is automatically extended to all recipients of the covered
-+work and works based on it.
-+
-+ A patent license is "discriminatory" if it does not include within
-+the scope of its coverage, prohibits the exercise of, or is
-+conditioned on the non-exercise of one or more of the rights that are
-+specifically granted under this License. You may not convey a covered
-+work if you are a party to an arrangement with a third party that is
-+in the business of distributing software, under which you make payment
-+to the third party based on the extent of your activity of conveying
-+the work, and under which the third party grants, to any of the
-+parties who would receive the covered work from you, a discriminatory
-+patent license (a) in connection with copies of the covered work
-+conveyed by you (or copies made from those copies), or (b) primarily
-+for and in connection with specific products or compilations that
-+contain the covered work, unless you entered into that arrangement,
-+or that patent license was granted, prior to 28 March 2007.
-+
-+ Nothing in this License shall be construed as excluding or limiting
-+any implied license or other defenses to infringement that may
-+otherwise be available to you under applicable patent law.
-+
-+ 12. No Surrender of Others' Freedom.
-+
-+ If conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License. If you cannot convey a
-+covered work so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you may
-+not convey it at all. For example, if you agree to terms that obligate you
-+to collect a royalty for further conveying from those to whom you convey
-+the Program, the only way you could satisfy both those terms and this
-+License would be to refrain entirely from conveying the Program.
-+
-+ 13. Use with the GNU Affero General Public License.
-+
-+ Notwithstanding any other provision of this License, you have
-+permission to link or combine any covered work with a work licensed
-+under version 3 of the GNU Affero General Public License into a single
-+combined work, and to convey the resulting work. The terms of this
-+License will continue to apply to the part which is the covered work,
-+but the special requirements of the GNU Affero General Public License,
-+section 13, concerning interaction through a network will apply to the
-+combination as such.
-+
-+ 14. Revised Versions of this License.
-+
-+ The Free Software Foundation may publish revised and/or new versions of
-+the GNU General Public License from time to time. Such new versions will
-+be similar in spirit to the present version, but may differ in detail to
-+address new problems or concerns.
-+
-+ Each version is given a distinguishing version number. If the
-+Program specifies that a certain numbered version of the GNU General
-+Public License "or any later version" applies to it, you have the
-+option of following the terms and conditions either of that numbered
-+version or of any later version published by the Free Software
-+Foundation. If the Program does not specify a version number of the
-+GNU General Public License, you may choose any version ever published
-+by the Free Software Foundation.
-+
-+ If the Program specifies that a proxy can decide which future
-+versions of the GNU General Public License can be used, that proxy's
-+public statement of acceptance of a version permanently authorizes you
-+to choose that version for the Program.
-+
-+ Later license versions may give you additional or different
-+permissions. However, no additional obligations are imposed on any
-+author or copyright holder as a result of your choosing to follow a
-+later version.
-+
-+ 15. Disclaimer of Warranty.
-+
-+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-+
-+ 16. Limitation of Liability.
-+
-+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGES.
-+
-+ 17. Interpretation of Sections 15 and 16.
-+
-+ If the disclaimer of warranty and limitation of liability provided
-+above cannot be given local legal effect according to their terms,
-+reviewing courts shall apply local law that most closely approximates
-+an absolute waiver of all civil liability in connection with the
-+Program, unless a warranty or assumption of liability accompanies a
-+copy of the Program in return for a fee.
-+
-+ END OF TERMS AND CONDITIONS
-+
-+ How to Apply These Terms to Your New Programs
-+
-+ If you develop a new program, and you want it to be of the greatest
-+possible use to the public, the best way to achieve this is to make it
-+free software which everyone can redistribute and change under these terms.
-+
-+ To do so, attach the following notices to the program. It is safest
-+to attach them to the start of each source file to most effectively
-+state the exclusion of warranty; and each file should have at least
-+the "copyright" line and a pointer to where the full notice is found.
-+
-+ <one line to give the program's name and a brief idea of what it does.>
-+ Copyright (C) <year> <name of author>
-+
-+ 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/>.
-+
-+Also add information on how to contact you by electronic and paper mail.
-+
-+ If the program does terminal interaction, make it output a short
-+notice like this when it starts in an interactive mode:
-+
-+ <program> Copyright (C) <year> <name of author>
-+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-+ This is free software, and you are welcome to redistribute it
-+ under certain conditions; type `show c' for details.
-+
-+The hypothetical commands `show w' and `show c' should show the appropriate
-+parts of the General Public License. Of course, your program's commands
-+might be different; for a GUI interface, you would use an "about box".
-+
-+ You should also get your employer (if you work as a programmer) or school,
-+if any, to sign a "copyright disclaimer" for the program, if necessary.
-+For more information on this, and how to apply and follow the GNU GPL, see
-+<https://www.gnu.org/licenses/>.
-+
-+ The GNU General Public License does not permit incorporating your program
-+into proprietary programs. If your program is a subroutine library, you
-+may consider it more useful to permit linking proprietary applications with
-+the library. If this is what you want to do, use the GNU Lesser General
-+Public License instead of this License. But first, please read
-+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/package/usbutils/usbutils.hash b/package/usbutils/usbutils.hash
index 3bdb657f81..4404913193 100644
--- a/package/usbutils/usbutils.hash
+++ b/package/usbutils/usbutils.hash
@@ -1,5 +1,5 @@
# From https://www.kernel.org/pub/linux/utils/usb/usbutils/sha256sums.asc
-sha256 61c7364bb4986fb05e5067e4ac5585b1299b664c57f761caecd2e9e724794a19 usbutils-010.tar.xz
+sha256 88634625f91840bc1993d2731cc081ee8d3b13d56069a95bdd6ac6ef0e063e46 usbutils-012.tar.xz
# Locally calculated
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0.txt
sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0.txt
diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index 4bd12f34ff..2389386e50 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -4,12 +4,14 @@
#
################################################################################
-USBUTILS_VERSION = 010
+USBUTILS_VERSION = 012
USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz
USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils
USBUTILS_DEPENDENCIES = host-pkgconf libusb udev
USBUTILS_LICENSE = GPL-2.0+ (utils) GPL-2.0 or GPL-3.0 (lsusb.py)
USBUTILS_LICENSE_FILES = LICENSES/GPL-2.0.txt LICENSES/GPL-3.0.txt
+# Missing configure script
+USBUTILS_AUTORECONF = YES
# Nice lsusb.py script only if there's python 3.x
ifeq ($(BR2_PACKAGE_PYTHON3),)
@@ -20,10 +22,4 @@ endef
USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_PYTHON
endif
-define USBUTILS_TARGET_CLEANUP
- rm -f $(TARGET_DIR)/usr/bin/usb-devices
-endef
-
-USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_TARGET_CLEANUP
-
$(eval $(autotools-package))
diff --git a/package/ustr/ustr.hash b/package/ustr/ustr.hash
index 878c607332..a917b0f18f 100644
--- a/package/ustr/ustr.hash
+++ b/package/ustr/ustr.hash
@@ -1,4 +1,9 @@
# Locally computed
sha256 3daf6eae9f78de1e872c0b2b83cce35515b94d4bb8a074e48f331fd99e1fc2c4 ustr-1.0.4.tar.bz2
+sha256 d90681590c012d4bdb2ee98752a6638bbccb4be7a1f1753e9fce86bbb291dc24 LICENSE
+sha256 2a52acaf526a89bb2da713d38328d5fb2e19b1227a14181d4a37c7c188bb05f9 LICENSE_BSD
+sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 LICENSE_LGPL
+sha256 d7b9a61065e7c63e4854644779d69098b988a3e3d6ef804d41da5f18b69b2fb9 LICENSE_MIT
+
# From http://debian.gtisc.gatech.edu/debian/pool/main/u/ustr/ustr_1.0.4-6.dsc
sha256 75aa6be2c70eba632ac63078e55ecb4b5a45e6624501a8ed6d81b9a2014d149e ustr_1.0.4-6.debian.tar.xz
diff --git a/package/wireless_tools/wireless_tools.hash b/package/wireless_tools/wireless_tools.hash
index 587c9772ef..50a3f62b84 100644
--- a/package/wireless_tools/wireless_tools.hash
+++ b/package/wireless_tools/wireless_tools.hash
@@ -1,2 +1,3 @@
# locally computed hash
sha256 abd9c5c98abf1fdd11892ac2f8a56737544fe101e1be27c6241a564948f34c63 wireless_tools.30.pre9.tar.gz
+sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
diff --git a/package/wpebackend-fdo/0001-Improve-how-CMake-looks-for-wayland-scanner.patch b/package/wpebackend-fdo/0001-Improve-how-CMake-looks-for-wayland-scanner.patch
new file mode 100644
index 0000000000..d83902c662
--- /dev/null
+++ b/package/wpebackend-fdo/0001-Improve-how-CMake-looks-for-wayland-scanner.patch
@@ -0,0 +1,137 @@
+From a03431fb562176d25919e76e0baf52a0ba3752c4 Mon Sep 17 00:00:00 2001
+From: Adrian Perez de Castro <aperez@igalia.com>
+Date: Wed, 15 May 2019 20:54:10 +0300
+Subject: [PATCH] Improve how CMake looks for wayland-scanner
+
+This improves FindWaylandScanner.cmake to allow it to find the
+wayland-scanner tool in any of the following ways (in order of
+preference):
+
+ 1. By passing -DWAYLAND_SCANNER=path/to/wayland-scanner to CMake.
+ 2. Looking for wayland-scanner in the current $PATH
+ 3. Figuring out the location from pkg-config (as before).
+
+This will make the package friendlier to cross-compilation, and
+then build systems can either prepend their locations for host
+tools to $PATH (covered by 2. above), or they can specify the
+tool path in the command line (covered by 1. above) if they need
+to be more specific.
+
+The motivation for this patch is to avoid kludges like the following:
+
+ https://patchwork.ozlabs.org/comment/2172010/
+
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+[Upstream status: https://github.com/Igalia/WPEBackend-fdo/pull/39]
+
+---
+ cmake/FindWaylandScanner.cmake | 93 ++++++++++++++++++++++++++++++----
+ 1 file changed, 84 insertions(+), 9 deletions(-)
+
+diff --git a/cmake/FindWaylandScanner.cmake b/cmake/FindWaylandScanner.cmake
+index 09a92b2..7130c10 100644
+--- a/cmake/FindWaylandScanner.cmake
++++ b/cmake/FindWaylandScanner.cmake
+@@ -28,15 +28,90 @@
+ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-find_package(PkgConfig)
+-pkg_check_modules(WAYLAND_SCANNER wayland-scanner)
+-
+-pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
+-if (WAYLAND_SCANNER_VERSION VERSION_LESS "1.15")
+- set(WAYLAND_SCANNER_CODE_ARG "code")
+-else ()
+- set(WAYLAND_SCANNER_CODE_ARG "private-code")
++set(WAYLAND_SCANNER "" CACHE FILEPATH "Path to the wayland-scanner tool")
++
++function(wayland_scanner_get_version _result _exepath)
++ set(_version "")
++ set(_status -1)
++ if (EXISTS "${_exepath}")
++ execute_process(
++ COMMAND "${_exepath}" "--version"
++ RESULT_VARIABLE _status
++ ERROR_VARIABLE _version
++ ERROR_STRIP_TRAILING_WHITESPACE
++ OUTPUT_QUIET
++ )
++ if (_status EQUAL 0)
++ string(REPLACE "wayland-scanner" "" _version "${_version}")
++ string(STRIP "${_version}" _version)
++ endif ()
++ endif ()
++ if (_version)
++ set(${_result} "${_version}" PARENT_SCOPE)
++ else ()
++ unset(${_result} PARENT_SCOPE)
++ endif ()
++endfunction()
++
++#
++# Method 1: If -DWAYLAND_SCANNER=... was passed on the command line,
++# check whether we can extract the version number from it.
++# Otherwise: unset the variable, to try other methods below.
++#
++if (WAYLAND_SCANNER)
++ wayland_scanner_get_version(WAYLAND_SCANNER_VERSION "${WAYLAND_SCANNER}")
++ if (NOT WAYLAND_SCANNER_VERSION)
++ set(WAYLAND_SCANNER "")
++ endif ()
++endif ()
++
++#
++# Method 2: Try to find an executable program in the current $PATH.
++#
++if (NOT WAYLAND_SCANNER)
++ find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner)
++ if (WAYLAND_SCANNER_EXECUTABLE)
++ wayland_scanner_get_version(WAYLAND_SCANNER_VERSION "${WAYLAND_SCANNER_EXECUTABLE}")
++ if (WAYLAND_SCANNER_VERSION)
++ set(WAYLAND_SCANNER "${WAYLAND_SCANNER_EXECUTABLE}")
++ endif ()
++ endif ()
++ unset(WAYLAND_SCANNER_EXECUTABLE)
++endif ()
++
++#
++# Method 3: Try to find the executable using pkg-config, in case the
++# tool was installed in a non-standard location.
++#
++if (NOT DEFINED WAYLAND_SCANNER OR NOT WAYLAND_SCANNER)
++ find_package(PkgConfig)
++ pkg_check_modules(WAYLAND_SCANNER_PC wayland-scanner)
++ if (WAYLAND_SCANNER_PC_FOUND)
++ pkg_get_variable(WAYLAND_SCANNER_PC_EXECUTABLE wayland-scanner wayland_scanner)
++ if (WAYLAND_SCANNER_PC_EXECUTABLE)
++ wayland_scanner_get_version(WAYLAND_SCANNER_VERSION "${WAYLAND_SCANNER_PC_EXECUTABLE}")
++ if (WAYLAND_SCANNER_VERSION)
++ set(WAYLAND_SCANNER "${WAYLAND_SCANNER_PC_EXECUTABLE}")
++ endif ()
++ endif ()
++ endif ()
++ unset(WAYLAND_SCANNER_PC)
++ unset(WAYLAND_SCANNER_PC_EXECUTABLE)
++endif ()
++
++if (WAYLAND_SCANNER_VERSION)
++ if (WAYLAND_SCANNER_VERSION VERSION_LESS "1.15")
++ set(WAYLAND_SCANNER_CODE_ARG "code")
++ else ()
++ set(WAYLAND_SCANNER_CODE_ARG "private-code")
++ endif ()
+ endif ()
+
+ include(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(WAYLAND_SCANNER DEFAULT_MSG WAYLAND_SCANNER)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(
++ WAYLAND_SCANNER
++ DEFAULT_MSG
++ WAYLAND_SCANNER
++ WAYLAND_SCANNER_VERSION
++ WAYLAND_SCANNER_CODE_ARG
++)
+--
+2.21.0
+
diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash
index 6e6f9f0e3f..4d89d1e16f 100644
--- a/package/wpebackend-fdo/wpebackend-fdo.hash
+++ b/package/wpebackend-fdo/wpebackend-fdo.hash
@@ -1,7 +1,7 @@
-# From https://wpewebkit.org/releases/wpebackend-fdo-1.0.1.tar.xz.sums
-md5 2ee81a4212c18110a06a0c51c12e0d2e wpebackend-fdo-1.0.1.tar.xz
-sha1 cdc6ac95e302a2358204b766936a9bf8ef4f26f2 wpebackend-fdo-1.0.1.tar.xz
-sha256 15b8b1febea5d9c271e95c35b3c1e13f870712a54bc5f689cfdbb96e2f070fc8 wpebackend-fdo-1.0.1.tar.xz
+# From https://wpewebkit.org/releases/wpebackend-fdo-1.2.0.tar.xz.sums
+md5 74e1b2fc2bc19933b17ff4f8435f67cd wpebackend-fdo-1.2.0.tar.xz
+sha1 60559697512fd483c1d918b708a3d1d130b74a0a wpebackend-fdo-1.2.0.tar.xz
+sha256 b1bb261273772af8f7d96d94989fc2ed0445ec06c7eb21f47a1b94e52422ddd5 wpebackend-fdo-1.2.0.tar.xz
# Hashes for license files:
sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING
diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/wpebackend-fdo/wpebackend-fdo.mk
index 5842861bac..15530ec45f 100644
--- a/package/wpebackend-fdo/wpebackend-fdo.mk
+++ b/package/wpebackend-fdo/wpebackend-fdo.mk
@@ -4,7 +4,7 @@
#
################################################################################
-WPEBACKEND_FDO_VERSION = 1.0.1
+WPEBACKEND_FDO_VERSION = 1.2.0
WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases
WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz
WPEBACKEND_FDO_INSTALL_STAGING = YES
diff --git a/package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patch b/package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patch
new file mode 100644
index 0000000000..748fc8e46e
--- /dev/null
+++ b/package/wpewebkit/0001-Build-failure-after-r243644-in-GTK-Li.patch
@@ -0,0 +1,36 @@
+From a672bbd75f257dd65844ad53dd21fb37345999b5 Mon Sep 17 00:00:00 2001
+From: "aperez@igalia.com"
+ <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Mon, 20 May 2019 21:20:02 +0000
+Subject: [PATCH] Build failure after r243644 in GTK
+ Linux 64-bit stable builds https://bugs.webkit.org/show_bug.cgi?id=196440
+
+Patch by Pablo Saavedra <psaavedra@igalia.com> on 2019-04-01
+Reviewed by Philippe Normand.
+
+* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+(WebCore::MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags):
+
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+
+diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
+index 608aee2e1b3..c614050972a 100644
+--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
++++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
+@@ -1000,11 +1000,13 @@ void MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags()
+ break;
+ }
+
++#if USE(GSTREAMER_GL)
+ // When the imxvpudecoder is used, the texture sampling of the
+ // directviv-uploaded texture returns an RGB value, so there's no need to
+ // convert it.
+ if (m_videoDecoderPlatform != WebKitGstVideoDecoderPlatform::ImxVPU)
+ m_textureMapperFlags |= TEXTURE_MAPPER_COLOR_CONVERT_FLAG;
++#endif
+ }
+ #endif
+
+--
+2.21.0
+
diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in
index 39f64c4e54..2808a3c8b3 100644
--- a/package/wpewebkit/Config.in
+++ b/package/wpewebkit/Config.in
@@ -12,22 +12,6 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
-config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT
- bool
- # ARM needs NEON for JIT.
- default y if BR2_ARM_CPU_HAS_NEON
- # AArch64 is supported upstream but not well tested on big-endian mode.
- default y if BR2_aarch64
- # i386 & x86_64 don't have any special requirements.
- default y if BR2_i386
- default y if BR2_x86_64
- # JIT is known not to work on MIPS64.
- # Plain MIPS32 (pre R2) is not well tested and likely broken, and R6
- # is unsupported, see https://bugs.webkit.org/show_bug.cgi?id=191258
- # The MIPS support is completely untested in big-endian mode.
- default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R2
- default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5
-
comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 6, host gcc >= 4.8"
depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS
depends on !BR2_BINFMT_FLAT
@@ -65,6 +49,7 @@ config BR2_PACKAGE_WPEWEBKIT
select BR2_PACKAGE_LIBSOUP
select BR2_PACKAGE_LIBTASN1
select BR2_PACKAGE_LIBXSLT
+ select BR2_PACKAGE_OPENJPEG
select BR2_PACKAGE_WAYLAND
select BR2_PACKAGE_WAYLAND_PROTOCOLS
select BR2_PACKAGE_WEBP
diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash
index cbf253d29c..ddab159d4f 100644
--- a/package/wpewebkit/wpewebkit.hash
+++ b/package/wpewebkit/wpewebkit.hash
@@ -1,7 +1,7 @@
-# From https://wpewebkit.org/releases/wpewebkit-2.22.5.tar.xz.sums
-md5 7b768bfae1295ebbc9a9038bf8fb6e6c wpewebkit-2.22.5.tar.xz
-sha1 c85f927e0f17f1e7045a5d33c683d310c7af24de wpewebkit-2.22.5.tar.xz
-sha256 d5e7b23e4f9e9f1b9d369faa4d527cdb59aef56b3e6a50a16dad243df5f699f3 wpewebkit-2.22.5.tar.xz
+# From https://wpewebkit.org/releases/wpewebkit-2.24.2.tar.xz.sums
+md5 3604a2167827c8354f6dcbab98305d7b wpewebkit-2.24.2.tar.xz
+sha1 1248d7723d0e6aec52cafc27a92c5c335c1abdd4 wpewebkit-2.24.2.tar.xz
+sha256 cf251a467b3bcae50f97e22f4baccca49fcbbd54162dc5b71c0b1ebf655fd95f wpewebkit-2.24.2.tar.xz
# Hashes for license files:
sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk
index 73ad534acd..b59a1f793a 100644
--- a/package/wpewebkit/wpewebkit.mk
+++ b/package/wpewebkit/wpewebkit.mk
@@ -4,7 +4,7 @@
#
################################################################################
-WPEWEBKIT_VERSION = 2.22.5
+WPEWEBKIT_VERSION = 2.24.2
WPEWEBKIT_SITE = http://www.wpewebkit.org/releases
WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz
WPEWEBKIT_INSTALL_STAGING = YES
@@ -14,19 +14,13 @@ WPEWEBKIT_LICENSE_FILES = \
Source/WebCore/LICENSE-LGPL-2.1
WPEWEBKIT_DEPENDENCIES = host-gperf host-python host-ruby \
harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \
- libpng libxslt wayland-protocols webp wpebackend-fdo
+ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo
WPEWEBKIT_CONF_OPTS = \
-DPORT=WPE \
-DENABLE_API_TESTS=OFF \
-DENABLE_MINIBROWSER=OFF
-ifeq ($(BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT),y)
-WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=ON
-else
-WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF
-endif
-
ifeq ($(BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA),y)
WPEWEBKIT_CONF_OPTS += \
-DENABLE_VIDEO=ON \
diff --git a/package/x265/0003-arm-asm-primitives.patch b/package/x265/0002-arm-asm-primitives.patch
index e500443429..e500443429 100644
--- a/package/x265/0003-arm-asm-primitives.patch
+++ b/package/x265/0002-arm-asm-primitives.patch
diff --git a/package/x265/0002-fix-build-error-on-ppc64le.patch b/package/x265/0002-fix-build-error-on-ppc64le.patch
deleted file mode 100644
index ca034477eb..0000000000
--- a/package/x265/0002-fix-build-error-on-ppc64le.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# HG changeset patch
-# User Jayashree <jayashree.c@multicorewareinc.com>
-# Date 1527224165 -19800
-# Node ID 4504219210793536d921ee4e0b3058698c630bf4
-# Parent cc2c5e46f3c87d27e3602af30b06ba6a0fbe2704
-Fix build error on on ppc64le
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-
-Upstream status: commit 450421921
-
-diff --git a/source/common/param.cpp b/source/common/param.cpp
---- a/source/common/param.cpp
-+++ b/source/common/param.cpp
-@@ -633,7 +633,7 @@
- if (bValueWasNull)
- p->cpuid = atobool(value);
- else
-- p->cpuid = parseCpuName(value, bError);
-+ p->cpuid = parseCpuName(value, bError, false);
- #endif
- }
- OPT("fps")
diff --git a/package/x265/x265.hash b/package/x265/x265.hash
index 61e6181199..16ca5d3ce6 100644
--- a/package/x265/x265.hash
+++ b/package/x265/x265.hash
@@ -1,3 +1,3 @@
# Locally generated
-sha256 6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863 x265_2.8.tar.gz
+sha256 c5b9fc260cabbc4a81561a448f4ce9cad7218272b4011feabc3a6b751b2f0662 x265_3.0.tar.gz
sha256 d8afb1bcc7a2cfc603683b168d6987ef0a48e59e0da3693bf55c5d33b67e2b49 COPYING
diff --git a/package/x265/x265.mk b/package/x265/x265.mk
index fe317d09d0..4e3b3bfa8e 100644
--- a/package/x265/x265.mk
+++ b/package/x265/x265.mk
@@ -4,7 +4,7 @@
#
################################################################################
-X265_VERSION = 2.8
+X265_VERSION = 3.0
X265_SOURCE = x265_$(X265_VERSION).tar.gz
X265_SITE = https://bitbucket.org/multicoreware/x265/downloads
X265_LICENSE = GPL-2.0+
diff --git a/package/zziplib/Config.in b/package/zziplib/Config.in
new file mode 100644
index 0000000000..6b55572a4d
--- /dev/null
+++ b/package/zziplib/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_ZZIPLIB
+ bool "zziplib"
+ select BR2_PACKAGE_ZLIB
+ help
+ The zziplib provides read access to zipped files in a
+ zip-archive, using compression based solely on free algorithms
+ provided by zlib. It also provides a functionality to overlay
+ the archive filesystem with the filesystem of the operating
+ system environment.
+
+ http://zziplib.sourceforge.net
diff --git a/package/zziplib/zziplib.hash b/package/zziplib/zziplib.hash
new file mode 100644
index 0000000000..1f6b55ec18
--- /dev/null
+++ b/package/zziplib/zziplib.hash
@@ -0,0 +1,5 @@
+# sha256 locally computed
+sha256 846246d7cdeee405d8d21e2922c6e97f55f24ecbe3b6dcf5778073a88f120544 zziplib-v0.13.69.tar.gz
+sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 docs/COPYING.LIB
+sha256 c2aa7d58cebd24cb877bbf11d6b13a4bb7cd08b9d7db5d3037ca06c46bf4cfd8 docs/COPYING.MPL
+sha256 1c6da11efe8c43ee853fe5b21501dd72b81831ae84d58ea376bddc0620a5c361 docs/copying.htm
diff --git a/package/zziplib/zziplib.mk b/package/zziplib/zziplib.mk
new file mode 100644
index 0000000000..04129fdd97
--- /dev/null
+++ b/package/zziplib/zziplib.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# zziplib
+#
+################################################################################
+
+ZZIPLIB_VERSION = v0.13.69
+ZZIPLIB_SITE = $(call github,gdraheim,zziplib,$(ZZIPLIB_VERSION))
+ZZIPLIB_LICENSE = LGPL-2.0+ or MPL-1.1
+ZZIPLIB_LICENSE_FILES = docs/COPYING.LIB docs/COPYING.MPL docs/copying.htm
+ZZIPLIB_INSTALL_STAGING = YES
+
+ZZIPLIB_DEPENDENCIES = host-pkgconf host-python zlib
+
+# zziplib is not python3 friendly, so force the python interpreter
+ZZIPLIB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2
+
+$(eval $(autotools-package))
diff --git a/support/gnuconfig/README.buildroot b/support/gnuconfig/README.buildroot
index a71ed93010..7ba2a332a4 100644
--- a/support/gnuconfig/README.buildroot
+++ b/support/gnuconfig/README.buildroot
@@ -10,7 +10,7 @@ If for some reason your package does not use the autotools-package
infrastructure, you can request the config.guess and/or config.sub
files of your package to be updated by using:
- $(call CONFIG_UPDATE,directory-of-your-package-sources)
+<pkg>_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
--- UPDATE ---
GNU config is now managed in git, so to update:
diff --git a/support/gnuconfig/config.guess b/support/gnuconfig/config.guess
index c4bd827a7b..b40e17b137 100755
--- a/support/gnuconfig/config.guess
+++ b/support/gnuconfig/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2016 Free Software Foundation, Inc.
+# Copyright 1992-2019 Free Software Foundation, Inc.
-timestamp='2016-05-15'
+timestamp='2019-05-28'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2016-05-15'
# 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 <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@ timestamp='2016-05-15'
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
#
# Please send patches to <config-patches@gnu.org>.
@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
Output the configuration name of the system \`$me' is run on.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2019 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,8 +84,6 @@ if test $# != 0; then
exit 1
fi
-trap 'exit 1' 1 2 15
-
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires
# temporary files to be created and, as you can see below, it is a
@@ -96,34 +94,38 @@ trap 'exit 1' 1 2 15
# Portable tmp directory creation inspired by the Autoconf team.
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
- for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
- CC_FOR_BUILD="$c"; break ;
- fi ;
- done ;
- if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found ;
- fi
- ;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+ : "${TMPDIR=/tmp}"
+ # shellcheck disable=SC2039
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+ dummy=$tmp/dummy
+ case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+ ,,) echo "int x;" > "$dummy.c"
+ for driver in cc gcc c89 c99 ; do
+ if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+ CC_FOR_BUILD="$driver"
+ break
+ fi
+ done
+ if test x"$CC_FOR_BUILD" = x ; then
+ CC_FOR_BUILD=no_compiler_found
+ fi
+ ;;
+ ,,*) CC_FOR_BUILD=$CC ;;
+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
+ esac
+}
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
PATH=$PATH:/.attbin ; export PATH
fi
@@ -132,14 +134,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "${UNAME_SYSTEM}" in
+case "$UNAME_SYSTEM" in
Linux|GNU|GNU/*)
# If the system lacks a compiler, then just pick glibc.
# We could probably try harder.
LIBC=gnu
- eval $set_cc_for_build
- cat <<-EOF > $dummy.c
+ set_cc_for_build
+ cat <<-EOF > "$dummy.c"
#include <features.h>
#if defined(__UCLIBC__)
LIBC=uclibc
@@ -149,13 +151,20 @@ Linux|GNU|GNU/*)
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+ # If ldd exists, use it to detect musl libc.
+ if command -v ldd >/dev/null && \
+ ldd --version 2>&1 | grep -q ^musl
+ then
+ LIBC=musl
+ fi
;;
esac
# Note: order is significant - the case branches are not exclusive.
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -169,30 +178,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
- /sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || \
+ "/sbin/$sysctl" 2>/dev/null || \
+ "/usr/sbin/$sysctl" 2>/dev/null || \
echo unknown)`
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
earmv*)
- arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
- endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
- machine=${arch}${endian}-unknown
+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
+ machine="${arch}${endian}"-unknown
;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently (or will in the future) and ABI.
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
earm*)
os=netbsdelf
;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
+ set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
then
@@ -208,10 +217,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
;;
esac
# Determine ABI tags.
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
earm*)
expr='s/^earmv[0-9]/-eabi/;s/eb$//'
- abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
;;
esac
# The OS release
@@ -219,46 +228,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# thus, need a distinct triplet. However, they do not need
# kernel version information, so it can be replaced with a
# suitable tag, in the style of linux-gnu.
- case "${UNAME_VERSION}" in
+ case "$UNAME_VERSION" in
Debian*)
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}${abi}"
+ echo "$machine-${os}${release}${abi-}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
exit ;;
*:LibertyBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+ exit ;;
+ *:MidnightBSD:*:*)
+ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
exit ;;
*:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
exit ;;
*:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
exit ;;
macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
exit ;;
*:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
exit ;;
*:Sortix:*:*)
- echo ${UNAME_MACHINE}-unknown-sortix
+ echo "$UNAME_MACHINE"-unknown-sortix
+ exit ;;
+ *:Redox:*:*)
+ echo "$UNAME_MACHINE"-unknown-redox
exit ;;
+ mips:OSF1:*.*)
+ echo mips-dec-osf1
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -310,28 +328,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
exitcode=$?
trap '' 0
exit $exitcode ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
- # of the specific Alpha model?
- echo alpha-pc-interix
- exit ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
+ echo "$UNAME_MACHINE"-unknown-amigaos
exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
+ echo "$UNAME_MACHINE"-unknown-morphos
exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -343,7 +352,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
+ echo arm-acorn-riscix"$UNAME_RELEASE"
exit ;;
arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
@@ -370,19 +379,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
exit ;;
sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
exit ;;
i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
- echo i386-pc-auroraux${UNAME_RELEASE}
+ echo i386-pc-auroraux"$UNAME_RELEASE"
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval $set_cc_for_build
+ set_cc_for_build
SUN_ARCH=i386
# If there is a compiler, see if it is configured for 64-bit objects.
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
@@ -395,13 +404,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
SUN_ARCH=x86_64
fi
fi
- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
@@ -410,25 +419,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
;;
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
exit ;;
sun3*:SunOS:*:*)
- echo m68k-sun-sunos${UNAME_RELEASE}
+ echo m68k-sun-sunos"$UNAME_RELEASE"
exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
+ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
- echo m68k-sun-sunos${UNAME_RELEASE}
+ echo m68k-sun-sunos"$UNAME_RELEASE"
;;
sun4)
- echo sparc-sun-sunos${UNAME_RELEASE}
+ echo sparc-sun-sunos"$UNAME_RELEASE"
;;
esac
exit ;;
aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
+ echo sparc-auspex-sunos"$UNAME_RELEASE"
exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
@@ -439,44 +448,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint"$UNAME_RELEASE"
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint"$UNAME_RELEASE"
exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint"$UNAME_RELEASE"
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
+ echo m68k-milan-mint"$UNAME_RELEASE"
exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
+ echo m68k-hades-mint"$UNAME_RELEASE"
exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
+ echo m68k-unknown-mint"$UNAME_RELEASE"
exit ;;
m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
+ echo m68k-apple-machten"$UNAME_RELEASE"
exit ;;
powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
+ echo powerpc-apple-machten"$UNAME_RELEASE"
exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
exit ;;
RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
+ echo mips-dec-ultrix"$UNAME_RELEASE"
exit ;;
VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
+ echo vax-dec-ultrix"$UNAME_RELEASE"
exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
+ echo clipper-intergraph-clix"$UNAME_RELEASE"
exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ set_cc_for_build
+ sed 's/^ //' << EOF > "$dummy.c"
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
int main (int argc, char *argv[]) {
@@ -485,23 +494,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
#endif
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_SVR4)
- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
#endif
#endif
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c &&
- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
- SYSTEM_NAME=`$dummy $dummyarg` &&
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
{ echo "$SYSTEM_NAME"; exit; }
- echo mips-mips-riscos${UNAME_RELEASE}
+ echo mips-mips-riscos"$UNAME_RELEASE"
exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
@@ -527,17 +536,17 @@ EOF
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- [ ${TARGET_BINARY_INTERFACE}x = x ]
+ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
+ [ "$TARGET_BINARY_INTERFACE"x = x ]
then
- echo m88k-dg-dgux${UNAME_RELEASE}
+ echo m88k-dg-dgux"$UNAME_RELEASE"
else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ echo m88k-dg-dguxbcs"$UNAME_RELEASE"
fi
else
- echo i586-dg-dgux${UNAME_RELEASE}
+ echo i586-dg-dgux"$UNAME_RELEASE"
fi
exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
@@ -554,7 +563,7 @@ EOF
echo m68k-tektronix-bsd
exit ;;
*:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
@@ -566,14 +575,14 @@ EOF
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
fi
- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ set_cc_for_build
+ sed 's/^ //' << EOF > "$dummy.c"
#include <sys/systemcfg.h>
main()
@@ -584,7 +593,7 @@ EOF
exit(0);
}
EOF
- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
then
echo "$SYSTEM_NAME"
else
@@ -598,7 +607,7 @@ EOF
exit ;;
*:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
@@ -607,18 +616,18 @@ EOF
IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
echo romp-ibm-bsd4.4
exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
@@ -633,28 +642,28 @@ EOF
echo m68k-hp-bsd4.4
exit ;;
9000/[34678]??:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+ case "$UNAME_MACHINE" in
+ 9000/31?) HP_ARCH=m68000 ;;
+ 9000/[34]??) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
+ case "$sc_cpu_version" in
523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
+ case "$sc_kernel_bits" in
32) HP_ARCH=hppa2.0n ;;
64) HP_ARCH=hppa2.0w ;;
'') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
esac ;;
esac
fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ if [ "$HP_ARCH" = "" ]; then
+ set_cc_for_build
+ sed 's/^ //' << EOF > "$dummy.c"
#define _HPUX_SOURCE
#include <stdlib.h>
@@ -687,13 +696,13 @@ EOF
exit (0);
}
EOF
- (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
- if [ ${HP_ARCH} = hppa2.0w ]
+ if [ "$HP_ARCH" = hppa2.0w ]
then
- eval $set_cc_for_build
+ set_cc_for_build
# hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
# 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
@@ -712,15 +721,15 @@ EOF
HP_ARCH=hppa64
fi
fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
exit ;;
ia64:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- echo ia64-hp-hpux${HPUX_REV}
+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux"$HPUX_REV"
exit ;;
3050*:HI-UX:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ set_cc_for_build
+ sed 's/^ //' << EOF > "$dummy.c"
#include <unistd.h>
int
main ()
@@ -745,11 +754,11 @@ EOF
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
{ echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
echo hppa1.1-hp-bsd
exit ;;
9000/8??:4.3bsd:*:*)
@@ -758,7 +767,7 @@ EOF
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
exit ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
echo hppa1.1-hp-osf
exit ;;
hp8??:OSF1:*:*)
@@ -766,9 +775,9 @@ EOF
exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
+ echo "$UNAME_MACHINE"-unknown-osf1mk
else
- echo ${UNAME_MACHINE}-unknown-osf1
+ echo "$UNAME_MACHINE"-unknown-osf1
fi
exit ;;
parisc*:Lites*:*:*)
@@ -793,127 +802,120 @@ EOF
echo c4-convex-bsd
exit ;;
CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*[A-Z]90:*:*:*)
- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
exit ;;
CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*SV1:*:*:*)
- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
*:UNICOS/mp:*:*)
- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
5000:UNIX_System_V:4.*:*)
FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
exit ;;
sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE}
+ echo sparc-unknown-bsdi"$UNAME_RELEASE"
exit ;;
*:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
+ exit ;;
+ arm:FreeBSD:*:*)
+ UNAME_PROCESSOR=`uname -p`
+ set_cc_for_build
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
+ else
+ echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
+ fi
exit ;;
*:FreeBSD:*:*)
UNAME_PROCESSOR=`/usr/bin/uname -p`
- case ${UNAME_PROCESSOR} in
+ case "$UNAME_PROCESSOR" in
amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=x86_64 ;;
+ i386)
+ UNAME_PROCESSOR=i586 ;;
esac
+ echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
exit ;;
i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
+ echo "$UNAME_MACHINE"-pc-cygwin
exit ;;
*:MINGW64*:*)
- echo ${UNAME_MACHINE}-pc-mingw64
+ echo "$UNAME_MACHINE"-pc-mingw64
exit ;;
*:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
+ echo "$UNAME_MACHINE"-pc-mingw32
exit ;;
*:MSYS*:*)
- echo ${UNAME_MACHINE}-pc-msys
- exit ;;
- i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
+ echo "$UNAME_MACHINE"-pc-msys
exit ;;
i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
+ echo "$UNAME_MACHINE"-pc-pw32
exit ;;
*:Interix*:*)
- case ${UNAME_MACHINE} in
+ case "$UNAME_MACHINE" in
x86)
- echo i586-pc-interix${UNAME_RELEASE}
+ echo i586-pc-interix"$UNAME_RELEASE"
exit ;;
authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix${UNAME_RELEASE}
+ echo x86_64-unknown-interix"$UNAME_RELEASE"
exit ;;
IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
+ echo ia64-unknown-interix"$UNAME_RELEASE"
exit ;;
esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
- 8664:Windows_NT:*)
- echo x86_64-pc-mks
- exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- # UNAME_MACHINE based on the output of uname instead of i386?
- echo i586-pc-interix
- exit ;;
i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
+ echo "$UNAME_MACHINE"-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin
- exit ;;
- p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
+ echo x86_64-pc-cygwin
exit ;;
prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
exit ;;
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
+ *:Minix:*:*)
+ echo "$UNAME_MACHINE"-unknown-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -927,134 +929,168 @@ EOF
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
arc:Linux:*:* | arceb:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
arm*:Linux:*:*)
- eval $set_cc_for_build
+ set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
else
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
exit ;;
e2k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
i*86:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
k1om:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ set_cc_for_build
+ IS_GLIBC=0
+ test x"${LIBC}" = xgnu && IS_GLIBC=1
+ sed 's/^ //' << EOF > "$dummy.c"
#undef CPU
- #undef ${UNAME_MACHINE}
- #undef ${UNAME_MACHINE}el
+ #undef mips
+ #undef mipsel
+ #undef mips64
+ #undef mips64el
+ #if ${IS_GLIBC} && defined(_ABI64)
+ LIBCABI=gnuabi64
+ #else
+ #if ${IS_GLIBC} && defined(_ABIN32)
+ LIBCABI=gnuabin32
+ #else
+ LIBCABI=${LIBC}
+ #endif
+ #endif
+
+ #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+ CPU=mipsisa64r6
+ #else
+ #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+ CPU=mipsisa32r6
+ #else
+ #if defined(__mips64)
+ CPU=mips64
+ #else
+ CPU=mips
+ #endif
+ #endif
+ #endif
+
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=${UNAME_MACHINE}el
+ MIPS_ENDIAN=el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=${UNAME_MACHINE}
+ MIPS_ENDIAN=
#else
- CPU=
+ MIPS_ENDIAN=
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`"
+ test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
;;
+ mips64el:Linux:*:*)
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ exit ;;
openrisc*:Linux:*:*)
- echo or1k-unknown-linux-${LIBC}
+ echo or1k-unknown-linux-"$LIBC"
exit ;;
or32:Linux:*:* | or1k*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-${LIBC}
+ echo sparc-unknown-linux-"$LIBC"
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-${LIBC}
+ echo hppa64-unknown-linux-"$LIBC"
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
- *) echo hppa-unknown-linux-${LIBC} ;;
+ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
+ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
+ *) echo hppa-unknown-linux-"$LIBC" ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-${LIBC}
+ echo powerpc64-unknown-linux-"$LIBC"
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-${LIBC}
+ echo powerpc-unknown-linux-"$LIBC"
exit ;;
ppc64le:Linux:*:*)
- echo powerpc64le-unknown-linux-${LIBC}
+ echo powerpc64le-unknown-linux-"$LIBC"
exit ;;
ppcle:Linux:*:*)
- echo powerpcle-unknown-linux-${LIBC}
+ echo powerpcle-unknown-linux-"$LIBC"
+ exit ;;
+ riscv32:Linux:*:* | riscv64:Linux:*:*)
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1068,34 +1104,34 @@ EOF
# I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
+ echo "$UNAME_MACHINE"-pc-os2-emx
exit ;;
i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
+ echo "$UNAME_MACHINE"-unknown-stop
exit ;;
i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
+ echo "$UNAME_MACHINE"-unknown-atheos
exit ;;
i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
+ echo "$UNAME_MACHINE"-pc-syllable
exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
+ echo i386-unknown-lynxos"$UNAME_RELEASE"
exit ;;
i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ echo "$UNAME_MACHINE"-pc-msdosdjgpp
exit ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ i*86:*:4.*:*)
+ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
fi
exit ;;
i*86:*:5:[678]*)
@@ -1105,12 +1141,12 @@ EOF
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"
exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
elif /bin/uname -X 2>/dev/null >/dev/null ; then
UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1120,9 +1156,9 @@ EOF
&& UNAME_MACHINE=i686
(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
else
- echo ${UNAME_MACHINE}-pc-sysv32
+ echo "$UNAME_MACHINE"-pc-sysv32
fi
exit ;;
pc:*:*:*)
@@ -1142,9 +1178,9 @@ EOF
exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
fi
exit ;;
mini*:CTIX:SYS*5:*)
@@ -1164,9 +1200,9 @@ EOF
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
@@ -1175,28 +1211,28 @@ EOF
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
+ echo m68k-unknown-lynxos"$UNAME_RELEASE"
exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit ;;
TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
+ echo sparc-unknown-lynxos"$UNAME_RELEASE"
exit ;;
rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ echo rs6000-unknown-lynxos"$UNAME_RELEASE"
exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ echo powerpc-unknown-lynxos"$UNAME_RELEASE"
exit ;;
SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv${UNAME_RELEASE}
+ echo mips-dde-sysv"$UNAME_RELEASE"
exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
@@ -1207,7 +1243,7 @@ EOF
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
- echo ${UNAME_MACHINE}-sni-sysv4
+ echo "$UNAME_MACHINE"-sni-sysv4
else
echo ns32k-sni-sysv
fi
@@ -1227,23 +1263,23 @@ EOF
exit ;;
i*86:VOS:*:*)
# From Paul.Green@stratus.com.
- echo ${UNAME_MACHINE}-stratus-vos
+ echo "$UNAME_MACHINE"-stratus-vos
exit ;;
*:VOS:*:*)
# From Paul.Green@stratus.com.
echo hppa1.1-stratus-vos
exit ;;
mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
+ echo m68k-apple-aux"$UNAME_RELEASE"
exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
+ echo mips-nec-sysv"$UNAME_RELEASE"
else
- echo mips-unknown-sysv${UNAME_RELEASE}
+ echo mips-unknown-sysv"$UNAME_RELEASE"
fi
exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1262,49 +1298,56 @@ EOF
echo x86_64-unknown-haiku
exit ;;
SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
+ echo sx4-nec-superux"$UNAME_RELEASE"
exit ;;
SX-5:SUPER-UX:*:*)
- echo sx5-nec-superux${UNAME_RELEASE}
+ echo sx5-nec-superux"$UNAME_RELEASE"
exit ;;
SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
+ echo sx6-nec-superux"$UNAME_RELEASE"
exit ;;
SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux${UNAME_RELEASE}
+ echo sx7-nec-superux"$UNAME_RELEASE"
exit ;;
SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux${UNAME_RELEASE}
+ echo sx8-nec-superux"$UNAME_RELEASE"
exit ;;
SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux${UNAME_RELEASE}
+ echo sx8r-nec-superux"$UNAME_RELEASE"
exit ;;
SX-ACE:SUPER-UX:*:*)
- echo sxace-nec-superux${UNAME_RELEASE}
+ echo sxace-nec-superux"$UNAME_RELEASE"
exit ;;
Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ echo powerpc-apple-rhapsody"$UNAME_RELEASE"
exit ;;
*:Rhapsody:*:*)
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
exit ;;
*:Darwin:*:*)
- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- eval $set_cc_for_build
- if test "$UNAME_PROCESSOR" = unknown ; then
- UNAME_PROCESSOR=powerpc
- fi
- if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+ set_cc_for_build
+ UNAME_PROCESSOR=`uname -p`
+ case $UNAME_PROCESSOR in
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
fi
+ # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+ if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_PPC >/dev/null
+ then
+ UNAME_PROCESSOR=powerpc
+ fi
fi
elif test "$UNAME_PROCESSOR" = i386 ; then
# Avoid executing cc on OS X 10.9, as it ships with a stub
@@ -1315,7 +1358,7 @@ EOF
# that Apple uses in portable devices.
UNAME_PROCESSOR=x86_64
fi
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
@@ -1323,19 +1366,25 @@ EOF
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+ echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
- echo neo-tandem-nsk${UNAME_RELEASE}
+ NEO-*:NONSTOP_KERNEL:*:*)
+ echo neo-tandem-nsk"$UNAME_RELEASE"
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
+ echo nse-tandem-nsk"$UNAME_RELEASE"
exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk${UNAME_RELEASE}
+ NSR-*:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk"$UNAME_RELEASE"
+ exit ;;
+ NSV-*:NONSTOP_KERNEL:*:*)
+ echo nsv-tandem-nsk"$UNAME_RELEASE"
+ exit ;;
+ NSX-*:NONSTOP_KERNEL:*:*)
+ echo nsx-tandem-nsk"$UNAME_RELEASE"
exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
@@ -1344,18 +1393,19 @@ EOF
echo bs2000-siemens-sysv
exit ;;
DS/*:UNIX_System_V:*:*)
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+ echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
# operating systems.
+ # shellcheck disable=SC2154
if test "$cputype" = 386; then
UNAME_MACHINE=i386
else
UNAME_MACHINE="$cputype"
fi
- echo ${UNAME_MACHINE}-unknown-plan9
+ echo "$UNAME_MACHINE"-unknown-plan9
exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
@@ -1376,14 +1426,14 @@ EOF
echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+ echo mips-sei-seiux"$UNAME_RELEASE"
exit ;;
*:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
+ case "$UNAME_MACHINE" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
V*) echo vax-dec-vms ; exit ;;
@@ -1392,32 +1442,184 @@ EOF
echo i386-pc-xenix
exit ;;
i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
+ echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
exit ;;
i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
+ echo "$UNAME_MACHINE"-pc-rdos
exit ;;
i*86:AROS:*:*)
- echo ${UNAME_MACHINE}-pc-aros
+ echo "$UNAME_MACHINE"-pc-aros
exit ;;
x86_64:VMkernel:*:*)
- echo ${UNAME_MACHINE}-unknown-esx
+ echo "$UNAME_MACHINE"-unknown-esx
exit ;;
amd64:Isilon\ OneFS:*:*)
echo x86_64-unknown-onefs
exit ;;
+ *:Unleashed:*:*)
+ echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
+ exit ;;
+esac
+
+# No uname command or uname output not recognized.
+set_cc_for_build
+cat > "$dummy.c" <<EOF
+#ifdef _SEQUENT_
+#include <sys/types.h>
+#include <sys/utsname.h>
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#include <signal.h>
+#if defined(_SIZE_T_) || defined(SIGLOST)
+#include <sys/utsname.h>
+#endif
+#endif
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
+ I don't know.... */
+ printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+ printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+ "4"
+#else
+ ""
+#endif
+ ); exit (0);
+#endif
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+ int version;
+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+ if (version < 4)
+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+ else
+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+ exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+ printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+ printf ("ns32k-encore-mach\n"); exit (0);
+#else
+ printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+ printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+ printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+ printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+ struct utsname un;
+
+ uname(&un);
+ if (strncmp(un.version, "V2", 2) == 0) {
+ printf ("i386-sequent-ptx2\n"); exit (0);
+ }
+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+ printf ("i386-sequent-ptx1\n"); exit (0);
+ }
+ printf ("i386-sequent-ptx\n"); exit (0);
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+#include <sys/param.h>
+#if defined (BSD)
+#if BSD == 43
+ printf ("vax-dec-bsd4.3\n"); exit (0);
+#else
+#if BSD == 199006
+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#else
+ printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#endif
+#else
+ printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#else
+#if defined(_SIZE_T_) || defined(SIGLOST)
+ struct utsname un;
+ uname (&un);
+ printf ("vax-dec-ultrix%s\n", un.release); exit (0);
+#else
+ printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#if defined(_SIZE_T_) || defined(SIGLOST)
+ struct utsname *un;
+ uname (&un);
+ printf ("mips-dec-ultrix%s\n", un.release); exit (0);
+#else
+ printf ("mips-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+ printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+ exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
+
+echo "$0: unable to guess system type" >&2
+
+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
+ mips:Linux | mips64:Linux)
+ # If we got here on MIPS GNU/Linux, output extra information.
+ cat >&2 <<EOF
+
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+ ;;
esac
cat >&2 <<EOF
-$0: unable to guess system type
This script (version $timestamp), has failed to recognize the
-operating system you are using. If your script is old, overwrite
-config.guess and config.sub with the latest versions from:
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
If $0 has already been updated, send the following data and any
information you think might be pertinent to config-patches@gnu.org to
@@ -1440,16 +1642,16 @@ hostinfo = `(hostinfo) 2>/dev/null`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
EOF
exit 1
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff --git a/support/gnuconfig/config.sub b/support/gnuconfig/config.sub
index 45dd0a7d04..5b158ac41c 100755
--- a/support/gnuconfig/config.sub
+++ b/support/gnuconfig/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2016 Free Software Foundation, Inc.
+# Copyright 1992-2019 Free Software Foundation, Inc.
-timestamp='2016-05-10'
+timestamp='2019-05-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2016-05-10'
# 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 <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@ timestamp='2016-05-10'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
@@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Canonicalize a configuration name.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2019 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -89,12 +89,12 @@ while test $# -gt 0 ; do
- ) # Use stdin as input.
break ;;
-* )
- echo "$me: invalid option $1$help"
+ echo "$me: invalid option $1$help" >&2
exit 1 ;;
*local*)
# First pass through any local machine types.
- echo $1
+ echo "$1"
exit ;;
* )
@@ -110,1236 +110,1167 @@ case $# in
exit 1;;
esac
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
- kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
- android-linux)
- os=-linux-android
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
- ;;
- *)
- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
- if [ $basic_machine != $1 ]
- then os=`echo $1 | sed 's/.*-/-/'`
- else os=; fi
- ;;
-esac
+# Split fields of configuration type
+# shellcheck disable=SC2162
+IFS="-" read field1 field2 field3 field4 <<EOF
+$1
+EOF
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work. We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
- -sun*os*)
- # Prevent following clause from handling this invalid input.
- ;;
- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
- -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
- -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze*)
- os=
- basic_machine=$1
- ;;
- -bluegene*)
- os=-cnk
- ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
- ;;
- -scout)
- ;;
- -wrs)
- os=-vxworks
- basic_machine=$1
- ;;
- -chorusos*)
- os=-chorusos
- basic_machine=$1
- ;;
- -chorusrdb)
- os=-chorusrdb
- basic_machine=$1
- ;;
- -hiux*)
- os=-hiuxwe2
- ;;
- -sco6)
- os=-sco5v6
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco5)
- os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco4)
- os=-sco3.2v4
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2.[4-9]*)
- os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2v[4-9]*)
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco5v6*)
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco*)
- os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -udk*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -isc)
- os=-isc2.2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -clix*)
- basic_machine=clipper-intergraph
- ;;
- -isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -lynx*178)
- os=-lynxos178
- ;;
- -lynx*5)
- os=-lynxos5
- ;;
- -lynx*)
- os=-lynxos
+# Separate into logical components for further validation
+case $1 in
+ *-*-*-*-*)
+ echo Invalid configuration \`"$1"\': more than four components >&2
+ exit 1
;;
- -ptx*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+ *-*-*-*)
+ basic_machine=$field1-$field2
+ os=$field3-$field4
;;
- -windowsnt*)
- os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ *-*-*)
+ # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+ # parts
+ maybe_os=$field2-$field3
+ case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
+ | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
+ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+ | storm-chaos* | os2-emx* | rtmk-nova*)
+ basic_machine=$field1
+ os=$maybe_os
+ ;;
+ android-linux)
+ basic_machine=$field1-unknown
+ os=linux-android
+ ;;
+ *)
+ basic_machine=$field1-$field2
+ os=$field3
+ ;;
+ esac
;;
- -psos*)
- os=-psos
+ *-*)
+ # A lone config we happen to match not fitting any pattern
+ case $field1-$field2 in
+ decstation-3100)
+ basic_machine=mips-dec
+ os=
+ ;;
+ *-*)
+ # Second component is usually, but not always the OS
+ case $field2 in
+ # Prevent following clause from handling this valid os
+ sun*os*)
+ basic_machine=$field1
+ os=$field2
+ ;;
+ # Manufacturers
+ dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+ | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
+ | unicom* | ibm* | next | hp | isi* | apollo | altos* \
+ | convergent* | ncr* | news | 32* | 3600* | 3100* \
+ | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
+ | ultra | tti* | harris | dolphin | highlevel | gould \
+ | cbm | ns | masscomp | apple | axis | knuth | cray \
+ | microblaze* | sim | cisco \
+ | oki | wec | wrs | winbond)
+ basic_machine=$field1-$field2
+ os=
+ ;;
+ *)
+ basic_machine=$field1
+ os=$field2
+ ;;
+ esac
+ ;;
+ esac
;;
- -mint | -mint[0-9]*)
- basic_machine=m68k-atari
- os=-mint
+ *)
+ # Convert single-component short-hands not valid as part of
+ # multi-component configurations.
+ case $field1 in
+ 386bsd)
+ basic_machine=i386-pc
+ os=bsd
+ ;;
+ a29khif)
+ basic_machine=a29k-amd
+ os=udi
+ ;;
+ adobe68k)
+ basic_machine=m68010-adobe
+ os=scout
+ ;;
+ alliant)
+ basic_machine=fx80-alliant
+ os=
+ ;;
+ altos | altos3068)
+ basic_machine=m68k-altos
+ os=
+ ;;
+ am29k)
+ basic_machine=a29k-none
+ os=bsd
+ ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=sysv
+ ;;
+ amiga)
+ basic_machine=m68k-unknown
+ os=
+ ;;
+ amigaos | amigados)
+ basic_machine=m68k-unknown
+ os=amigaos
+ ;;
+ amigaunix | amix)
+ basic_machine=m68k-unknown
+ os=sysv4
+ ;;
+ apollo68)
+ basic_machine=m68k-apollo
+ os=sysv
+ ;;
+ apollo68bsd)
+ basic_machine=m68k-apollo
+ os=bsd
+ ;;
+ aros)
+ basic_machine=i386-pc
+ os=aros
+ ;;
+ aux)
+ basic_machine=m68k-apple
+ os=aux
+ ;;
+ balance)
+ basic_machine=ns32k-sequent
+ os=dynix
+ ;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=linux
+ ;;
+ cegcc)
+ basic_machine=arm-unknown
+ os=cegcc
+ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=bsd
+ ;;
+ convex-c2)
+ basic_machine=c2-convex
+ os=bsd
+ ;;
+ convex-c32)
+ basic_machine=c32-convex
+ os=bsd
+ ;;
+ convex-c34)
+ basic_machine=c34-convex
+ os=bsd
+ ;;
+ convex-c38)
+ basic_machine=c38-convex
+ os=bsd
+ ;;
+ cray)
+ basic_machine=j90-cray
+ os=unicos
+ ;;
+ crds | unos)
+ basic_machine=m68k-crds
+ os=
+ ;;
+ da30)
+ basic_machine=m68k-da30
+ os=
+ ;;
+ decstation | pmax | pmin | dec3100 | decstatn)
+ basic_machine=mips-dec
+ os=
+ ;;
+ delta88)
+ basic_machine=m88k-motorola
+ os=sysv3
+ ;;
+ dicos)
+ basic_machine=i686-pc
+ os=dicos
+ ;;
+ djgpp)
+ basic_machine=i586-pc
+ os=msdosdjgpp
+ ;;
+ ebmon29k)
+ basic_machine=a29k-amd
+ os=ebmon
+ ;;
+ es1800 | OSE68k | ose68k | ose | OSE)
+ basic_machine=m68k-ericsson
+ os=ose
+ ;;
+ gmicro)
+ basic_machine=tron-gmicro
+ os=sysv
+ ;;
+ go32)
+ basic_machine=i386-pc
+ os=go32
+ ;;
+ h8300hms)
+ basic_machine=h8300-hitachi
+ os=hms
+ ;;
+ h8300xray)
+ basic_machine=h8300-hitachi
+ os=xray
+ ;;
+ h8500hms)
+ basic_machine=h8500-hitachi
+ os=hms
+ ;;
+ harris)
+ basic_machine=m88k-harris
+ os=sysv3
+ ;;
+ hp300)
+ basic_machine=m68k-hp
+ ;;
+ hp300bsd)
+ basic_machine=m68k-hp
+ os=bsd
+ ;;
+ hp300hpux)
+ basic_machine=m68k-hp
+ os=hpux
+ ;;
+ hppaosf)
+ basic_machine=hppa1.1-hp
+ os=osf
+ ;;
+ hppro)
+ basic_machine=hppa1.1-hp
+ os=proelf
+ ;;
+ i386mach)
+ basic_machine=i386-mach
+ os=mach
+ ;;
+ vsta)
+ basic_machine=i386-pc
+ os=vsta
+ ;;
+ isi68 | isi)
+ basic_machine=m68k-isi
+ os=sysv
+ ;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=linux
+ ;;
+ magnum | m3230)
+ basic_machine=mips-mips
+ os=sysv
+ ;;
+ merlin)
+ basic_machine=ns32k-utek
+ os=sysv
+ ;;
+ mingw64)
+ basic_machine=x86_64-pc
+ os=mingw64
+ ;;
+ mingw32)
+ basic_machine=i686-pc
+ os=mingw32
+ ;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=mingw32ce
+ ;;
+ monitor)
+ basic_machine=m68k-rom68k
+ os=coff
+ ;;
+ morphos)
+ basic_machine=powerpc-unknown
+ os=morphos
+ ;;
+ moxiebox)
+ basic_machine=moxie-unknown
+ os=moxiebox
+ ;;
+ msdos)
+ basic_machine=i386-pc
+ os=msdos
+ ;;
+ msys)
+ basic_machine=i686-pc
+ os=msys
+ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=mvs
+ ;;
+ nacl)
+ basic_machine=le32-unknown
+ os=nacl
+ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=sysv4
+ ;;
+ netbsd386)
+ basic_machine=i386-pc
+ os=netbsd
+ ;;
+ netwinder)
+ basic_machine=armv4l-rebel
+ os=linux
+ ;;
+ news | news700 | news800 | news900)
+ basic_machine=m68k-sony
+ os=newsos
+ ;;
+ news1000)
+ basic_machine=m68030-sony
+ os=newsos
+ ;;
+ necv70)
+ basic_machine=v70-nec
+ os=sysv
+ ;;
+ nh3000)
+ basic_machine=m68k-harris
+ os=cxux
+ ;;
+ nh[45]000)
+ basic_machine=m88k-harris
+ os=cxux
+ ;;
+ nindy960)
+ basic_machine=i960-intel
+ os=nindy
+ ;;
+ mon960)
+ basic_machine=i960-intel
+ os=mon960
+ ;;
+ nonstopux)
+ basic_machine=mips-compaq
+ os=nonstopux
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
+ os=os400
+ ;;
+ OSE68000 | ose68000)
+ basic_machine=m68000-ericsson
+ os=ose
+ ;;
+ os68k)
+ basic_machine=m68k-none
+ os=os68k
+ ;;
+ paragon)
+ basic_machine=i860-intel
+ os=osf
+ ;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=linux
+ ;;
+ pw32)
+ basic_machine=i586-unknown
+ os=pw32
+ ;;
+ rdos | rdos64)
+ basic_machine=x86_64-pc
+ os=rdos
+ ;;
+ rdos32)
+ basic_machine=i386-pc
+ os=rdos
+ ;;
+ rom68k)
+ basic_machine=m68k-rom68k
+ os=coff
+ ;;
+ sa29200)
+ basic_machine=a29k-amd
+ os=udi
+ ;;
+ sei)
+ basic_machine=mips-sei
+ os=seiux
+ ;;
+ sequent)
+ basic_machine=i386-sequent
+ os=
+ ;;
+ sps7)
+ basic_machine=m68k-bull
+ os=sysv2
+ ;;
+ st2000)
+ basic_machine=m68k-tandem
+ os=
+ ;;
+ stratus)
+ basic_machine=i860-stratus
+ os=sysv4
+ ;;
+ sun2)
+ basic_machine=m68000-sun
+ os=
+ ;;
+ sun2os3)
+ basic_machine=m68000-sun
+ os=sunos3
+ ;;
+ sun2os4)
+ basic_machine=m68000-sun
+ os=sunos4
+ ;;
+ sun3)
+ basic_machine=m68k-sun
+ os=
+ ;;
+ sun3os3)
+ basic_machine=m68k-sun
+ os=sunos3
+ ;;
+ sun3os4)
+ basic_machine=m68k-sun
+ os=sunos4
+ ;;
+ sun4)
+ basic_machine=sparc-sun
+ os=
+ ;;
+ sun4os3)
+ basic_machine=sparc-sun
+ os=sunos3
+ ;;
+ sun4os4)
+ basic_machine=sparc-sun
+ os=sunos4
+ ;;
+ sun4sol2)
+ basic_machine=sparc-sun
+ os=solaris2
+ ;;
+ sun386 | sun386i | roadrunner)
+ basic_machine=i386-sun
+ os=
+ ;;
+ sv1)
+ basic_machine=sv1-cray
+ os=unicos
+ ;;
+ symmetry)
+ basic_machine=i386-sequent
+ os=dynix
+ ;;
+ t3e)
+ basic_machine=alphaev5-cray
+ os=unicos
+ ;;
+ t90)
+ basic_machine=t90-cray
+ os=unicos
+ ;;
+ toad1)
+ basic_machine=pdp10-xkl
+ os=tops20
+ ;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=tpf
+ ;;
+ udi29k)
+ basic_machine=a29k-amd
+ os=udi
+ ;;
+ ultra3)
+ basic_machine=a29k-nyu
+ os=sym1
+ ;;
+ v810 | necv810)
+ basic_machine=v810-nec
+ os=none
+ ;;
+ vaxv)
+ basic_machine=vax-dec
+ os=sysv
+ ;;
+ vms)
+ basic_machine=vax-dec
+ os=vms
+ ;;
+ vxworks960)
+ basic_machine=i960-wrs
+ os=vxworks
+ ;;
+ vxworks68)
+ basic_machine=m68k-wrs
+ os=vxworks
+ ;;
+ vxworks29k)
+ basic_machine=a29k-wrs
+ os=vxworks
+ ;;
+ xbox)
+ basic_machine=i686-pc
+ os=mingw32
+ ;;
+ ymp)
+ basic_machine=ymp-cray
+ os=unicos
+ ;;
+ *)
+ basic_machine=$1
+ os=
+ ;;
+ esac
;;
esac
-# Decode aliases for certain CPU-COMPANY combinations.
+# Decode 1-component or ad-hoc basic machines
case $basic_machine in
- # Recognize the basic CPU types without company name.
- # Some are omitted here because they have special meanings below.
- 1750a | 580 \
- | a29k \
- | aarch64 | aarch64_be \
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
- | arc | arceb \
- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
- | avr | avr32 \
- | csky \
- | ba \
- | be32 | be64 \
- | bfin \
- | c4x | c8051 | clipper \
- | d10v | d30v | dlx | dsp16xx \
- | e2k | epiphany \
- | fido | fr30 | frv | ft32 \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | hexagon \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
- | k1om \
- | le32 | le64 \
- | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
- | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
- | mips64r5900 | mips64r5900el \
- | mips64vr | mips64vrel \
- | mips64vr4100 | mips64vr4100el \
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
- | mips64vr5900 | mips64vr5900el \
- | mipsisa32 | mipsisa32el \
- | mipsisa32r2 | mipsisa32r2el \
- | mipsisa32r6 | mipsisa32r6el \
- | mipsisa64 | mipsisa64el \
- | mipsisa64r2 | mipsisa64r2el \
- | mipsisa64r6 | mipsisa64r6el \
- | mipsisa64sb1 | mipsisa64sb1el \
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipsr5900 | mipsr5900el \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
- | moxie \
- | mt \
- | msp430 \
- | nds32 | nds32le | nds32be \
- | nios | nios2 | nios2eb | nios2el \
- | ns16k | ns32k \
- | open8 | or1k | or1knd | or32 \
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle \
- | pyramid \
- | riscv32 | riscv64 \
- | rl78 | rx \
- | score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu \
- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
- | ubicom32 \
- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
- | visium \
- | we32k \
- | x86 | xc16x | xstormy16 | xtensa \
- | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
- c54x)
- basic_machine=tic54x-unknown
- ;;
- c55x)
- basic_machine=tic55x-unknown
- ;;
- c6x)
- basic_machine=tic6x-unknown
- ;;
- leon|leon[3-9])
- basic_machine=sparc-$basic_machine
- ;;
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
- basic_machine=$basic_machine-unknown
- os=-none
+ # Here we handle the default manufacturer of certain CPU types. It is in
+ # some cases the only manufacturer, in others, it is the most popular.
+ w89k)
+ cpu=hppa1.1
+ vendor=winbond
;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ op50n)
+ cpu=hppa1.1
+ vendor=oki
;;
- ms1)
- basic_machine=mt-unknown
+ op60c)
+ cpu=hppa1.1
+ vendor=oki
;;
-
- strongarm | thumb | xscale)
- basic_machine=arm-unknown
+ ibm*)
+ cpu=i370
+ vendor=ibm
;;
- xgate)
- basic_machine=$basic_machine-unknown
- os=-none
+ orion105)
+ cpu=clipper
+ vendor=highlevel
;;
- xscaleeb)
- basic_machine=armeb-unknown
+ mac | mpw | mac-mpw)
+ cpu=m68k
+ vendor=apple
;;
-
- xscaleel)
- basic_machine=armel-unknown
+ pmac | pmac-mpw)
+ cpu=powerpc
+ vendor=apple
;;
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
- # (2) the word "unknown" tends to confuse beginning users.
- i*86 | x86_64)
- basic_machine=$basic_machine-pc
- ;;
- # Object if more than one company name word.
- *-*-*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
- # Recognize the basic CPU types with company name.
- 580-* \
- | a29k-* \
- | aarch64-* | aarch64_be-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* | avr32-* \
- | csky-* \
- | ba-* \
- | be32-* | be64-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* \
- | c8051-* | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | e2k-* | elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | hexagon-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
- | k1om-* \
- | le32-* | le64-* \
- | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
- | microblaze-* | microblazeel-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
- | mips64octeon-* | mips64octeonel-* \
- | mips64orion-* | mips64orionel-* \
- | mips64r5900-* | mips64r5900el-* \
- | mips64vr-* | mips64vrel-* \
- | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* \
- | mips64vr5000-* | mips64vr5000el-* \
- | mips64vr5900-* | mips64vr5900el-* \
- | mipsisa32-* | mipsisa32el-* \
- | mipsisa32r2-* | mipsisa32r2el-* \
- | mipsisa32r6-* | mipsisa32r6el-* \
- | mipsisa64-* | mipsisa64el-* \
- | mipsisa64r2-* | mipsisa64r2el-* \
- | mipsisa64r6-* | mipsisa64r6el-* \
- | mipsisa64sb1-* | mipsisa64sb1el-* \
- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipsr5900-* | mipsr5900el-* \
- | mipstx39-* | mipstx39el-* \
- | mmix-* \
- | mt-* \
- | msp430-* \
- | nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* | nios2eb-* | nios2el-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
- | open8-* \
- | or1k*-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
- | pyramid-* \
- | riscv32-* | riscv64-* \
- | rl78-* | romp-* | rs6000-* | rx-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
- | tahoe-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile*-* \
- | tron-* \
- | ubicom32-* \
- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
- | vax-* \
- | visium-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* \
- | xstormy16-* | xtensa*-* \
- | ymp-* \
- | z8k-* | z80-*)
- ;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
- basic_machine=$basic_machine-unknown
- ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
- 386bsd)
- basic_machine=i386-unknown
- os=-bsd
- ;;
3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
- basic_machine=m68000-att
+ cpu=m68000
+ vendor=att
;;
3b*)
- basic_machine=we32k-att
- ;;
- a29khif)
- basic_machine=a29k-amd
- os=-udi
- ;;
- abacus)
- basic_machine=abacus-unknown
- ;;
- adobe68k)
- basic_machine=m68010-adobe
- os=-scout
- ;;
- alliant | fx80)
- basic_machine=fx80-alliant
- ;;
- altos | altos3068)
- basic_machine=m68k-altos
- ;;
- am29k)
- basic_machine=a29k-none
- os=-bsd
- ;;
- amd64)
- basic_machine=x86_64-pc
- ;;
- amd64-*)
- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- amdahl)
- basic_machine=580-amdahl
- os=-sysv
- ;;
- amiga | amiga-*)
- basic_machine=m68k-unknown
- ;;
- amigaos | amigados)
- basic_machine=m68k-unknown
- os=-amigaos
- ;;
- amigaunix | amix)
- basic_machine=m68k-unknown
- os=-sysv4
- ;;
- apollo68)
- basic_machine=m68k-apollo
- os=-sysv
- ;;
- apollo68bsd)
- basic_machine=m68k-apollo
- os=-bsd
- ;;
- aros)
- basic_machine=i386-pc
- os=-aros
- ;;
- asmjs)
- basic_machine=asmjs-unknown
- ;;
- aux)
- basic_machine=m68k-apple
- os=-aux
- ;;
- balance)
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
- blackfin)
- basic_machine=bfin-unknown
- os=-linux
- ;;
- blackfin-*)
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
+ cpu=we32k
+ vendor=att
;;
bluegene*)
- basic_machine=powerpc-ibm
- os=-cnk
- ;;
- c54x-*)
- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c55x-*)
- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c6x-*)
- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
- ;;
- cegcc)
- basic_machine=arm-unknown
- os=-cegcc
- ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
- ;;
- convex-c2)
- basic_machine=c2-convex
- os=-bsd
- ;;
- convex-c32)
- basic_machine=c32-convex
- os=-bsd
- ;;
- convex-c34)
- basic_machine=c34-convex
- os=-bsd
- ;;
- convex-c38)
- basic_machine=c38-convex
- os=-bsd
- ;;
- cray | j90)
- basic_machine=j90-cray
- os=-unicos
- ;;
- craynv)
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
- cr16 | cr16-*)
- basic_machine=cr16-unknown
- os=-elf
- ;;
- crds | unos)
- basic_machine=m68k-crds
- ;;
- crisv32 | crisv32-* | etraxfs*)
- basic_machine=crisv32-axis
- ;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
- crx)
- basic_machine=crx-unknown
- os=-elf
- ;;
- da30 | da30-*)
- basic_machine=m68k-da30
- ;;
- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
- basic_machine=mips-dec
+ cpu=powerpc
+ vendor=ibm
+ os=cnk
;;
decsystem10* | dec10*)
- basic_machine=pdp10-dec
- os=-tops10
+ cpu=pdp10
+ vendor=dec
+ os=tops10
;;
decsystem20* | dec20*)
- basic_machine=pdp10-dec
- os=-tops20
+ cpu=pdp10
+ vendor=dec
+ os=tops20
;;
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
- basic_machine=m68k-motorola
- ;;
- delta88)
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
- dicos)
- basic_machine=i686-pc
- os=-dicos
+ cpu=m68k
+ vendor=motorola
;;
- djgpp)
- basic_machine=i586-pc
- os=-msdosdjgpp
- ;;
- dpx20 | dpx20-*)
- basic_machine=rs6000-bull
- os=-bosx
- ;;
- dpx2* | dpx2*-bull)
- basic_machine=m68k-bull
- os=-sysv3
- ;;
- ebmon29k)
- basic_machine=a29k-amd
- os=-ebmon
- ;;
- elxsi)
- basic_machine=elxsi-elxsi
- os=-bsd
+ dpx2*)
+ cpu=m68k
+ vendor=bull
+ os=sysv3
;;
encore | umax | mmax)
- basic_machine=ns32k-encore
+ cpu=ns32k
+ vendor=encore
;;
- es1800 | OSE68k | ose68k | ose | OSE)
- basic_machine=m68k-ericsson
- os=-ose
+ elxsi)
+ cpu=elxsi
+ vendor=elxsi
+ os=${os:-bsd}
;;
fx2800)
- basic_machine=i860-alliant
+ cpu=i860
+ vendor=alliant
;;
genix)
- basic_machine=ns32k-ns
- ;;
- gmicro)
- basic_machine=tron-gmicro
- os=-sysv
- ;;
- go32)
- basic_machine=i386-pc
- os=-go32
+ cpu=ns32k
+ vendor=ns
;;
h3050r* | hiux*)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- h8300hms)
- basic_machine=h8300-hitachi
- os=-hms
- ;;
- h8300xray)
- basic_machine=h8300-hitachi
- os=-xray
- ;;
- h8500hms)
- basic_machine=h8500-hitachi
- os=-hms
- ;;
- harris)
- basic_machine=m88k-harris
- os=-sysv3
- ;;
- hp300-*)
- basic_machine=m68k-hp
- ;;
- hp300bsd)
- basic_machine=m68k-hp
- os=-bsd
- ;;
- hp300hpux)
- basic_machine=m68k-hp
- os=-hpux
+ cpu=hppa1.1
+ vendor=hitachi
+ os=hiuxwe2
;;
hp3k9[0-9][0-9] | hp9[0-9][0-9])
- basic_machine=hppa1.0-hp
+ cpu=hppa1.0
+ vendor=hp
;;
hp9k2[0-9][0-9] | hp9k31[0-9])
- basic_machine=m68000-hp
+ cpu=m68000
+ vendor=hp
;;
hp9k3[2-9][0-9])
- basic_machine=m68k-hp
+ cpu=m68k
+ vendor=hp
;;
hp9k6[0-9][0-9] | hp6[0-9][0-9])
- basic_machine=hppa1.0-hp
+ cpu=hppa1.0
+ vendor=hp
;;
hp9k7[0-79][0-9] | hp7[0-79][0-9])
- basic_machine=hppa1.1-hp
+ cpu=hppa1.1
+ vendor=hp
;;
hp9k78[0-9] | hp78[0-9])
# FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
+ cpu=hppa1.1
+ vendor=hp
;;
hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
# FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
+ cpu=hppa1.1
+ vendor=hp
;;
hp9k8[0-9][13679] | hp8[0-9][13679])
- basic_machine=hppa1.1-hp
+ cpu=hppa1.1
+ vendor=hp
;;
hp9k8[0-9][0-9] | hp8[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hppa-next)
- os=-nextstep3
- ;;
- hppaosf)
- basic_machine=hppa1.1-hp
- os=-osf
- ;;
- hppro)
- basic_machine=hppa1.1-hp
- os=-proelf
- ;;
- i370-ibm* | ibm*)
- basic_machine=i370-ibm
+ cpu=hppa1.0
+ vendor=hp
;;
i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv32
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
+ vendor=pc
+ os=sysv32
;;
i*86v4*)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv4
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
+ vendor=pc
+ os=sysv4
;;
i*86v)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
+ vendor=pc
+ os=sysv
;;
i*86sol2)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-solaris2
- ;;
- i386mach)
- basic_machine=i386-mach
- os=-mach
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
+ vendor=pc
+ os=solaris2
;;
- i386-vsta | vsta)
- basic_machine=i386-unknown
- os=-vsta
+ j90 | j90-cray)
+ cpu=j90
+ vendor=cray
+ os=${os:-unicos}
;;
iris | iris4d)
- basic_machine=mips-sgi
+ cpu=mips
+ vendor=sgi
case $os in
- -irix*)
+ irix*)
;;
*)
- os=-irix4
+ os=irix4
;;
esac
;;
- isi68 | isi)
- basic_machine=m68k-isi
- os=-sysv
- ;;
- leon-*|leon[3-9]-*)
- basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
- ;;
- m68knommu)
- basic_machine=m68k-unknown
- os=-linux
- ;;
- m68knommu-*)
- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
- magnum | m3230)
- basic_machine=mips-mips
- os=-sysv
- ;;
- merlin)
- basic_machine=ns32k-utek
- os=-sysv
- ;;
- microblaze*)
- basic_machine=microblaze-xilinx
- ;;
- mingw64)
- basic_machine=x86_64-pc
- os=-mingw64
- ;;
- mingw32)
- basic_machine=i686-pc
- os=-mingw32
- ;;
- mingw32ce)
- basic_machine=arm-unknown
- os=-mingw32ce
- ;;
miniframe)
- basic_machine=m68000-convergent
- ;;
- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
- basic_machine=m68k-atari
- os=-mint
- ;;
- mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- ;;
- mips3*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- ;;
- monitor)
- basic_machine=m68k-rom68k
- os=-coff
- ;;
- morphos)
- basic_machine=powerpc-unknown
- os=-morphos
- ;;
- moxiebox)
- basic_machine=moxie-unknown
- os=-moxiebox
- ;;
- msdos)
- basic_machine=i386-pc
- os=-msdos
- ;;
- ms1-*)
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- ;;
- msys)
- basic_machine=i686-pc
- os=-msys
- ;;
- mvs)
- basic_machine=i370-ibm
- os=-mvs
+ cpu=m68000
+ vendor=convergent
;;
- nacl)
- basic_machine=le32-unknown
- os=-nacl
- ;;
- ncr3000)
- basic_machine=i486-ncr
- os=-sysv4
- ;;
- netbsd386)
- basic_machine=i386-unknown
- os=-netbsd
- ;;
- netwinder)
- basic_machine=armv4l-rebel
- os=-linux
- ;;
- news | news700 | news800 | news900)
- basic_machine=m68k-sony
- os=-newsos
- ;;
- news1000)
- basic_machine=m68030-sony
- os=-newsos
+ *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
+ cpu=m68k
+ vendor=atari
+ os=mint
;;
news-3600 | risc-news)
- basic_machine=mips-sony
- os=-newsos
- ;;
- necv70)
- basic_machine=v70-nec
- os=-sysv
+ cpu=mips
+ vendor=sony
+ os=newsos
;;
- next | m*-next )
- basic_machine=m68k-next
+ next | m*-next)
+ cpu=m68k
+ vendor=next
case $os in
- -nextstep* )
+ openstep*)
+ ;;
+ nextstep*)
;;
- -ns2*)
- os=-nextstep2
+ ns2*)
+ os=nextstep2
;;
*)
- os=-nextstep3
+ os=nextstep3
;;
esac
;;
- nh3000)
- basic_machine=m68k-harris
- os=-cxux
- ;;
- nh[45]000)
- basic_machine=m88k-harris
- os=-cxux
- ;;
- nindy960)
- basic_machine=i960-intel
- os=-nindy
- ;;
- mon960)
- basic_machine=i960-intel
- os=-mon960
- ;;
- nonstopux)
- basic_machine=mips-compaq
- os=-nonstopux
- ;;
np1)
- basic_machine=np1-gould
- ;;
- neo-tandem)
- basic_machine=neo-tandem
- ;;
- nse-tandem)
- basic_machine=nse-tandem
- ;;
- nsr-tandem)
- basic_machine=nsr-tandem
+ cpu=np1
+ vendor=gould
;;
op50n-* | op60c-*)
- basic_machine=hppa1.1-oki
- os=-proelf
- ;;
- openrisc | openrisc-*)
- basic_machine=or32-unknown
- ;;
- os400)
- basic_machine=powerpc-ibm
- os=-os400
- ;;
- OSE68000 | ose68000)
- basic_machine=m68000-ericsson
- os=-ose
- ;;
- os68k)
- basic_machine=m68k-none
- os=-os68k
+ cpu=hppa1.1
+ vendor=oki
+ os=proelf
;;
pa-hitachi)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- paragon)
- basic_machine=i860-intel
- os=-osf
- ;;
- parisc)
- basic_machine=hppa-unknown
- os=-linux
- ;;
- parisc-*)
- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
+ cpu=hppa1.1
+ vendor=hitachi
+ os=hiuxwe2
;;
pbd)
- basic_machine=sparc-tti
+ cpu=sparc
+ vendor=tti
;;
pbb)
- basic_machine=m68k-tti
- ;;
- pc532 | pc532-*)
- basic_machine=ns32k-pc532
+ cpu=m68k
+ vendor=tti
;;
- pc98)
- basic_machine=i386-pc
- ;;
- pc98-*)
- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
- ;;
- pentiumpro | p6 | 6x86 | athlon | athlon_*)
- basic_machine=i686-pc
- ;;
- pentiumii | pentium2 | pentiumiii | pentium3)
- basic_machine=i686-pc
- ;;
- pentium4)
- basic_machine=i786-pc
- ;;
- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentium4-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ pc532)
+ cpu=ns32k
+ vendor=pc532
;;
pn)
- basic_machine=pn-gould
+ cpu=pn
+ vendor=gould
;;
- power) basic_machine=power-ibm
- ;;
- ppc | ppcbe) basic_machine=powerpc-unknown
- ;;
- ppc-* | ppcbe-*)
- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
- basic_machine=powerpcle-unknown
- ;;
- ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppc64) basic_machine=powerpc64-unknown
- ;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
- basic_machine=powerpc64le-unknown
- ;;
- ppc64le-* | powerpc64little-*)
- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ power)
+ cpu=power
+ vendor=ibm
;;
ps2)
- basic_machine=i386-ibm
- ;;
- pw32)
- basic_machine=i586-unknown
- os=-pw32
- ;;
- rdos | rdos64)
- basic_machine=x86_64-pc
- os=-rdos
- ;;
- rdos32)
- basic_machine=i386-pc
- os=-rdos
- ;;
- rom68k)
- basic_machine=m68k-rom68k
- os=-coff
+ cpu=i386
+ vendor=ibm
;;
rm[46]00)
- basic_machine=mips-siemens
+ cpu=mips
+ vendor=siemens
;;
rtpc | rtpc-*)
- basic_machine=romp-ibm
- ;;
- s390 | s390-*)
- basic_machine=s390-ibm
- ;;
- s390x | s390x-*)
- basic_machine=s390x-ibm
+ cpu=romp
+ vendor=ibm
;;
- sa29200)
- basic_machine=a29k-amd
- os=-udi
- ;;
- sb1)
- basic_machine=mipsisa64sb1-unknown
+ sde)
+ cpu=mipsisa32
+ vendor=sde
+ os=${os:-elf}
;;
- sb1el)
- basic_machine=mipsisa64sb1el-unknown
+ simso-wrs)
+ cpu=sparclite
+ vendor=wrs
+ os=vxworks
;;
- sde)
- basic_machine=mipsisa32-sde
- os=-elf
+ tower | tower-32)
+ cpu=m68k
+ vendor=ncr
;;
- sei)
- basic_machine=mips-sei
- os=-seiux
+ vpp*|vx|vx-*)
+ cpu=f301
+ vendor=fujitsu
;;
- sequent)
- basic_machine=i386-sequent
+ w65)
+ cpu=w65
+ vendor=wdc
;;
- sh)
- basic_machine=sh-hitachi
- os=-hms
+ w89k-*)
+ cpu=hppa1.1
+ vendor=winbond
+ os=proelf
;;
- sh5el)
- basic_machine=sh5le-unknown
+ none)
+ cpu=none
+ vendor=none
;;
- sh64)
- basic_machine=sh64-unknown
+ leon|leon[3-9])
+ cpu=sparc
+ vendor=$basic_machine
;;
- sparclite-wrs | simso-wrs)
- basic_machine=sparclite-wrs
- os=-vxworks
+ leon-*|leon[3-9]-*)
+ cpu=sparc
+ vendor=`echo "$basic_machine" | sed 's/-.*//'`
;;
- sps7)
- basic_machine=m68k-bull
- os=-sysv2
+
+ *-*)
+ # shellcheck disable=SC2162
+ IFS="-" read cpu vendor <<EOF
+$basic_machine
+EOF
;;
- spur)
- basic_machine=spur-unknown
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+ i*86 | x86_64)
+ cpu=$basic_machine
+ vendor=pc
;;
- st2000)
- basic_machine=m68k-tandem
+ # These rules are duplicated from below for sake of the special case above;
+ # i.e. things that normalized to x86 arches should also default to "pc"
+ pc98)
+ cpu=i386
+ vendor=pc
;;
- stratus)
- basic_machine=i860-stratus
- os=-sysv4
+ x64 | amd64)
+ cpu=x86_64
+ vendor=pc
;;
- strongarm-* | thumb-*)
- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ # Recognize the basic CPU types without company name.
+ *)
+ cpu=$basic_machine
+ vendor=unknown
;;
- sun2)
- basic_machine=m68000-sun
+esac
+
+unset -v basic_machine
+
+# Decode basic machines in the full and proper CPU-Company form.
+case $cpu-$vendor in
+ # Here we handle the default manufacturer of certain CPU types in canonical form. It is in
+ # some cases the only manufacturer, in others, it is the most popular.
+ craynv-unknown)
+ vendor=cray
+ os=${os:-unicosmp}
;;
- sun2os3)
- basic_machine=m68000-sun
- os=-sunos3
+ c90-unknown | c90-cray)
+ vendor=cray
+ os=${os:-unicos}
;;
- sun2os4)
- basic_machine=m68000-sun
- os=-sunos4
+ fx80-unknown)
+ vendor=alliant
;;
- sun3os3)
- basic_machine=m68k-sun
- os=-sunos3
+ romp-unknown)
+ vendor=ibm
;;
- sun3os4)
- basic_machine=m68k-sun
- os=-sunos4
+ mmix-unknown)
+ vendor=knuth
;;
- sun4os3)
- basic_machine=sparc-sun
- os=-sunos3
+ microblaze-unknown | microblazeel-unknown)
+ vendor=xilinx
;;
- sun4os4)
- basic_machine=sparc-sun
- os=-sunos4
+ rs6000-unknown)
+ vendor=ibm
;;
- sun4sol2)
- basic_machine=sparc-sun
- os=-solaris2
+ vax-unknown)
+ vendor=dec
;;
- sun3 | sun3-*)
- basic_machine=m68k-sun
+ pdp11-unknown)
+ vendor=dec
;;
- sun4)
- basic_machine=sparc-sun
+ we32k-unknown)
+ vendor=att
;;
- sun386 | sun386i | roadrunner)
- basic_machine=i386-sun
+ cydra-unknown)
+ vendor=cydrome
;;
- sv1)
- basic_machine=sv1-cray
- os=-unicos
+ i370-ibm*)
+ vendor=ibm
;;
- symmetry)
- basic_machine=i386-sequent
- os=-dynix
+ orion-unknown)
+ vendor=highlevel
;;
- t3e)
- basic_machine=alphaev5-cray
- os=-unicos
+ xps-unknown | xps100-unknown)
+ cpu=xps100
+ vendor=honeywell
;;
- t90)
- basic_machine=t90-cray
- os=-unicos
+
+ # Here we normalize CPU types with a missing or matching vendor
+ dpx20-unknown | dpx20-bull)
+ cpu=rs6000
+ vendor=bull
+ os=${os:-bosx}
;;
- tile*)
- basic_machine=$basic_machine-unknown
- os=-linux-gnu
+
+ # Here we normalize CPU types irrespective of the vendor
+ amd64-*)
+ cpu=x86_64
;;
- tx39)
- basic_machine=mipstx39-unknown
+ blackfin-*)
+ cpu=bfin
+ os=linux
;;
- tx39el)
- basic_machine=mipstx39el-unknown
+ c54x-*)
+ cpu=tic54x
;;
- toad1)
- basic_machine=pdp10-xkl
- os=-tops20
+ c55x-*)
+ cpu=tic55x
;;
- tower | tower-32)
- basic_machine=m68k-ncr
+ c6x-*)
+ cpu=tic6x
;;
- tpf)
- basic_machine=s390x-ibm
- os=-tpf
+ e500v[12]-*)
+ cpu=powerpc
+ os=$os"spe"
;;
- udi29k)
- basic_machine=a29k-amd
- os=-udi
+ mips3*-*)
+ cpu=mips64
;;
- ultra3)
- basic_machine=a29k-nyu
- os=-sym1
+ ms1-*)
+ cpu=mt
;;
- v810 | necv810)
- basic_machine=v810-nec
- os=-none
+ m68knommu-*)
+ cpu=m68k
+ os=linux
;;
- vaxv)
- basic_machine=vax-dec
- os=-sysv
+ m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+ cpu=s12z
;;
- vms)
- basic_machine=vax-dec
- os=-vms
+ openrisc-*)
+ cpu=or32
;;
- vpp*|vx|vx-*)
- basic_machine=f301-fujitsu
+ parisc-*)
+ cpu=hppa
+ os=linux
;;
- vxworks960)
- basic_machine=i960-wrs
- os=-vxworks
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+ cpu=i586
;;
- vxworks68)
- basic_machine=m68k-wrs
- os=-vxworks
+ pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+ cpu=i686
;;
- vxworks29k)
- basic_machine=a29k-wrs
- os=-vxworks
+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+ cpu=i686
;;
- w65*)
- basic_machine=w65-wdc
- os=-none
+ pentium4-*)
+ cpu=i786
;;
- w89k-*)
- basic_machine=hppa1.1-winbond
- os=-proelf
+ pc98-*)
+ cpu=i386
;;
- xbox)
- basic_machine=i686-pc
- os=-mingw32
+ ppc-* | ppcbe-*)
+ cpu=powerpc
;;
- xps | xps100)
- basic_machine=xps100-honeywell
+ ppcle-* | powerpclittle-*)
+ cpu=powerpcle
;;
- xscale-* | xscalee[bl]-*)
- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ ppc64-*)
+ cpu=powerpc64
;;
- ymp)
- basic_machine=ymp-cray
- os=-unicos
+ ppc64le-* | powerpc64little-*)
+ cpu=powerpc64le
;;
- z8k-*-coff)
- basic_machine=z8k-unknown
- os=-sim
+ sb1-*)
+ cpu=mipsisa64sb1
;;
- z80-*-coff)
- basic_machine=z80-unknown
- os=-sim
+ sb1el-*)
+ cpu=mipsisa64sb1el
;;
- none)
- basic_machine=none-none
- os=-none
+ sh5e[lb]-*)
+ cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
;;
-
-# Here we handle the default manufacturer of certain CPU types. It is in
-# some cases the only manufacturer, in others, it is the most popular.
- w89k)
- basic_machine=hppa1.1-winbond
+ spur-*)
+ cpu=spur
;;
- op50n)
- basic_machine=hppa1.1-oki
+ strongarm-* | thumb-*)
+ cpu=arm
;;
- op60c)
- basic_machine=hppa1.1-oki
+ tx39-*)
+ cpu=mipstx39
;;
- romp)
- basic_machine=romp-ibm
+ tx39el-*)
+ cpu=mipstx39el
;;
- mmix)
- basic_machine=mmix-knuth
+ x64-*)
+ cpu=x86_64
;;
- rs6000)
- basic_machine=rs6000-ibm
+ xscale-* | xscalee[bl]-*)
+ cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
;;
- vax)
- basic_machine=vax-dec
+
+ # Recognize the canonical CPU Types that limit and/or modify the
+ # company names they are paired with.
+ cr16-*)
+ os=${os:-elf}
;;
- pdp10)
- # there are many clones, so DEC is not a safe bet
- basic_machine=pdp10-unknown
+ crisv32-* | etraxfs*-*)
+ cpu=crisv32
+ vendor=axis
;;
- pdp11)
- basic_machine=pdp11-dec
+ cris-* | etrax*-*)
+ cpu=cris
+ vendor=axis
;;
- we32k)
- basic_machine=we32k-att
+ crx-*)
+ os=${os:-elf}
;;
- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
+ neo-tandem)
+ cpu=neo
+ vendor=tandem
;;
- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
+ nse-tandem)
+ cpu=nse
+ vendor=tandem
;;
- cydra)
- basic_machine=cydra-cydrome
+ nsr-tandem)
+ cpu=nsr
+ vendor=tandem
;;
- orion)
- basic_machine=orion-highlevel
+ nsv-tandem)
+ cpu=nsv
+ vendor=tandem
;;
- orion105)
- basic_machine=clipper-highlevel
+ nsx-tandem)
+ cpu=nsx
+ vendor=tandem
;;
- mac | mpw | mac-mpw)
- basic_machine=m68k-apple
+ s390-*)
+ cpu=s390
+ vendor=ibm
;;
- pmac | pmac-mpw)
- basic_machine=powerpc-apple
+ s390x-*)
+ cpu=s390x
+ vendor=ibm
;;
- *-unknown)
- # Make sure to match an already-canonicalized machine name.
+ tile*-*)
+ os=${os:-linux-gnu}
;;
+
*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
+ # Recognize the canonical CPU types that are allowed with any
+ # company name.
+ case $cpu in
+ 1750a | 580 \
+ | a29k \
+ | aarch64 | aarch64_be \
+ | abacus \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
+ | alphapca5[67] | alpha64pca5[67] \
+ | am33_2.0 \
+ | amdgcn \
+ | arc | arceb \
+ | arm | arm[lb]e | arme[lb] | armv* \
+ | avr | avr32 \
+ | asmjs \
+ | ba \
+ | be32 | be64 \
+ | bfin | bpf | bs2000 \
+ | c[123]* | c30 | [cjt]90 | c4x \
+ | c8051 | clipper | craynv | csky | cydra \
+ | d10v | d30v | dlx | dsp16xx \
+ | e2k | elxsi | epiphany \
+ | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+ | h8300 | h8500 \
+ | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
+ | i370 | i*86 | i860 | i960 | ia16 | ia64 \
+ | ip2k | iq2000 \
+ | k1om \
+ | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle \
+ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
+ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
+ | m88110 | m88k | maxq | mb | mcore | mep | metag \
+ | microblaze | microblazeel \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64eb | mips64el \
+ | mips64octeon | mips64octeonel \
+ | mips64orion | mips64orionel \
+ | mips64r5900 | mips64r5900el \
+ | mips64vr | mips64vrel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r6 | mipsisa32r6el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r6 | mipsisa64r6el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
+ | mipstx39 | mipstx39el \
+ | mmix \
+ | mn10200 | mn10300 \
+ | moxie \
+ | mt \
+ | msp430 \
+ | nds32 | nds32le | nds32be \
+ | nfp \
+ | nios | nios2 | nios2eb | nios2el \
+ | none | np1 | ns16k | ns32k | nvptx \
+ | open8 \
+ | or1k* \
+ | or32 \
+ | orion \
+ | picochip \
+ | pdp10 | pdp11 | pj | pjl | pn | power \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+ | pru \
+ | pyramid \
+ | riscv | riscv32 | riscv64 \
+ | rl78 | romp | rs6000 | rx \
+ | score \
+ | sh | shl \
+ | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
+ | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+ | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+ | spu \
+ | tahoe \
+ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+ | tron \
+ | ubicom32 \
+ | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+ | vax \
+ | visium \
+ | w65 \
+ | wasm32 | wasm64 \
+ | we32k \
+ | x86 | x86_64 | xc16x | xgate | xps100 \
+ | xstormy16 | xtensa* \
+ | ymp \
+ | z8k | z80)
+ ;;
+
+ *)
+ echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+ exit 1
+ ;;
+ esac
;;
esac
# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
- *-digital*)
- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+case $vendor in
+ digital*)
+ vendor=dec
;;
- *-commodore*)
- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ commodore*)
+ vendor=cbm
;;
*)
;;
@@ -1347,200 +1278,246 @@ esac
# Decode manufacturer-specific aliases for certain operating systems.
-if [ x"$os" != x"" ]
+if [ x$os != x ]
then
case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
- # -solaris* is a basic system type, with this one exception.
- -auroraux)
- os=-auroraux
+ # First match some system type aliases that might get confused
+ # with valid system types.
+ # solaris* is a basic system type, with this one exception.
+ auroraux)
+ os=auroraux
;;
- -solaris1 | -solaris1.*)
- os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ bluegene*)
+ os=cnk
;;
- -solaris)
- os=-solaris2
+ solaris1 | solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
- -svr4*)
- os=-sysv4
+ solaris)
+ os=solaris2
;;
- -unixware*)
- os=-sysv4.2uw
+ unixware*)
+ os=sysv4.2uw
;;
- -gnu/linux*)
+ gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
- # First accept the basic system types.
+ # es1800 is here to avoid being matched by es* (a different OS)
+ es1800*)
+ os=ose
+ ;;
+ # Some version numbers need modification
+ chorusos*)
+ os=chorusos
+ ;;
+ isc)
+ os=isc2.2
+ ;;
+ sco6)
+ os=sco5v6
+ ;;
+ sco5)
+ os=sco3.2v5
+ ;;
+ sco4)
+ os=sco3.2v4
+ ;;
+ sco3.2.[4-9]*)
+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+ ;;
+ sco3.2v[4-9]* | sco5v6*)
+ # Don't forget version if it is 3.2v4 or newer.
+ ;;
+ scout)
+ # Don't match below
+ ;;
+ sco*)
+ os=sco3.2v2
+ ;;
+ psos*)
+ os=psos
+ ;;
+ # Now accept the basic system types.
# The portable systems comes first.
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* | -plan9* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* | -cloudabi* | -sortix* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- | -onefs* | -tirtos* | -phoenix*)
+ # Each alternative MUST end in a * to match a version number.
+ # sysv* is not here because it comes later, after sysvr4.
+ gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+ | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
+ | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+ | sym* | kopensolaris* | plan9* \
+ | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+ | aos* | aros* | cloudabi* | sortix* \
+ | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+ | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+ | knetbsd* | mirbsd* | netbsd* \
+ | bitrig* | openbsd* | solidbsd* | libertybsd* \
+ | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
+ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+ | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
+ | chorusrdb* | cegcc* | glidix* \
+ | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+ | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
+ | linux-newlib* | linux-musl* | linux-uclibc* \
+ | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+ | interix* | uwin* | mks* | rhapsody* | darwin* \
+ | openstep* | oskit* | conix* | pw32* | nonstopux* \
+ | storm-chaos* | tops10* | tenex* | tops20* | its* \
+ | os2* | vos* | palmos* | uclinux* | nucleus* \
+ | morphos* | superux* | rtmk* | windiss* \
+ | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+ | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
- -qnx*)
- case $basic_machine in
- x86-* | i*86-*)
+ qnx*)
+ case $cpu in
+ x86 | i*86)
;;
*)
- os=-nto$os
+ os=nto-$os
;;
esac
;;
- -nto-qnx*)
+ hiux*)
+ os=hiuxwe2
;;
- -nto*)
- os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ nto-qnx*)
;;
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
- | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ nto*)
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
- -mac*)
- os=`echo $os | sed -e 's|mac|macos|'`
+ sim | xray | os68k* | v88r* \
+ | windows* | osx | abug | netware* | os9* \
+ | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
;;
- -linux-dietlibc)
- os=-linux-dietlibc
+ linux-dietlibc)
+ os=linux-dietlibc
;;
- -linux*)
+ linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
- -sunos5*)
- os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ lynx*178)
+ os=lynxos178
;;
- -sunos6*)
- os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ lynx*5)
+ os=lynxos5
;;
- -opened*)
- os=-openedition
+ lynx*)
+ os=lynxos
;;
- -os400*)
- os=-os400
+ mac*)
+ os=`echo "$os" | sed -e 's|mac|macos|'`
;;
- -wince*)
- os=-wince
+ opened*)
+ os=openedition
;;
- -osfrose*)
- os=-osfrose
+ os400*)
+ os=os400
;;
- -osf*)
- os=-osf
+ sunos5*)
+ os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
;;
- -utek*)
- os=-bsd
+ sunos6*)
+ os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
;;
- -dynix*)
- os=-bsd
+ wince*)
+ os=wince
;;
- -acis*)
- os=-aos
+ utek*)
+ os=bsd
;;
- -atheos*)
- os=-atheos
+ dynix*)
+ os=bsd
;;
- -syllable*)
- os=-syllable
+ acis*)
+ os=aos
;;
- -386bsd)
- os=-bsd
+ atheos*)
+ os=atheos
;;
- -ctix* | -uts*)
- os=-sysv
+ syllable*)
+ os=syllable
;;
- -nova*)
- os=-rtmk-nova
+ 386bsd)
+ os=bsd
+ ;;
+ ctix* | uts*)
+ os=sysv
+ ;;
+ nova*)
+ os=rtmk-nova
;;
- -ns2 )
- os=-nextstep2
+ ns2)
+ os=nextstep2
;;
- -nsk*)
- os=-nsk
+ nsk*)
+ os=nsk
;;
# Preserve the version number of sinix5.
- -sinix5.*)
+ sinix5.*)
os=`echo $os | sed -e 's|sinix|sysv|'`
;;
- -sinix*)
- os=-sysv4
+ sinix*)
+ os=sysv4
;;
- -tpf*)
- os=-tpf
+ tpf*)
+ os=tpf
;;
- -triton*)
- os=-sysv3
+ triton*)
+ os=sysv3
;;
- -oss*)
- os=-sysv3
+ oss*)
+ os=sysv3
;;
- -svr4)
- os=-sysv4
+ svr4*)
+ os=sysv4
;;
- -svr3)
- os=-sysv3
+ svr3)
+ os=sysv3
;;
- -sysvr4)
- os=-sysv4
+ sysvr4)
+ os=sysv4
;;
- # This must come after -sysvr4.
- -sysv*)
+ # This must come after sysvr4.
+ sysv*)
;;
- -ose*)
- os=-ose
+ ose*)
+ os=ose
;;
- -es1800*)
- os=-ose
+ *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+ os=mint
;;
- -xenix)
- os=-xenix
+ zvmoe)
+ os=zvmoe
;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
+ dicos*)
+ os=dicos
;;
- -aros*)
- os=-aros
- ;;
- -zvmoe)
- os=-zvmoe
+ pikeos*)
+ # Until real need of OS specific support for
+ # particular features comes up, bare metal
+ # configurations are quite functional.
+ case $cpu in
+ arm*)
+ os=eabi
+ ;;
+ *)
+ os=elf
+ ;;
+ esac
;;
- -dicos*)
- os=-dicos
+ nacl*)
;;
- -nacl*)
+ ios)
;;
- -ios)
+ none)
;;
- -none)
+ *-eabi)
;;
*)
- # Get rid of the `-' at the beginning of $os.
- os=`echo $os | sed 's/[^-]*-//'`
- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
exit 1
;;
esac
@@ -1556,261 +1533,265 @@ else
# will signal an error saying that MANUFACTURER isn't an operating
# system, and we'll never get to this point.
-case $basic_machine in
+case $cpu-$vendor in
score-*)
- os=-elf
+ os=elf
;;
spu-*)
- os=-elf
+ os=elf
;;
*-acorn)
- os=-riscix1.2
+ os=riscix1.2
;;
arm*-rebel)
- os=-linux
+ os=linux
;;
arm*-semi)
- os=-aout
+ os=aout
;;
c4x-* | tic4x-*)
- os=-coff
+ os=coff
;;
c8051-*)
- os=-elf
+ os=elf
+ ;;
+ clipper-intergraph)
+ os=clix
;;
hexagon-*)
- os=-elf
+ os=elf
;;
tic54x-*)
- os=-coff
+ os=coff
;;
tic55x-*)
- os=-coff
+ os=coff
;;
tic6x-*)
- os=-coff
+ os=coff
;;
# This must come before the *-dec entry.
pdp10-*)
- os=-tops20
+ os=tops20
;;
pdp11-*)
- os=-none
+ os=none
;;
*-dec | vax-*)
- os=-ultrix4.2
+ os=ultrix4.2
;;
m68*-apollo)
- os=-domain
+ os=domain
;;
i386-sun)
- os=-sunos4.0.2
+ os=sunos4.0.2
;;
m68000-sun)
- os=-sunos3
+ os=sunos3
;;
m68*-cisco)
- os=-aout
+ os=aout
;;
mep-*)
- os=-elf
+ os=elf
;;
mips*-cisco)
- os=-elf
+ os=elf
;;
mips*-*)
- os=-elf
+ os=elf
;;
or32-*)
- os=-coff
+ os=coff
;;
*-tti) # must be before sparc entry or we get the wrong os.
- os=-sysv3
+ os=sysv3
;;
sparc-* | *-sun)
- os=-sunos4.1.1
+ os=sunos4.1.1
;;
- *-be)
- os=-beos
+ pru-*)
+ os=elf
;;
- *-haiku)
- os=-haiku
+ *-be)
+ os=beos
;;
*-ibm)
- os=-aix
+ os=aix
;;
*-knuth)
- os=-mmixware
+ os=mmixware
;;
*-wec)
- os=-proelf
+ os=proelf
;;
*-winbond)
- os=-proelf
+ os=proelf
;;
*-oki)
- os=-proelf
+ os=proelf
;;
*-hp)
- os=-hpux
+ os=hpux
;;
*-hitachi)
- os=-hiux
+ os=hiux
;;
i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
- os=-sysv
+ os=sysv
;;
*-cbm)
- os=-amigaos
+ os=amigaos
;;
*-dg)
- os=-dgux
+ os=dgux
;;
*-dolphin)
- os=-sysv3
+ os=sysv3
;;
m68k-ccur)
- os=-rtu
+ os=rtu
;;
m88k-omron*)
- os=-luna
+ os=luna
;;
- *-next )
- os=-nextstep
+ *-next)
+ os=nextstep
;;
*-sequent)
- os=-ptx
+ os=ptx
;;
*-crds)
- os=-unos
+ os=unos
;;
*-ns)
- os=-genix
+ os=genix
;;
i370-*)
- os=-mvs
- ;;
- *-next)
- os=-nextstep3
+ os=mvs
;;
*-gould)
- os=-sysv
+ os=sysv
;;
*-highlevel)
- os=-bsd
+ os=bsd
;;
*-encore)
- os=-bsd
+ os=bsd
;;
*-sgi)
- os=-irix
+ os=irix
;;
*-siemens)
- os=-sysv4
+ os=sysv4
;;
*-masscomp)
- os=-rtu
+ os=rtu
;;
f30[01]-fujitsu | f700-fujitsu)
- os=-uxpv
+ os=uxpv
;;
*-rom68k)
- os=-coff
+ os=coff
;;
*-*bug)
- os=-coff
+ os=coff
;;
*-apple)
- os=-macos
+ os=macos
;;
*-atari*)
- os=-mint
+ os=mint
+ ;;
+ *-wrs)
+ os=vxworks
;;
*)
- os=-none
+ os=none
;;
esac
fi
# Here we handle the case where we know the os, and the CPU type, but not the
# manufacturer. We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
- *-unknown)
+case $vendor in
+ unknown)
case $os in
- -riscix*)
+ riscix*)
vendor=acorn
;;
- -sunos*)
+ sunos*)
vendor=sun
;;
- -cnk*|-aix*)
+ cnk*|-aix*)
vendor=ibm
;;
- -beos*)
+ beos*)
vendor=be
;;
- -hpux*)
+ hpux*)
vendor=hp
;;
- -mpeix*)
+ mpeix*)
vendor=hp
;;
- -hiux*)
+ hiux*)
vendor=hitachi
;;
- -unos*)
+ unos*)
vendor=crds
;;
- -dgux*)
+ dgux*)
vendor=dg
;;
- -luna*)
+ luna*)
vendor=omron
;;
- -genix*)
+ genix*)
vendor=ns
;;
- -mvs* | -opened*)
+ clix*)
+ vendor=intergraph
+ ;;
+ mvs* | opened*)
vendor=ibm
;;
- -os400*)
+ os400*)
vendor=ibm
;;
- -ptx*)
+ ptx*)
vendor=sequent
;;
- -tpf*)
+ tpf*)
vendor=ibm
;;
- -vxsim* | -vxworks* | -windiss*)
+ vxsim* | vxworks* | windiss*)
vendor=wrs
;;
- -aux*)
+ aux*)
vendor=apple
;;
- -hms*)
+ hms*)
vendor=hitachi
;;
- -mpw* | -macos*)
+ mpw* | macos*)
vendor=apple
;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
vendor=atari
;;
- -vos*)
+ vos*)
vendor=stratus
;;
esac
- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
;;
esac
-echo $basic_machine$os
+echo "$cpu-$vendor-$os"
exit
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff --git a/system/Config.in b/system/Config.in
index 498b56e222..af7d8566d3 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -11,6 +11,7 @@ config BR2_ROOTFS_SKELETON_DEFAULT
bool "default target skeleton"
select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_INIT_SYSV
select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_INIT_BUSYBOX
+ select BR2_PACKAGE_SKELETON_INIT_OPENRC if BR2_INIT_OPENRC
select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_INIT_SYSTEMD
select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_INIT_NONE
help
@@ -98,6 +99,16 @@ config BR2_INIT_SYSV
select BR2_PACKAGE_INITSCRIPTS
select BR2_PACKAGE_SYSVINIT
+config BR2_INIT_OPENRC
+ bool "OpenRC"
+ depends on BR2_USE_MMU
+ depends on !BR2_STATIC_LIBS
+ select BR2_PACKAGE_OPENRC
+
+comment "openrc needs a toolchain w/ dynamic library"
+ depends on BR2_USE_MMU
+ depends on BR2_STATIC_LIBS
+
# In Buildroot, we decided not to support a split-usr when systemd is
# used as an init system. This is a design decision, not a systemd
# issue. Thus the select is with BR2_INIT_SYSTEMD (below) rather than
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index beb17a218b..d9f16e2a3a 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -48,7 +48,7 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC
BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \
BR2_riscv || BR2_sh || BR2_sparc64 || \
BR2_x86_64 || BR2_microblaze || BR2_nios2 || \
- (BR2_arcle && BR2_ARC_ATOMIC_EXT)
+ (BR2_arcle && BR2_ARC_ATOMIC_EXT) || BR2_csky
depends on BR2_USE_MMU
depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2