From ccec21b3b0f05297a73704ef86892f3a81555b4d Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Wed, 6 May 2020 17:52:36 +0200 Subject: [PATCH 01/90] package/pigpio: bump to version 76 Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- package/pigpio/pigpio.hash | 4 ++-- package/pigpio/pigpio.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pigpio/pigpio.hash b/package/pigpio/pigpio.hash index 5b87acf082..b29e71c139 100644 --- a/package/pigpio/pigpio.hash +++ b/package/pigpio/pigpio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dfec8d06075a9336433d96a8e2f86810f3332d616cf0d6253d98ad78094aa15a pigpio-75.tar.gz -sha256 6a90b88421a0d9b090e121daa11b3c6d55eed5eeb3281a2fcc454d6a28b5547c UNLICENCE +sha256 871677cf94152e1caf43088047c3b3eec6b325e568b2e3017d60af2463e5ebd6 pigpio-76.tar.gz +sha256 6a90b88421a0d9b090e121daa11b3c6d55eed5eeb3281a2fcc454d6a28b5547c UNLICENCE diff --git a/package/pigpio/pigpio.mk b/package/pigpio/pigpio.mk index 89d8deb9ea..4b7abf7c20 100644 --- a/package/pigpio/pigpio.mk +++ b/package/pigpio/pigpio.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIGPIO_VERSION = 75 +PIGPIO_VERSION = 76 PIGPIO_SITE = $(call github,joan2937,pigpio,v$(PIGPIO_VERSION)) PIGPIO_LICENSE = Unlicense PIGPIO_LICENSE_FILES = UNLICENCE From 421e18f85d4cc9c2351d25ff5fd5cc9bbcebc943 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Thu, 7 May 2020 15:46:30 +1200 Subject: [PATCH 02/90] package/syslog-ng: bump to 2.27.1 Update to 2.27.1 and drop patch applied upstream. Signed-off-by: Chris Packham Signed-off-by: Thomas Petazzoni --- .../0002-configure.ac-fix-with-netsnmp.patch | 49 ------------------- package/syslog-ng/syslog-ng.conf | 2 +- package/syslog-ng/syslog-ng.hash | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- 4 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch diff --git a/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch b/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch deleted file mode 100644 index 4d531aedd0..0000000000 --- a/package/syslog-ng/0002-configure.ac-fix-with-netsnmp.patch +++ /dev/null @@ -1,49 +0,0 @@ -From bc327e4deb44f6b7a380a85d0b344647ea162ea9 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Mon, 16 Mar 2020 15:41:03 +0100 -Subject: [PATCH] configure.ac: fix --with-net-snmp - -The option '--with-net-snmp' did not work, because later checks were using -the variable '$with_netsnmp' rather than '$with_net_snmp'. - -There are two possible solutions: -- make the option '--with-netsnmp' -- change the internal variables - -Opt for the second option so the user-visible options remain the same. - -Signed-off-by: Thomas De Schampheleire -Upstream-status: backport ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 75901bd98..6e8462c37 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -151,7 +151,7 @@ AC_ARG_WITH(libnet, - AC_ARG_WITH(net-snmp, - [ --with-net-snmp=path use path to net-snmp-config script], - , -- [with_netsnmp=""]) -+ [with_net_snmp=""]) - - AC_ARG_WITH(pidfile-dir, - [ --with-pidfile-dir=path Use path as the directory for storing pidfiles], -@@ -1104,10 +1104,10 @@ dnl afsnmp module & net-snmp headers/libraries - dnl *************************************************************************** - AC_MSG_CHECKING(whether to enable snmp destination driver) - --if test "x$with_netsnmp" = "x"; then -+if test "x$with_net_snmp" = "x"; then - NETSNMP_CONFIG="`which net-snmp-config`" - else -- NETSNMP_CONFIG="$with_netsnmp/net-snmp-config" -+ NETSNMP_CONFIG="$with_net_snmp/net-snmp-config" - fi - - if test "x$enable_afsnmp" = "xyes"; then --- -2.24.1 - diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf index e23d80580d..cad1d9c94d 100644 --- a/package/syslog-ng/syslog-ng.conf +++ b/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.26 +@version: 3.27 source s_sys { file("/proc/kmsg" program_override("kernel")); diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index edb7efe195..ca4b59cd4e 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 90214223864df252cea80dbb35c88a2464edcbbb2c9fbc6f6f6c13ee60cb62cd syslog-ng-3.26.1.tar.gz +sha256 c54c633c97f7fd8dd68261cfd784a76211e6e52965178e3aa4d0e32b899d61b3 syslog-ng-3.27.1.tar.gz sha256 e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b COPYING sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index a0c21a8907..8c19fe74a3 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -6,7 +6,7 @@ # When updating the version, please check at runtime if the version in # syslog-ng.conf header needs to be updated -SYSLOG_NG_VERSION = 3.26.1 +SYSLOG_NG_VERSION = 3.27.1 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt From ab86c3fa11cae4574c08b6257f19d51fb2ee5bc2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 5 May 2020 22:23:56 +0200 Subject: [PATCH 03/90] package/samba4: bump version to 4.11.9 Release notes: https://www.samba.org/samba/history/samba-4.11.9.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index f2ae8b5b58..ad34489317 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.11.8.tar.asc -sha256 bb140caa37d2bbbb1f15f849aa86b1d5f787729443099139936f0ea06a5100ca samba-4.11.8.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.11.9.tar.asc +sha256 ad8cef354cf3f3a8835b04c896906b839270bee763d941db52af037ab5ec8dcc samba-4.11.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 9ec4c1eabe..4124032264 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.11.8 +SAMBA4_VERSION = 4.11.9 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 4be485fab964dcecd3cfc18b3b346610ea4bb849 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Tue, 5 May 2020 14:07:35 +0200 Subject: [PATCH 04/90] package/modem-manager: bump version to 1.12.8 https://lists.freedesktop.org/archives/modemmanager-devel/2020-March/007729.html Signed-off-by: Aleksander Morgado Signed-off-by: Thomas Petazzoni --- package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index f9d790cd0c..2fb10368c8 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2eb3353ee5518005c51d429308695c69d8c38cf2fd9102b04f785c03a0cc624c ModemManager-1.12.6.tar.xz +sha256 68b53d0615ba0d3e2bbf386ed029dfe644a6a30a79ab8d85523527bb4e713aff ModemManager-1.12.8.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 75fc5811db..78cffe1f9c 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.12.6 +MODEM_MANAGER_VERSION = 1.12.8 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) From 682a3882f2da0d83a0339a5b36ab6338b1d8c174 Mon Sep 17 00:00:00 2001 From: Nicola Di Lieto Date: Sat, 9 May 2020 11:06:36 +0200 Subject: [PATCH 05/90] package/uacme: bump version to 1.3 Signed-off-by: Nicola Di Lieto Signed-off-by: Thomas Petazzoni --- package/uacme/uacme.hash | 2 +- package/uacme/uacme.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uacme/uacme.hash b/package/uacme/uacme.hash index b3ec7ed6f2..866cf86dbf 100644 --- a/package/uacme/uacme.hash +++ b/package/uacme/uacme.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7757883ffc305018d3d181a26d0b82a8a0c1f1d5eea21a14979b2c69750b595e uacme-1.2.4.tar.gz +sha256 b219484f9f018dffb4a57c4c37e0e4b6aa15bb00705ad71b6f7b8dd94baf0380 uacme-1.3.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index 7e544fce79..63d3a752c3 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -4,7 +4,7 @@ # ################################################################################ -UACME_VERSION = 1.2.4 +UACME_VERSION = 1.3 # Released versions are on branch upstream/latest, tagged as # upstream/X.Y.Z Do not use vX.Y.Z tags from master, as they do not # include .tarball-version From 677b0d9f574e2860cd22cb36022e5c059b4e6af5 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Fri, 8 May 2020 23:27:34 +0200 Subject: [PATCH 06/90] package/genimage: bump to version 13 Also update hash file formatting (2 spaces) Signed-off-by: Pierre-Jean Texier Signed-off-by: Thomas Petazzoni --- package/genimage/genimage.hash | 4 ++-- package/genimage/genimage.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/genimage/genimage.hash b/package/genimage/genimage.hash index fb5d235508..fbec5ce57b 100644 --- a/package/genimage/genimage.hash +++ b/package/genimage/genimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2e9b43d1288f4e216d6c79de2a0c53ce1bd41f93cec750d8ab057aa2d0b0ee4a genimage-12.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 4206e253226a384386c01591251f2ed1ea3485ef63f1e696db03600e1213db79 genimage-13.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk index 8960393904..dde8f8b9e0 100644 --- a/package/genimage/genimage.mk +++ b/package/genimage/genimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -GENIMAGE_VERSION = 12 +GENIMAGE_VERSION = 13 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 From f45dc7083397480682a32f87b91fc07e43634a90 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 9 May 2020 13:00:37 +0200 Subject: [PATCH 07/90] support/gnuconfig: reference the correct sha1 we're using In commit ff9f778c66f4 (support/gnuconfig: update to 2019-05-28), we forgot to update the README to reference the sha1 we're using, keeping the old one from 2016... Update it now. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- support/gnuconfig/README.buildroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/gnuconfig/README.buildroot b/support/gnuconfig/README.buildroot index 7ba2a332a4..7e7d49830f 100644 --- a/support/gnuconfig/README.buildroot +++ b/support/gnuconfig/README.buildroot @@ -24,4 +24,4 @@ Currently no patches are needed, but they may be needed again in the future. The current Buildroot version is based on the Git commit -dafd8e767ec87b90aac62f0fcedd11944c84b50a of the config.git repository. +104ee6463c4bfaac3f3029d9be9bdd6e93879323 of the config.git repository. From ca7a6ef8aa3f27761ffe7e7f694f29226fadb101 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 9 May 2020 13:00:38 +0200 Subject: [PATCH 08/90] support/gnuconfig: add update script Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- support/gnuconfig/README.buildroot | 14 ++++---------- support/gnuconfig/update | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 10 deletions(-) create mode 100755 support/gnuconfig/update diff --git a/support/gnuconfig/README.buildroot b/support/gnuconfig/README.buildroot index 7e7d49830f..fbf0662543 100644 --- a/support/gnuconfig/README.buildroot +++ b/support/gnuconfig/README.buildroot @@ -13,15 +13,9 @@ files of your package to be updated by using: _POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK --- UPDATE --- -GNU config is now managed in git, so to update: +Run the script 'update' in this directory, and commit the result. -# git clone git://git.savannah.gnu.org/config.git -# cp config/config.* . -# for p in $(ls patches/*.patch); do patch -p1 < $p; done -# rm -rf config +The current Buildroot version is based on this commit of the config.git +repository (leave alone on its own line, the script updates it): -Currently no patches are needed, but they may be needed again in the -future. - -The current Buildroot version is based on the Git commit -104ee6463c4bfaac3f3029d9be9bdd6e93879323 of the config.git repository. +104ee6463c4bfaac3f3029d9be9bdd6e93879323 diff --git a/support/gnuconfig/update b/support/gnuconfig/update new file mode 100755 index 0000000000..c8728eadd2 --- /dev/null +++ b/support/gnuconfig/update @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -e + +cd "${0%/*}" + +git clone https://git.savannah.gnu.org/git/config.git +sha="$(cd config; git log -1 --pretty=tformat:%H)" +sed -r -i -e "\$s/.*/${sha}/" README.buildroot +cp config/config.* . +for p in $(ls patches/*.patch 2>/dev/null); do + patch -p1 < "${p}" +done +rm -rf config From 7715be35d0b377b2c4fd7bc00ffd6ad6e39e525a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 9 May 2020 13:00:39 +0200 Subject: [PATCH 09/90] support/gnuconfig: update to 2020-04-26 Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- support/gnuconfig/README.buildroot | 2 +- support/gnuconfig/config.guess | 80 ++++++++++++++++++------------ support/gnuconfig/config.sub | 31 +++++------- 3 files changed, 62 insertions(+), 51 deletions(-) diff --git a/support/gnuconfig/README.buildroot b/support/gnuconfig/README.buildroot index fbf0662543..3b59510fa5 100644 --- a/support/gnuconfig/README.buildroot +++ b/support/gnuconfig/README.buildroot @@ -18,4 +18,4 @@ Run the script 'update' in this directory, and commit the result. The current Buildroot version is based on this commit of the config.git repository (leave alone on its own line, the script updates it): -104ee6463c4bfaac3f3029d9be9bdd6e93879323 +e78c96e5288993aaea3ec44e5c6ee755c668da79 diff --git a/support/gnuconfig/config.guess b/support/gnuconfig/config.guess index b40e17b137..11fda528bc 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-2019 Free Software Foundation, Inc. +# Copyright 1992-2020 Free Software Foundation, Inc. -timestamp='2019-05-28' +timestamp='2020-04-26' # 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 @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2019 Free Software Foundation, Inc. +Copyright 1992-2020 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." @@ -99,6 +99,8 @@ tmp= trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 set_cc_for_build() { + # prevent multiple calls if $tmp is already set + test "$tmp" && return 0 : "${TMPDIR=/tmp}" # shellcheck disable=SC2039 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || @@ -262,6 +264,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:SolidBSD:*:*) echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; + *:OS108:*:*) + echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE" + exit ;; macppc:MirBSD:*:*) echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; @@ -271,12 +276,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:Sortix:*:*) echo "$UNAME_MACHINE"-unknown-sortix exit ;; + *:Twizzler:*:*) + echo "$UNAME_MACHINE"-unknown-twizzler + exit ;; *:Redox:*:*) echo "$UNAME_MACHINE"-unknown-redox exit ;; mips:OSF1:*.*) - echo mips-dec-osf1 - exit ;; + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -918,7 +926,7 @@ EOF echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -1325,38 +1333,39 @@ EOF echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) - 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 - 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 + if command -v xcode-select > /dev/null 2> /dev/null && \ + ! xcode-select --print-path > /dev/null 2> /dev/null ; then + # Avoid executing cc if there is no toolchain installed as + # cc will be a stub that puts up a graphical alert + # prompting the user to install developer tools. + CC_FOR_BUILD=no_compiler_found + else + set_cc_for_build + fi + 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 + 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 elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 + # uname -m returns i386 or x86_64 + UNAME_PROCESSOR=$UNAME_MACHINE fi echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; @@ -1620,6 +1629,12 @@ copies of config.guess and config.sub with the latest versions from: https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess and https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +EOF + +year=`echo $timestamp | sed 's,-.*,,'` +# shellcheck disable=SC2003 +if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then + cat >&2 <." version="\ GNU config.sub ($timestamp) -Copyright 1992-2019 Free Software Foundation, Inc. +Copyright 1992-2020 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." @@ -337,17 +337,14 @@ case $1 in basic_machine=m88k-harris os=sysv3 ;; - hp300) + hp300 | hp300hpux) basic_machine=m68k-hp + os=hpux ;; hp300bsd) basic_machine=m68k-hp os=bsd ;; - hp300hpux) - basic_machine=m68k-hp - os=hpux - ;; hppaosf) basic_machine=hppa1.1-hp os=osf @@ -360,10 +357,6 @@ case $1 in basic_machine=i386-mach os=mach ;; - vsta) - basic_machine=i386-pc - os=vsta - ;; isi68 | isi) basic_machine=m68k-isi os=sysv @@ -612,6 +605,10 @@ case $1 in basic_machine=vax-dec os=vms ;; + vsta) + basic_machine=i386-pc + os=vsta + ;; vxworks960) basic_machine=i960-wrs os=vxworks @@ -1346,11 +1343,11 @@ case $os in | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ | sym* | kopensolaris* | plan9* \ | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ - | aos* | aros* | cloudabi* | sortix* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ | knetbsd* | mirbsd* | netbsd* \ - | bitrig* | openbsd* | solidbsd* | libertybsd* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \ | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ @@ -1368,7 +1365,8 @@ case $os in | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ | skyos* | haiku* | rdos* | toppers* | drops* | es* \ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ - | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*) + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode*) # Remember, each alternative MUST END IN *, to match a version number. ;; qnx*) @@ -1452,9 +1450,6 @@ case $os in ns2) os=nextstep2 ;; - nsk*) - os=nsk - ;; # Preserve the version number of sinix5. sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` From a935654c964dd33c9ac8649b6d634d1a6e302ee2 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 7 May 2020 16:11:49 -0700 Subject: [PATCH 10/90] package/libnftnl: bump version to 1.1.6 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/libnftnl/libnftnl.hash | 4 ++-- package/libnftnl/libnftnl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnftnl/libnftnl.hash b/package/libnftnl/libnftnl.hash index 4d2eb0ef08..0114619089 100644 --- a/package/libnftnl/libnftnl.hash +++ b/package/libnftnl/libnftnl.hash @@ -1,3 +1,3 @@ # From http://www.netfilter.org/projects/libnftnl/downloads.html -sha256 66de4d05227c0a1a731c369b193010d18a05b1185c2735211e0ecf658eeb14f3 libnftnl-1.1.5.tar.bz2 -sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING +sha256 c1eb5a696fc1d4b3b412770586017bc01af93da3ddd25233d34a62979dee1eca libnftnl-1.1.6.tar.bz2 +sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk index ac780bd8d3..f624474196 100644 --- a/package/libnftnl/libnftnl.mk +++ b/package/libnftnl/libnftnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFTNL_VERSION = 1.1.5 +LIBNFTNL_VERSION = 1.1.6 LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2 LIBNFTNL_LICENSE = GPL-2.0+ From 62c1304445b10b015bc07eb6f8496fc841d2fd9b Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 7 May 2020 16:11:50 -0700 Subject: [PATCH 11/90] package/nftables: bump version to 0.9.4 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/nftables/nftables.hash | 4 ++-- package/nftables/nftables.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nftables/nftables.hash b/package/nftables/nftables.hash index 93c816edc7..afe16ddfaf 100644 --- a/package/nftables/nftables.hash +++ b/package/nftables/nftables.hash @@ -1,3 +1,3 @@ # From https://netfilter.org/projects/nftables/downloads.html -sha256 956b915ce2a7aeaff123e49006be7a0690a0964e96c062703181a36e2e5edb78 nftables-0.9.3.tar.bz2 -sha256 c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e COPYING +sha256 08b8683a9db5fba980bc092b75288af98d218bbe8ab446daf2338570d0730f9a nftables-0.9.4.tar.bz2 +sha256 c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e COPYING diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index 1eef43586c..7f797797db 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFTABLES_VERSION = 0.9.3 +NFTABLES_VERSION = 0.9.4 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2 NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files NFTABLES_DEPENDENCIES = libmnl libnftnl host-bison host-flex \ From b90ab938b83b701073bfd4edd8a6cff2625dcb6c Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 7 May 2020 16:43:21 -0600 Subject: [PATCH 12/90] package/nodejs: bump to version 12.16.3 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 992040d391..411b4d52b9 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v12.16.1/SHASUMS256.txt -sha256 0a95845ba02c46102b5671d0c5732460073f2d397488337e18d1fc30146d412d node-v12.16.1.tar.xz +# From https://nodejs.org/dist/v12.16.3/SHASUMS256.txt +sha256 f0559b0829c7f2ac10bf5b3e157e498227e95e26cdb6af814969c49f367359a3 node-v12.16.3.tar.xz # Hash for license file sha256 3f5749f7a58edaadd77843057a90063a18067f472d8b26c0a76905cafa1063e3 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 7f875058b3..c46dc0e224 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 12.16.1 +NODEJS_VERSION = 12.16.3 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ From 056920f66970be77d13e7bcfa1c6c13791817986 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Sat, 9 May 2020 14:33:02 +0200 Subject: [PATCH 13/90] package/libqmi: bump to version 1.24.12 https://lists.freedesktop.org/archives/libqmi-devel/2020-May/003296.html Signed-off-by: Aleksander Morgado Signed-off-by: Thomas Petazzoni --- package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index 197ea1c007..6341bce8ea 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 c2121243b5da8bcffc8f6f5ca0d7217498f94fffd115883763282c68f255fde7 libqmi-1.24.10.tar.xz +sha256 2d3b91a2b8a882b17b16403c9ef7bdce522db4f0ceaa3e4dff76033885428b69 libqmi-1.24.12.tar.xz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index cd7fafa42a..260dcd1f66 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.24.10 +LIBQMI_VERSION = 1.24.12 LIBQMI_SITE = http://www.freedesktop.org/software/libqmi LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) From 930e631264b08b17714ca120906adcee06852792 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Sat, 9 May 2020 15:36:00 +0200 Subject: [PATCH 14/90] package/modem-manager: bump version to 1.12.10 https://lists.freedesktop.org/archives/modemmanager-devel/2020-May/007828.html Signed-off-by: Aleksander Morgado Signed-off-by: Thomas Petazzoni --- package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 2fb10368c8..bf8f965812 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 68b53d0615ba0d3e2bbf386ed029dfe644a6a30a79ab8d85523527bb4e713aff ModemManager-1.12.8.tar.xz +sha256 b2b3058bbb72adf98b24707fdbebe58e590644a38145e30d574f685f154bf8aa ModemManager-1.12.10.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 78cffe1f9c..e69f6f0f3d 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.12.8 +MODEM_MANAGER_VERSION = 1.12.10 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) From 7bbb1484ee4f61c432591511ed29c3447cb5a636 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 9 May 2020 12:57:30 +0200 Subject: [PATCH 15/90] package/qt5quicktimeline: new package Fixes bug #12871 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/Config.in | 1 + package/qt5/qt5quicktimeline/Config.in | 12 ++++++++++++ .../qt5/qt5quicktimeline/qt5quicktimeline.hash | 5 +++++ package/qt5/qt5quicktimeline/qt5quicktimeline.mk | 16 ++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 package/qt5/qt5quicktimeline/Config.in create mode 100644 package/qt5/qt5quicktimeline/qt5quicktimeline.hash create mode 100644 package/qt5/qt5quicktimeline/qt5quicktimeline.mk diff --git a/package/qt5/Config.in b/package/qt5/Config.in index c716919476..5c544ecec4 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -48,6 +48,7 @@ source "package/qt5/qt5location/Config.in" source "package/qt5/qt5multimedia/Config.in" source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5quickcontrols2/Config.in" +source "package/qt5/qt5quicktimeline/Config.in" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5scxml/Config.in" source "package/qt5/qt5sensors/Config.in" diff --git a/package/qt5/qt5quicktimeline/Config.in b/package/qt5/qt5quicktimeline/Config.in new file mode 100644 index 0000000000..3c6fe3efe6 --- /dev/null +++ b/package/qt5/qt5quicktimeline/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_QT5QUICKTIMELINE + bool "qt5quicktimeline" + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_QT5DECLARATIVE_QUICK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5quicktimeline module. + + https://doc.qt.io/qt-5/qtquicktimeline-index.html diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash new file mode 100644 index 0000000000..a81bec0d66 --- /dev/null +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -0,0 +1,5 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtquicktimeline-everywhere-src-5.14.2.tar.xz.sha256 +sha256 83a45d0998cbc77f8094854a477ab1ac0838ae7fd822563d995df40149893a9e qtquicktimeline-everywhere-src-5.14.2.tar.xz + +# Hashes for license files: +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk new file mode 100644 index 0000000000..ef6927f928 --- /dev/null +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# qt5quicktimeline +# +################################################################################ + +QT5QUICKTIMELINE_VERSION = $(QT5_VERSION) +QT5QUICKTIMELINE_SITE = $(QT5_SITE) +QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5QUICKTIMELINE_VERSION).tar.xz +QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative +QT5QUICKTIMELINE_INSTALL_STAGING = YES + +QT5QUICKTIMELINE_LICENSE = GPL-3.0, GFDL-1.3 (docs) +QT5QUICKTIMELINE_LICENSE_FILES = LICENSE.GPL3 + +$(eval $(qmake-package)) From 911f718df590224d1843efa1157356ba26f16bc2 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Tue, 5 May 2020 14:06:06 +0200 Subject: [PATCH 16/90] package/network-manager: don't explicitly select QMI/MBIM support When NetworkManager is built with ModemManager support, it should only require the generic ModemManager dependency; it shouldn't configure which features ModemManager provides. Signed-off-by: Aleksander Morgado Signed-off-by: Thomas Petazzoni --- package/network-manager/Config.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index e6a3f5f04f..7d44768460 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -40,8 +40,6 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER - select BR2_PACKAGE_MODEM_MANAGER_LIBMBIM - select BR2_PACKAGE_MODEM_MANAGER_LIBQMI help This option enables support for ModemManager From 88aebf5fcbcad32e006c04322be499a8e5b29ef6 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Mon, 4 May 2020 07:30:03 -0500 Subject: [PATCH 17/90] package/libcurl: bump to 7.70.0 Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 69cf7b5398..2157f3d2d2 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 03c7d5e6697f7b7e40ada1b2256e565a555657398e6c1fcfa4cb251ccd819d4f curl-7.69.1.tar.xz -sha256 db3c4a3b3695a0f317a0c5176acd2f656d18abc45b3ee78e50935a78eb1e132e COPYING +sha256 db3c4a3b3695a0f317a0c5176acd2f656d18abc45b3ee78e50935a78eb1e132e COPYING +sha256 032f43f2674008c761af19bf536374128c16241fb234699a55f9fb603fcfbae7 curl-7.70.0.tar.xz diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 7a29634c68..cc2ca0aa65 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.69.1 +LIBCURL_VERSION = 7.70.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.haxx.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From c2b83916b75e35b6887615fb38769ef732fae19d Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Mon, 4 May 2020 07:36:24 -0500 Subject: [PATCH 18/90] package/rsyslog: bump to 8.2004.0 Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- package/rsyslog/rsyslog.hash | 2 +- package/rsyslog/rsyslog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash index 0ed50f8199..50edaa64cd 100644 --- a/package/rsyslog/rsyslog.hash +++ b/package/rsyslog/rsyslog.hash @@ -1,5 +1,5 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 fe86c14d860da1202c76616feac0539ea5a40a4ad182d74b7d6d2419cc2381f8 rsyslog-8.2002.0.tar.gz +sha256 5fc3d7b775f0879a40606d960491812a602e22f62e006ce027ed7bcf4c9f27d9 rsyslog-8.2004.0.tar.gz # Locally calculated sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 27d482fdec..90f21559f8 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYSLOG_VERSION = 8.2002.0 +RSYSLOG_VERSION = 8.2004.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 From 3832536115d9d48fe393202f5758a1eb1a26a4e6 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 7 May 2020 16:41:51 -0700 Subject: [PATCH 19/90] package/python-gobject: bump version to 3.36.1 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/python-gobject/python-gobject.hash | 4 ++-- package/python-gobject/python-gobject.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-gobject/python-gobject.hash b/package/python-gobject/python-gobject.hash index 5ae7553abb..fd2235f201 100644 --- a/package/python-gobject/python-gobject.hash +++ b/package/python-gobject/python-gobject.hash @@ -1,3 +1,3 @@ -# from http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.36/pygobject-3.36.0.sha256sum -sha256 8683d2dfb5baa9e501a9a64eeba5c2c1117eadb781ab1cd7a9d255834af6daef pygobject-3.36.0.tar.xz +# from http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.36/pygobject-3.36.1.sha256sum +sha256 d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f pygobject-3.36.1.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/python-gobject/python-gobject.mk b/package/python-gobject/python-gobject.mk index c93140fc66..0cada82fb7 100644 --- a/package/python-gobject/python-gobject.mk +++ b/package/python-gobject/python-gobject.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON_GOBJECT_VERSION_MAJOR = 3.36 -PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).0 +PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).1 PYTHON_GOBJECT_SOURCE = pygobject-$(PYTHON_GOBJECT_VERSION).tar.xz PYTHON_GOBJECT_SITE = https://ftp.gnome.org/pub/gnome/sources/pygobject/$(PYTHON_GOBJECT_VERSION_MAJOR) PYTHON_GOBJECT_LICENSE = LGPL-2.1+ From f37a5438affc0207cd44d93708cf2f424eee7eac Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Mon, 4 May 2020 12:55:52 +0200 Subject: [PATCH 20/90] package/openssh: allow separate selection of client, server, keyutils The openssh package comprises three separate entities: the SSH client, SSH server, and some SSH key utilities. One may want the client but not the server, the server but not the client, or maybe only the key utilities. Add separate options for each entity and update the files installed on target accordingly. On an ARM Cortex-A53 configuration, size of stripped binaries are: Client programs: 2213118 bytes (2161 KB) usr/bin/ssh,657180 usr/bin/scp,99836 usr/bin/ssh-add,312800 usr/bin/ssh-agent,296428 usr/libexec/ssh-keysign,398908 usr/libexec/ssh-pkcs11-helper,292316 usr/bin/sftp,144992 usr/bin/ssh-copy-id,10658 Server programs: 806840 bytes (787 KB) usr/libexec/sftp-server,112140 usr/sbin/sshd,694168 etc/init.d/S50sshd,532 Key utilities: 789648 bytes (771 KB) usr/bin/ssh-keygen,398924 usr/bin/ssh-keyscan,390724 Signed-off-by: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- package/openssh/Config.in | 23 +++++++++++++++++++++++ package/openssh/openssh.mk | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/package/openssh/Config.in b/package/openssh/Config.in index 683a9c0e51..cc5998742e 100644 --- a/package/openssh/Config.in +++ b/package/openssh/Config.in @@ -9,3 +9,26 @@ config BR2_PACKAGE_OPENSSH friends. http://www.openssh.com/ + +if BR2_PACKAGE_OPENSSH + +config BR2_PACKAGE_OPENSSH_CLIENT + bool "client" + default y + help + Client programs: ssh, scp, sftp, ssh-agent, ssh-add, + ssh-copy-id. + +config BR2_PACKAGE_OPENSSH_SERVER + bool "server" + default y + help + Server programs: sshd, sftp-server + +config BR2_PACKAGE_OPENSSH_KEY_UTILS + bool "key utilities" + default y + help + Key utilities: ssh-keygen, ssh-keyscan. + +endif diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index d50572128a..2b9027818d 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -71,6 +71,31 @@ define OPENSSH_USERS endef endif +# Let the default install rule only install the configuration file. +# The programs will be installed based on the config options selected. +OPENSSH_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-sysconf + +ifeq ($(BR2_PACKAGE_OPENSSH_CLIENT),y) +define OPENSSH_INSTALL_CLIENT_PROGRAMS + $(INSTALL) -D -m 0755 $(@D)/ssh $(TARGET_DIR)/usr/bin/ssh + $(INSTALL) -D -m 0755 $(@D)/scp $(TARGET_DIR)/usr/bin/scp + $(INSTALL) -D -m 0755 $(@D)/sftp $(TARGET_DIR)/usr/bin/sftp + $(INSTALL) -D -m 0755 $(@D)/ssh-agent $(TARGET_DIR)/usr/bin/ssh-agent + $(INSTALL) -D -m 0755 $(@D)/ssh-add $(TARGET_DIR)/usr/bin/ssh-add + $(INSTALL) -D -m 4711 $(@D)/ssh-keysign $(TARGET_DIR)/usr/libexec/ssh-keysign + $(INSTALL) -D -m 0755 $(@D)/ssh-pkcs11-helper $(TARGET_DIR)/usr/libexec/ssh-pkcs11-helper + $(INSTALL) -D -m 0755 $(@D)/contrib/ssh-copy-id $(TARGET_DIR)/usr/bin/ssh-copy-id +endef +OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_CLIENT_PROGRAMS +endif + +ifeq ($(BR2_PACKAGE_OPENSSH_SERVER),y) +define OPENSSH_INSTALL_SERVER_PROGRAMS + $(INSTALL) -D -m 0755 $(@D)/sshd $(TARGET_DIR)/usr/sbin/sshd + $(INSTALL) -D -m 0755 $(@D)/sftp-server $(TARGET_DIR)/usr/libexec/sftp-server +endef +OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_SERVER_PROGRAMS + define OPENSSH_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 package/openssh/sshd.service \ $(TARGET_DIR)/usr/lib/systemd/system/sshd.service @@ -81,11 +106,14 @@ define OPENSSH_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/openssh/S50sshd \ $(TARGET_DIR)/etc/init.d/S50sshd endef +endif -define OPENSSH_INSTALL_SSH_COPY_ID - $(INSTALL) -D -m 755 $(@D)/contrib/ssh-copy-id $(TARGET_DIR)/usr/bin/ssh-copy-id +ifeq ($(BR2_PACKAGE_OPENSSH_KEY_UTILS),y) +define OPENSSH_INSTALL_KEY_UTILS + $(INSTALL) -D -m 0755 $(@D)/ssh-keygen $(TARGET_DIR)/usr/bin/ssh-keygen + $(INSTALL) -D -m 0755 $(@D)/ssh-keyscan $(TARGET_DIR)/usr/bin/ssh-keyscan endef - -OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_SSH_COPY_ID +OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_KEY_UTILS +endif $(eval $(autotools-package)) From cff47c3887363295b645978ed51240d492a371b2 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 4 May 2020 01:07:51 +0200 Subject: [PATCH 21/90] package/minetest: bump to version 5.2.0 Update indentation of hash file (two spaces) See: https://dev.minetest.net/Changelog#5.1.0_.E2.86.92_5.2.0 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/minetest/minetest.hash | 4 ++-- package/minetest/minetest.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/minetest/minetest.hash b/package/minetest/minetest.hash index bedc7633c6..626f56a31c 100644 --- a/package/minetest/minetest.hash +++ b/package/minetest/minetest.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ca53975eecf6a39383040658f41d697c8d7f8d5fe9176460f564979c73b53906 minetest-5.1.0.tar.gz +sha256 4996c7c50a6600d0c7140680d4bd995cb9aae910f216b46373953b49d6b13a5d minetest-5.2.0.tar.gz -sha256 03ec12b2ba71d5e31c37bcf2700af2f278141df62e5a2ac0ce056c53bf266e44 LICENSE.txt +sha256 03ec12b2ba71d5e31c37bcf2700af2f278141df62e5a2ac0ce056c53bf266e44 LICENSE.txt diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk index 3264792137..e8fe5b45ce 100644 --- a/package/minetest/minetest.mk +++ b/package/minetest/minetest.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_VERSION = 5.1.0 +MINETEST_VERSION = 5.2.0 MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION)) MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds) MINETEST_LICENSE_FILES = LICENSE.txt From 404cf023200ed7ab1a7554a280652c488570eda8 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 4 May 2020 01:07:52 +0200 Subject: [PATCH 22/90] package/minetest_game: bump to version 5.2.0 Update mods/player_api/license.txt hash due to [1][2]. Update indentation of hash file (two spaces) [1] https://github.com/minetest/minetest_game/commit/7caa5d36f26de6ac84592216899ab10152b5aa99 [2] https://github.com/minetest/minetest_game/commit/258332578a2b8d117f83c0a87f0c658f2e51c227 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/minetest-game/minetest-game.hash | 66 ++++++++++++------------ package/minetest-game/minetest-game.mk | 2 +- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/package/minetest-game/minetest-game.hash b/package/minetest-game/minetest-game.hash index a618f32d11..5bf65bc510 100644 --- a/package/minetest-game/minetest-game.hash +++ b/package/minetest-game/minetest-game.hash @@ -1,35 +1,35 @@ # Locally calculated -sha256 f165fac0081bf4797cf9094282cc25034b2347b3ea94e6bb8d9329c5ee63f41b minetest-game-5.1.0.tar.gz +sha256 0c49fd6e310de1aba2e8cb8ae72efe0e06bb6bc8d7c5efea23bc201b6a80ce94 minetest-game-5.2.0.tar.gz -sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt -sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt -sha256 559749ba0d269b768e1b85bdac0f8b7a0cf100ecb3edd0df8529fe57cd4bfc0d mods/binoculars/license.txt -sha256 9e9dbe5236ba70d0337f9879b988c19c6a7b0c902eed202f775200b8bee6980d mods/boats/license.txt -sha256 e642798b595fb41901ae695326da9a167b0bd6b4055edec2396672f5f01bb16c mods/bones/license.txt -sha256 baf438bc48b7da1b8fc03d37d134473e1c1f33ffe2e926fa650e6d0c64872785 mods/bucket/license.txt -sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/butterflies/license.txt -sha256 6196d390ee0b6331766219aa82f31613fffb62476c03cf960190ab8c232b8822 mods/carts/license.txt -sha256 b6c3aca8da2f6c272fe431740dda0a349cff419f1f72e55c6de677379fc04169 mods/creative/license.txt -sha256 66f93a58a7418b86f2ca54e8de931f5c38d9f3e07d407c2c095b632fcda72956 mods/default/license.txt -sha256 c0c652890fc80af8eefedbcfe1cd0d16b13b14cd1c7105c9c2bc9abe8cf1620c mods/doors/license.txt -sha256 33d0b8726dd27c8f0c96d6dfd611e0e980bbdbb8075fac7476d055518319ec1c mods/dungeon_loot/license.txt -sha256 011ebc82e96df3b825777e7531cb5d34cfce1f6ca27b7d3c80793c033d7c4f4e mods/dye/license.txt -sha256 29a05b102726b9a3115f7ec06d5188dac7b1c005d8cf1c4d6dc2d5544405a45c mods/env_sounds/license.txt -sha256 163ad77a427a21a900a8fe2333dfc82d115e8e799b7e13ca71f6bd47dcf0ec13 mods/farming/license.txt -sha256 61f826be9adee70ef0e37f3bf4891fecc4b027a21637b32981b98220723d6f37 mods/fire/license.txt -sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/fireflies/license.txt -sha256 d92ac36a0235f4c02f8cfe2137d7d632bd53374c44ead97f20c152dddf475837 mods/flowers/license.txt -sha256 ffbac006d197fcb8e36e9cdda638053ac80eef4e6446bbe36cb94bd28f54ba0b mods/game_commands/license.txt -sha256 857f64cd62c13e27f25363584342fe049885b16c6b2392f1ebd7c3a7fb6ca436 mods/give_initial_stuff/license.txt -sha256 dcbab8d7dc4137789958d19471807b37447fd303bced310d7d76d901eefca8ff mods/map/license.txt -sha256 8acd4a18781a508f641b9364a0b491fccb0affd4c638b74b215238d0b0ee7b76 mods/player_api/license.txt -sha256 0066e63d682d54a014ad3359794365a1abb87562d2b1e5e32093976d88c295b4 mods/screwdriver/license.txt -sha256 b903866d052774e4127952690ce62ca26aa5bc4c2ddd48fceae501fa0d24ed74 mods/sethome/license.txt -sha256 478b9944a446b4d88496d10736ddcd8ad5a3ca52f8b75f747315583d4012cb3c mods/sfinv/license.txt -sha256 e361fc900d9203859391d35c38c3284c91600d23c1617076c641ff7e9fe10b15 mods/spawn/license.txt -sha256 eab4c0cb318bb83c13362047a5a0fc5cb650a4e561ceb5a9124e5a1253cbc21a mods/stairs/license.txt -sha256 e8593deed04ed4199ce9303db900f32276e0b629fd7f0089074d13370c12d00a mods/tnt/license.txt -sha256 a0814bccd28157a160049efeac03864ff4c4dd6a34bc9cfcd3cc62de66fb156a mods/vessels/license.txt -sha256 e9ebf1b4b170e64a0ea6e246edd03689aeb859d6560b8372a8081c004b30cb65 mods/walls/license.txt -sha256 551b19e2c8b18c143301e090a1ceb5dc5d4ca243cad846de179d693439910816 mods/wool/license.txt -sha256 c71155c9a68a5242223c5f814c1b9b1270492729b0ff0add770b6418bccf17c9 mods/xpanes/license.txt +sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt +sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt +sha256 559749ba0d269b768e1b85bdac0f8b7a0cf100ecb3edd0df8529fe57cd4bfc0d mods/binoculars/license.txt +sha256 9e9dbe5236ba70d0337f9879b988c19c6a7b0c902eed202f775200b8bee6980d mods/boats/license.txt +sha256 e642798b595fb41901ae695326da9a167b0bd6b4055edec2396672f5f01bb16c mods/bones/license.txt +sha256 baf438bc48b7da1b8fc03d37d134473e1c1f33ffe2e926fa650e6d0c64872785 mods/bucket/license.txt +sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/butterflies/license.txt +sha256 6196d390ee0b6331766219aa82f31613fffb62476c03cf960190ab8c232b8822 mods/carts/license.txt +sha256 b6c3aca8da2f6c272fe431740dda0a349cff419f1f72e55c6de677379fc04169 mods/creative/license.txt +sha256 66f93a58a7418b86f2ca54e8de931f5c38d9f3e07d407c2c095b632fcda72956 mods/default/license.txt +sha256 c0c652890fc80af8eefedbcfe1cd0d16b13b14cd1c7105c9c2bc9abe8cf1620c mods/doors/license.txt +sha256 33d0b8726dd27c8f0c96d6dfd611e0e980bbdbb8075fac7476d055518319ec1c mods/dungeon_loot/license.txt +sha256 011ebc82e96df3b825777e7531cb5d34cfce1f6ca27b7d3c80793c033d7c4f4e mods/dye/license.txt +sha256 29a05b102726b9a3115f7ec06d5188dac7b1c005d8cf1c4d6dc2d5544405a45c mods/env_sounds/license.txt +sha256 163ad77a427a21a900a8fe2333dfc82d115e8e799b7e13ca71f6bd47dcf0ec13 mods/farming/license.txt +sha256 61f826be9adee70ef0e37f3bf4891fecc4b027a21637b32981b98220723d6f37 mods/fire/license.txt +sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/fireflies/license.txt +sha256 d92ac36a0235f4c02f8cfe2137d7d632bd53374c44ead97f20c152dddf475837 mods/flowers/license.txt +sha256 ffbac006d197fcb8e36e9cdda638053ac80eef4e6446bbe36cb94bd28f54ba0b mods/game_commands/license.txt +sha256 857f64cd62c13e27f25363584342fe049885b16c6b2392f1ebd7c3a7fb6ca436 mods/give_initial_stuff/license.txt +sha256 dcbab8d7dc4137789958d19471807b37447fd303bced310d7d76d901eefca8ff mods/map/license.txt +sha256 65133ccf7fb7bf8ffe5e9bc148b193af7362bba925b15ab507da28494156297a mods/player_api/license.txt +sha256 0066e63d682d54a014ad3359794365a1abb87562d2b1e5e32093976d88c295b4 mods/screwdriver/license.txt +sha256 b903866d052774e4127952690ce62ca26aa5bc4c2ddd48fceae501fa0d24ed74 mods/sethome/license.txt +sha256 478b9944a446b4d88496d10736ddcd8ad5a3ca52f8b75f747315583d4012cb3c mods/sfinv/license.txt +sha256 e361fc900d9203859391d35c38c3284c91600d23c1617076c641ff7e9fe10b15 mods/spawn/license.txt +sha256 eab4c0cb318bb83c13362047a5a0fc5cb650a4e561ceb5a9124e5a1253cbc21a mods/stairs/license.txt +sha256 e8593deed04ed4199ce9303db900f32276e0b629fd7f0089074d13370c12d00a mods/tnt/license.txt +sha256 a0814bccd28157a160049efeac03864ff4c4dd6a34bc9cfcd3cc62de66fb156a mods/vessels/license.txt +sha256 e9ebf1b4b170e64a0ea6e246edd03689aeb859d6560b8372a8081c004b30cb65 mods/walls/license.txt +sha256 551b19e2c8b18c143301e090a1ceb5dc5d4ca243cad846de179d693439910816 mods/wool/license.txt +sha256 c71155c9a68a5242223c5f814c1b9b1270492729b0ff0add770b6418bccf17c9 mods/xpanes/license.txt diff --git a/package/minetest-game/minetest-game.mk b/package/minetest-game/minetest-game.mk index 1e6bb4d0c4..38f46a398a 100644 --- a/package/minetest-game/minetest-game.mk +++ b/package/minetest-game/minetest-game.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_GAME_VERSION = 5.1.0 +MINETEST_GAME_VERSION = 5.2.0 MINETEST_GAME_SITE = $(call github,minetest,minetest_game,$(MINETEST_GAME_VERSION)) MINETEST_GAME_LICENSE = LGPL-2.1+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, \ CC-BY-SA-4.0, MIT, CC0 1.0, CC-BY-2.0 (mods) From a0da84d32fa0ce1b819ace42b70d6acf980adc62 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 4 May 2020 01:07:53 +0200 Subject: [PATCH 23/90] package/libpng: enable neon support for aarch64 NEON support is enabled by default on aarch64, so we can enable it unconditionaly. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/libpng/libpng.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index 5c30a4f9ad..1a83c7e712 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -15,7 +15,7 @@ LIBPNG_DEPENDENCIES = host-pkgconf zlib HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config -ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_aarch64),y) LIBPNG_CONF_OPTS += --enable-arm-neon else LIBPNG_CONF_OPTS += --disable-arm-neon From 5b6dd9184ef35cb9c8a674f71e80a3df1aafe110 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 4 May 2020 02:13:41 -0600 Subject: [PATCH 24/90] package/wayland: bump to version 1.18.0 Rebase/update disable tests patch. Replace autotools build system with meson as autotools is deprecated and will be removed. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...01-build-add-option-to-disable-tests.patch | 104 ++++++++++++++++++ ...onfigure-add-option-to-disable-tests.patch | 73 ------------ package/wayland/wayland.hash | 12 +- package/wayland/wayland.mk | 14 +-- 4 files changed, 115 insertions(+), 88 deletions(-) create mode 100644 package/wayland/0001-build-add-option-to-disable-tests.patch delete mode 100644 package/wayland/0001-configure-add-option-to-disable-tests.patch diff --git a/package/wayland/0001-build-add-option-to-disable-tests.patch b/package/wayland/0001-build-add-option-to-disable-tests.patch new file mode 100644 index 0000000000..6ab695e909 --- /dev/null +++ b/package/wayland/0001-build-add-option-to-disable-tests.patch @@ -0,0 +1,104 @@ +From 283085496e06b5543771abe5cc746ff0b77cdd23 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 3 Mar 2020 15:27:51 -0700 +Subject: [PATCH] build: add option to disable tests + +When building for a product, tests are not needed. + +Besides, one test requires a C++ compiler, which is not always +available. + +So, add an option to configure to disable building tests altogether. + +Signed-off-by: "Yann E. MORIN" +Signed-off-by: Alexey Brodkin +Signed-off-by: James Hilliard +[Upstream status: +https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66] +--- + Makefile.am | 2 ++ + configure.ac | 9 +++++++++ + meson.build | 4 +++- + meson_options.txt | 4 ++++ + 4 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index cc87392..d5d43e3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -162,6 +162,7 @@ pkgconfig_DATA += egl/wayland-egl.pc + include_HEADERS += egl/wayland-egl-backend.h + pkgconfig_DATA += egl/wayland-egl-backend.pc + ++if ENABLE_TESTS + built_test_programs = \ + array-test \ + client-test \ +@@ -295,6 +296,7 @@ os_wrappers_test_LDADD = libtest-runner.la + + exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c + exec_fd_leak_checker_LDADD = libtest-helpers.la ++endif + + EXTRA_DIST += tests/scanner-test.sh \ + protocol/tests.xml \ +diff --git a/configure.ac b/configure.ac +index dda5e48..99b7c96 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -77,6 +77,13 @@ AC_ARG_ENABLE([libraries], + [], + [enable_libraries=yes]) + ++AC_ARG_ENABLE([tests], ++ [AC_HELP_STRING([--disable-tests], ++ [Disable compilation of test programs])], ++ [], ++ [enable_tests=yes]) ++ ++ + AC_ARG_WITH([host-scanner], + [AC_HELP_STRING([--with-host-scanner], + [Use installed wayland-scanner from host PATH during build])], +@@ -99,6 +106,8 @@ AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes) + + AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes) + ++AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = xyes) ++ + AC_ARG_WITH(icondir, [ --with-icondir= Look for cursor icons here], + [ ICONDIR=$withval], + [ ICONDIR=${datadir}/icons]) +diff --git a/meson.build b/meson.build +index 5632f4e..b37bb7a 100644 +--- a/meson.build ++++ b/meson.build +@@ -83,7 +83,9 @@ subdir('src') + if get_option('libraries') + subdir('cursor') + subdir('egl') +- subdir('tests') ++ if get_option('tests') ++ subdir('tests') ++ endif + endif + + if get_option('documentation') +diff --git a/meson_options.txt b/meson_options.txt +index 76314f7..ab4be92 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -2,6 +2,10 @@ option('libraries', + description: 'Compile Wayland libraries', + type: 'boolean', + value: 'true') ++option('tests', ++ description: 'Compile Wayland tests', ++ type: 'boolean', ++ value: 'true') + option('documentation', + description: 'Build the documentation (requires Doxygen, dot, xmlto, xsltproc)', + type: 'boolean', +-- +2.20.1 + diff --git a/package/wayland/0001-configure-add-option-to-disable-tests.patch b/package/wayland/0001-configure-add-option-to-disable-tests.patch deleted file mode 100644 index fdfbeb4bd1..0000000000 --- a/package/wayland/0001-configure-add-option-to-disable-tests.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 55ae8e1103f4697bfa01a84301a6560b89de5248 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Mon, 16 Apr 2018 19:52:34 +0300 -Subject: [PATCH] configure: add option to disable tests - -When building for a product, tests are not needed. - -Besides, one test requires a C++ compiler, which is not always -available. - -So, add an option to configure to disable building tests altogether. - -Signed-off-by: "Yann E. MORIN" -Reviewed-by: Eric Engestrom -Tested-by: Eric Engestrom - -Signed-off-by: "Yann E. MORIN" -Signed-off-by: Alexey Brodkin - ---- -Changes v1 -> v2: - - fix typo in yes-check (Eric) ---- - Makefile.am | 2 ++ - configure.ac | 8 ++++++++ - 2 files changed, 10 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 741db5ebf9d9..4862d42959f0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -160,6 +160,7 @@ pkgconfig_DATA += egl/wayland-egl.pc - include_HEADERS += egl/wayland-egl-backend.h - pkgconfig_DATA += egl/wayland-egl-backend.pc - -+if ENABLE_TESTS - built_test_programs = \ - array-test \ - client-test \ -@@ -287,6 +288,7 @@ os_wrappers_test_LDADD = libtest-runner.la - - exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c - exec_fd_leak_checker_LDADD = libtest-helpers.la -+endif - - EXTRA_DIST += tests/scanner-test.sh \ - protocol/tests.xml \ -diff --git a/configure.ac b/configure.ac -index c74ee97b24a2..5c94b7b76b06 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -89,10 +89,18 @@ AC_ARG_ENABLE([dtd-validation], - [], - [enable_dtd_validation=yes]) - -+AC_ARG_ENABLE([tests], -+ [AC_HELP_STRING([--disable-tests], -+ [Disable compilation of test programs])], -+ [], -+ [enable_tests=yes]) -+ - AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes) - - AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes) - -+AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = xyes) -+ - AC_ARG_WITH(icondir, [ --with-icondir= Look for cursor icons here], - [ ICONDIR=$withval], - [ ICONDIR=${datadir}/icons]) --- -2.14.3 - diff --git a/package/wayland/wayland.hash b/package/wayland/wayland.hash index 8774101884..abd8bcdf29 100644 --- a/package/wayland/wayland.hash +++ b/package/wayland/wayland.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2019-March/040335.html -md5 d91f970aea11fd549eae023d06f91af3 wayland-1.17.0.tar.xz -sha1 4d9e08a7a4a07fa37a25d7aa3ef83f08edec0600 wayland-1.17.0.tar.xz -sha256 72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4 wayland-1.17.0.tar.xz -sha512 c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946 wayland-1.17.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html +md5 23317697b6e3ff2e1ac8c5ba3ed57b65 wayland-1.18.0.tar.xz +sha1 33e5292b32a115e829458ea627201ed1e4ad4f45 wayland-1.18.0.tar.xz +sha256 4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d wayland-1.18.0.tar.xz +sha512 e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc wayland-1.18.0.tar.xz # Locally calculated -sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING +sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk index e325c6d752..a3031bafa8 100644 --- a/package/wayland/wayland.mk +++ b/package/wayland/wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_VERSION = 1.17.0 +WAYLAND_VERSION = 1.18.0 WAYLAND_SITE = http://wayland.freedesktop.org/releases WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz WAYLAND_LICENSE = MIT @@ -13,12 +13,8 @@ WAYLAND_INSTALL_STAGING = YES WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2 HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2 -# 0002-configure-add-option-to-disable-tests.patch -WAYLAND_AUTORECONF = YES - -# wayland-scanner is only needed for building, not on the target -WAYLAND_CONF_OPTS = --with-host-scanner --disable-tests -HOST_WAYLAND_CONF_OPTS = --disable-tests +WAYLAND_CONF_OPTS = -Dtests=false -Ddocumentation=false +HOST_WAYLAND_CONF_OPTS = -Dtests=false -Ddocumentation=false # Remove the DTD from the target, it's not needed at runtime define WAYLAND_TARGET_CLEANUP @@ -26,5 +22,5 @@ define WAYLAND_TARGET_CLEANUP endef WAYLAND_POST_INSTALL_TARGET_HOOKS += WAYLAND_TARGET_CLEANUP -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) From c5cfe66a963c81311fdada123e54323406365bcf Mon Sep 17 00:00:00 2001 From: Paul Cercueil Date: Mon, 4 May 2020 12:20:46 +0200 Subject: [PATCH 25/90] package/umtprd: bump to version 1.3.6 Signed-off-by: Paul Cercueil Signed-off-by: Thomas Petazzoni --- package/umtprd/umtprd.hash | 2 +- package/umtprd/umtprd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/umtprd/umtprd.hash b/package/umtprd/umtprd.hash index 168b19e951..b6520c04e7 100644 --- a/package/umtprd/umtprd.hash +++ b/package/umtprd/umtprd.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e1301bdd89170cc2c679446c1cc5873feaacd061bf0ab547fc0a11670bae9163 umtprd-1.0.0.tar.gz +sha256 5f6f9f2882597cd3767b12b0814fdfa27c0cb18ce32e3082176f9658be167a27 umtprd-1.3.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/umtprd/umtprd.mk b/package/umtprd/umtprd.mk index 63faae43b3..944d1a621b 100644 --- a/package/umtprd/umtprd.mk +++ b/package/umtprd/umtprd.mk @@ -4,7 +4,7 @@ # ################################################################################ -UMTPRD_VERSION = 1.0.0 +UMTPRD_VERSION = 1.3.6 UMTPRD_SITE = https://github.com/viveris/uMTP-Responder/archive UMTPRD_LICENSE = GPL-3.0+ UMTPRD_LICENSE_FILES = LICENSE From 6cc1eedae22da67d65d1c4321d61a4456bd5d4f9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 May 2020 11:01:09 +0200 Subject: [PATCH 26/90] package/at-spi2-core: bump to version 2.36.0 - Drop patch (already in version) - Add upstream link on sha256 - License is LGPL-2.1+ since https://gitlab.gnome.org/GNOME/at-spi2-core/-/commit/1256988c433cf8b9e0780c13d66374cb057f7329 - Update indentation of hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...001-Fix-meson.build-for-meson-0.50.0.patch | 35 ------------------- package/at-spi2-core/at-spi2-core.hash | 6 ++-- package/at-spi2-core/at-spi2-core.mk | 4 +-- 3 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch diff --git a/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch b/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch deleted file mode 100644 index 154d7010d3..0000000000 --- a/package/at-spi2-core/0001-Fix-meson.build-for-meson-0.50.0.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3b154996a27ede1c94cbc590e2db3858389d18c2 Mon Sep 17 00:00:00 2001 -From: Tobias Stoeckmann -Date: Tue, 12 Mar 2019 11:46:24 +0100 -Subject: [PATCH] Fix meson.build for meson 0.50.0. - -Since meson 0.50.0 it is not possible anymore to specify an -absolute directory for subdir. To keep current functionality, -use install_dir instead. - -atspi/meson.build:60:0: ERROR: Subdir keyword must not be an absolute path. - -Signed-off-by: Tobias Stoeckmann - -Upstream: https://github.com/GNOME/at-spi2-core/commit/44a812ea51223d82f21a098a2d45fcc5c329ce7a.patch -Signed-off-by: Peter Seiderer ---- - atspi/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/atspi/meson.build b/atspi/meson.build -index 17bfc45..2e44ffd 100644 ---- a/atspi/meson.build -+++ b/atspi/meson.build -@@ -57,7 +57,7 @@ atspi_headers = [ - - atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi') - --install_headers(atspi_headers, subdir: atspi_includedir) -+install_headers(atspi_headers, install_dir: atspi_includedir) - - atspi_enums = gnome.mkenums('atspi-enum-types', - sources: [ 'atspi-constants.h', 'atspi-types.h' ], --- -2.21.0 - diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash index 9c96da312b..e2cc403e71 100644 --- a/package/at-spi2-core/at-spi2-core.hash +++ b/package/at-spi2-core/at-spi2-core.hash @@ -1,3 +1,5 @@ +# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum +sha256 88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a at-spi2-core-2.36.0.tar.xz + # locally calculated -sha256 42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87 at-spi2-core-2.28.0.tar.xz -sha256 c6105b34ab6829ff5c70eba234f40053215fa9f8383ced271b0e370a1923624b COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk index 3a5197eb03..cf7fdd297c 100644 --- a/package/at-spi2-core/at-spi2-core.mk +++ b/package/at-spi2-core/at-spi2-core.mk @@ -4,11 +4,11 @@ # ################################################################################ -AT_SPI2_CORE_VERSION_MAJOR = 2.28 +AT_SPI2_CORE_VERSION_MAJOR = 2.36 AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz AT_SPI2_CORE_SITE = http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) -AT_SPI2_CORE_LICENSE = LGPL-2.0+ +AT_SPI2_CORE_LICENSE = LGPL-2.1+ AT_SPI2_CORE_LICENSE_FILES = COPYING AT_SPI2_CORE_INSTALL_STAGING = YES AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst \ From 8172ffe3fc3327edf7255ffc53a0d94112e5cf50 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 May 2020 11:01:10 +0200 Subject: [PATCH 27/90] package/atk: bump to version 2.36.0 Update indentation of hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/atk/atk.hash | 6 +++--- package/atk/atk.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/atk/atk.hash b/package/atk/atk.hash index 8c1bad5b1a..2e7c3b5fec 100644 --- a/package/atk/atk.hash +++ b/package/atk/atk.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.33/atk-2.33.3.sha256sum -sha256 532d1081e87b9f0a8d71733101e791818442fa1896531621d1aecc189e1a4ffe atk-2.33.3.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/atk/2.36/atk-2.36.0.sha256sum +sha256 fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 atk-2.36.0.tar.xz # Hash for license file -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/atk/atk.mk b/package/atk/atk.mk index a16143d2c0..dfeb4de8b2 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -4,8 +4,8 @@ # ################################################################################ -ATK_VERSION_MAJOR = 2.33 -ATK_VERSION = $(ATK_VERSION_MAJOR).3 +ATK_VERSION_MAJOR = 2.36 +ATK_VERSION = $(ATK_VERSION_MAJOR).0 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) ATK_LICENSE = LGPL-2.0+ From 7b135c81e3f2514e1dc35389a953b0cfc7188786 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 May 2020 11:01:11 +0200 Subject: [PATCH 28/90] package/at-spi2-atk: bump to version 2.34.2 - Remove double space in AT_SPI2_ATK_SITE - Add link to upstream sha256 file - License is LPGL-2.1+ since https://gitlab.gnome.org/GNOME/at-spi2-atk/-/commit/468b527d8ad73e934dd03a2de6745995d8304435 - Switch to meson-package - Add a patch to disable tests to avoid adding libxml2 dependency - Update indentation of hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-meson-add-tests-option.patch | 43 +++++++++++++++++++ package/at-spi2-atk/at-spi2-atk.hash | 6 ++- package/at-spi2-atk/at-spi2-atk.mk | 10 +++-- 3 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 package/at-spi2-atk/0001-meson-add-tests-option.patch diff --git a/package/at-spi2-atk/0001-meson-add-tests-option.patch b/package/at-spi2-atk/0001-meson-add-tests-option.patch new file mode 100644 index 0000000000..3a2aefa090 --- /dev/null +++ b/package/at-spi2-atk/0001-meson-add-tests-option.patch @@ -0,0 +1,43 @@ +From 466d04a57b32417dbf2d5e818af1b7593af5f802 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 3 May 2020 10:29:36 +0200 +Subject: [PATCH] meson: add tests option + +Add tests option to allow the user to build at-spi2-atk without tests, +it is especially useful as one of the test requires libxml-2.0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.gnome.org/GNOME/at-spi2-atk/-/merge_requests/22] +--- + meson.build | 4 +++- + meson_options.txt | 4 ++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9fce5d6..61bc93d 100644 +--- a/meson.build ++++ b/meson.build +@@ -61,4 +61,6 @@ install_data('at-spi2-atk.desktop', + + subdir('droute') + subdir('atk-adaptor') +-subdir('tests') ++if get_option('tests') ++ subdir('tests') ++endif +diff --git a/meson_options.txt b/meson_options.txt +index 24c9228..a4abdc2 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -2,3 +2,7 @@ option('disable_p2p', + description: 'Disable peer-to-peer DBus connections', + type: 'boolean', + value: false) ++option('tests', ++ description: 'Whether to build tests', ++ type: 'boolean', ++ value: true) +-- +2.26.2 + diff --git a/package/at-spi2-atk/at-spi2-atk.hash b/package/at-spi2-atk/at-spi2-atk.hash index 77c8f68e47..9c564c32af 100644 --- a/package/at-spi2-atk/at-spi2-atk.hash +++ b/package/at-spi2-atk/at-spi2-atk.hash @@ -1,3 +1,5 @@ +# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.sha256sum +sha256 901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0 at-spi2-atk-2.34.2.tar.xz + # locally calculated -sha256 61891f0abae1689f6617a963105a3f1dcdab5970c4a36ded9c79a7a544b16a6e at-spi2-atk-2.26.2.tar.xz -sha256 c6105b34ab6829ff5c70eba234f40053215fa9f8383ced271b0e370a1923624b COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/at-spi2-atk/at-spi2-atk.mk b/package/at-spi2-atk/at-spi2-atk.mk index 4ef681b3b1..69d11f66bd 100644 --- a/package/at-spi2-atk/at-spi2-atk.mk +++ b/package/at-spi2-atk/at-spi2-atk.mk @@ -4,13 +4,15 @@ # ################################################################################ -AT_SPI2_ATK_VERSION_MAJOR = 2.26 +AT_SPI2_ATK_VERSION_MAJOR = 2.34 AT_SPI2_ATK_VERSION = $(AT_SPI2_ATK_VERSION_MAJOR).2 AT_SPI2_ATK_SOURCE = at-spi2-atk-$(AT_SPI2_ATK_VERSION).tar.xz -AT_SPI2_ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) -AT_SPI2_ATK_LICENSE = LGPL-2.0+ +AT_SPI2_ATK_SITE = \ + http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR) +AT_SPI2_ATK_LICENSE = LGPL-2.1+ AT_SPI2_ATK_LICENSE_FILES = COPYING AT_SPI2_ATK_INSTALL_STAGING = YES AT_SPI2_ATK_DEPENDENCIES = atk at-spi2-core libglib2 host-pkgconf +AT_SPI2_ATK_CONF_OPTS = -Dtests=false -$(eval $(autotools-package)) +$(eval $(meson-package)) From 3564bc165994cb72fbedfa6cf178c08273d56a82 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 10 May 2020 23:37:46 +0200 Subject: [PATCH 29/90] package/wireguard-linux-compat: bump version to 1.0.20200506 Synchronizes with upstream 5.7-rc5. For details, see the announcement: https://lists.zx2c4.com/pipermail/wireguard/2020-May/005408.html Signed-off-by: Peter Korsgaard --- package/wireguard-linux-compat/wireguard-linux-compat.hash | 4 ++-- package/wireguard-linux-compat/wireguard-linux-compat.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.hash b/package/wireguard-linux-compat/wireguard-linux-compat.hash index d308f47a13..54af5af956 100644 --- a/package/wireguard-linux-compat/wireguard-linux-compat.hash +++ b/package/wireguard-linux-compat/wireguard-linux-compat.hash @@ -1,4 +1,4 @@ -# https://lists.zx2c4.com/pipermail/wireguard/2020-April/005296.html -sha256 cf166348fbb67419528e73049ce001d29131aea367fa6aef9d3e223f7251e116 wireguard-linux-compat-1.0.20200413.tar.xz +# https://lists.zx2c4.com/pipermail/wireguard/2020-May/005408.html +sha256 98a99f2b825a82d57a7213e666f1ee4f7cc02bddb09bf4908b4b09447a8f121e wireguard-linux-compat-1.0.20200506.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.mk b/package/wireguard-linux-compat/wireguard-linux-compat.mk index 6d90245bd2..f1b117d258 100644 --- a/package/wireguard-linux-compat/wireguard-linux-compat.mk +++ b/package/wireguard-linux-compat/wireguard-linux-compat.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200413 +WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200506 WIREGUARD_LINUX_COMPAT_SITE = https://git.zx2c4.com/wireguard-linux-compat/snapshot WIREGUARD_LINUX_COMPAT_SOURCE = wireguard-linux-compat-$(WIREGUARD_LINUX_COMPAT_VERSION).tar.xz WIREGUARD_LINUX_COMPAT_LICENSE = GPL-2.0 From 1fcf0e27b30ce34e2d3993302e2c6e44a5da08c1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 14 May 2020 18:14:36 +0200 Subject: [PATCH 30/90] package/postgresql: bump version to 12.3 Changelog: https://www.postgresql.org/about/news/2038/ Fixes CVE-2020-10733 which is only relevant for Windows. Reformatted hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 10 +++++----- package/postgresql/postgresql.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 7cb0c67d63..ff3a76258e 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,7 +1,7 @@ -# From https://ftp.postgresql.org/pub/source/v12.2/postgresql-12.2.tar.bz2.md5 -md5 a88ceea8ecf2741307f663e4539b58b7 postgresql-12.2.tar.bz2 -# From https://ftp.postgresql.org/pub/source/v12.2/postgresql-12.2.tar.bz2.sha256 -sha256 ad1dcc4c4fc500786b745635a9e1eba950195ce20b8913f50345bb7d5369b5de postgresql-12.2.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v12.3/postgresql-12.3.tar.bz2.md5 +md5 a30c023dd7088e44d73be71af2ef404a postgresql-12.3.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v12.3/postgresql-12.3.tar.bz2.sha256 +sha256 94ed64a6179048190695c86ec707cc25d016056ce10fc9d229267d9a8f1dcf41 postgresql-12.3.tar.bz2 # License file, Locally calculated -sha256 739e5d454d81d31a482469338b7c856f1f5c6b4cdda1551cea6f0f6d18eef62c COPYRIGHT +sha256 739e5d454d81d31a482469338b7c856f1f5c6b4cdda1551cea6f0f6d18eef62c COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 378197d33b..c0bf199eb4 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 12.2 +POSTGRESQL_VERSION = 12.3 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From 75c5de34ee595a391585e3a056365b85f04ec2cf Mon Sep 17 00:00:00 2001 From: Bartosz Bilas Date: Thu, 14 May 2020 19:56:44 +0200 Subject: [PATCH 31/90] boot/barebox: bump version to 2020.05.0 Signed-off-by: Bartosz Bilas Signed-off-by: Thomas Petazzoni --- boot/barebox/Config.in | 4 ++-- boot/barebox/barebox.hash | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 78fb26272b..e5ba8cd1cf 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 "2020.03.0" + bool "2020.05.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2020.03.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2020.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 8a953847f7..8a33453249 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ -# From https://www.barebox.org/download/barebox-2020.03.0.tar.bz2.md5 -md5 9e93df6dadb898d91d9f3811456a94bd barebox-2020.03.0.tar.bz2 +# From https://www.barebox.org/download/barebox-2020.05.0.tar.bz2.md5 +md5 31dee7b5715967fab882cabe4e406896 barebox-2020.05.0.tar.bz2 # Locally calculated -sha256 625b031d1fe99bdd3bf95f79c8ecfcf67101bc2500ec4816e034bf989f16d1c2 barebox-2020.03.0.tar.bz2 +sha256 03e29c2864c3220c676a0cf768ffe2b8f1064eddb60463281c9944625e649b65 barebox-2020.05.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING From dda6a21937f13503efea13afbdc9db403d442bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 15 May 2020 07:28:13 +0200 Subject: [PATCH 32/90] package/mpd: bump to version 0.21.23 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.23/NEWS Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index bce2d7e919..fd045e0f5e 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 565687d1899b585350cd66b603e46e5b79affc0a0e36d96d8953c6ccc6f69ba2 mpd-0.21.22.tar.xz +sha256 439f522ca9800f375e4fb459ec31e61b3d824fc5c0580ff06dac48b5d21207a3 mpd-0.21.23.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index a7adfc0406..474927749a 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.21 -MPD_VERSION = $(MPD_VERSION_MAJOR).22 +MPD_VERSION = $(MPD_VERSION_MAJOR).23 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost From e71f1af6dabc1bbb45811fb695e07b43326df55b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 15 May 2020 07:32:58 +0200 Subject: [PATCH 33/90] package/upmpdcli: bump to version 1.4.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/upmpdcli/upmpdcli.hash | 4 ++-- package/upmpdcli/upmpdcli.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/upmpdcli/upmpdcli.hash b/package/upmpdcli/upmpdcli.hash index fe1d82202d..6eb6c7b9ea 100644 --- a/package/upmpdcli/upmpdcli.hash +++ b/package/upmpdcli/upmpdcli.hash @@ -1,5 +1,5 @@ -# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.6.tar.gz.sha256: -sha256 80ed85a323a1721a9e2ceb64923cedbf69c45f22fb9bc6853c9c11b46dc83a1d upmpdcli-1.4.6.tar.gz +# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.9.tar.gz.sha256: +sha256 ace5a3166891109d2a874f21306986857ee2620230a77751ed6209f7b5cc9c58 upmpdcli-1.4.9.tar.gz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index 67d805f0cc..ab4b8bfd3c 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -4,7 +4,7 @@ # ################################################################################ -UPMPDCLI_VERSION = 1.4.6 +UPMPDCLI_VERSION = 1.4.9 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = LGPL-2.1+ UPMPDCLI_LICENSE_FILES = COPYING From d5440491d6ad54fcfec4a8d95aeaf2dfc33403b8 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 14 May 2020 23:37:00 -0600 Subject: [PATCH 34/90] package/python-multidict: bump to version 4.7.6 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-multidict/python-multidict.hash | 4 ++-- package/python-multidict/python-multidict.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-multidict/python-multidict.hash b/package/python-multidict/python-multidict.hash index 431a94247a..cf48033f7c 100644 --- a/package/python-multidict/python-multidict.hash +++ b/package/python-multidict/python-multidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/multidict/json -md5 9a1ed2cc0cd3e5dd2e71921104f2b760 multidict-4.7.5.tar.gz -sha256 aee283c49601fa4c13adc64c09c978838a7e812f85377ae130a24d7198c0331e multidict-4.7.5.tar.gz +md5 40b6ca77171ac8af55f7aa60049f3cdf multidict-4.7.6.tar.gz +sha256 fbb77a75e529021e7c4a8d4e823d88ef4d23674a202be4f5addffc72cbb91430 multidict-4.7.6.tar.gz # Locally computed sha256 checksums sha256 a1c5825513279d3085a0ba46880e148ea3710c149bbaedcf2d11605a5ed3c4ad LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index 2f80b1f851..6284570ccb 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 4.7.5 +PYTHON_MULTIDICT_VERSION = 4.7.6 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/61/b4/475114b3f1671da634f89239e61038f8742d9ac13aa34b32a05bf8022d22 +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/65/d4/fabdcc5ee4451c8a8e177e27ddfd131a53a82ecc5a3b68468b7e9f8d70b4 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE From 2c3672edd234ea852ae61d62ada7448c2624d9c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 15 May 2020 07:53:35 +0200 Subject: [PATCH 35/90] package/luv: bump to version 1.36.0-0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/luv/luv.hash | 2 +- package/luv/luv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luv/luv.hash b/package/luv/luv.hash index f41325c8c5..7e902bd081 100644 --- a/package/luv/luv.hash +++ b/package/luv/luv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7aff212985527248522411c3830234fe7b5e98593a4cc439b962c17da46681d5 luv-1.34.2-2.tar.gz +sha256 f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445 luv-1.36.0-0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luv/luv.mk b/package/luv/luv.mk index d028519fe7..a63baf3228 100644 --- a/package/luv/luv.mk +++ b/package/luv/luv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUV_VERSION = 1.34.2-2 +LUV_VERSION = 1.36.0-0 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_LICENSE = Apache-2.0 LUV_LICENSE_FILES = LICENSE.txt From 27d199a73225d2bf87ef3119de9e26c93d763214 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Fri, 15 May 2020 16:53:44 +0200 Subject: [PATCH 36/90] package/ltp-testsuite: bump to version 20200515 Also update list of tests incompatible with musl. Removed patch backported from this release. Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- ...64-unsafe-syscalls-before-using-them.patch | 123 ------------------ package/ltp-testsuite/ltp-testsuite.hash | 4 +- package/ltp-testsuite/ltp-testsuite.mk | 10 +- 3 files changed, 3 insertions(+), 134 deletions(-) delete mode 100644 package/ltp-testsuite/0001-syscalls-Check-for-time64-unsafe-syscalls-before-using-them.patch diff --git a/package/ltp-testsuite/0001-syscalls-Check-for-time64-unsafe-syscalls-before-using-them.patch b/package/ltp-testsuite/0001-syscalls-Check-for-time64-unsafe-syscalls-before-using-them.patch deleted file mode 100644 index e447dd5182..0000000000 --- a/package/ltp-testsuite/0001-syscalls-Check-for-time64-unsafe-syscalls-before-using-them.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 5b57ae2913e2d2d167cbd3822784b4c4ba336812 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 19 Feb 2020 22:52:04 -0800 -Subject: [PATCH] syscalls: Check for time64 unsafe syscalls before using them - -musl is using 64bit time_t now on 32bit architectures and these syscalls -no longer exist, therefore its better to check for them being available -before using them - -Signed-off-by: Khem Raj -Reviewed-by: Yang Xu -Reviewed-by: Petr Vorel -Signed-off-by: Petr Vorel - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/linux-test-project/ltp/commit/5b57ae2913e2d2d167cbd3822784b4c4ba336812] ---- - lib/tst_clocks.c | 16 ++++++---------- - .../syscalls/gettimeofday/gettimeofday01.c | 6 ++---- - .../syscalls/gettimeofday/gettimeofday02.c | 8 +++----- - 3 files changed, 11 insertions(+), 19 deletions(-) - -diff --git a/lib/tst_clocks.c b/lib/tst_clocks.c -index 5195da38f3..fa2f1cb842 100644 ---- a/lib/tst_clocks.c -+++ b/lib/tst_clocks.c -@@ -3,28 +3,24 @@ - * Copyright (c) 2017 Cyril Hrubis - */ - --/* -- * clock_gettime() and clock_getres() functions -- */ -- --#define _GNU_SOURCE --#include - #include --#include - -+#define TST_NO_DEFAULT_MAIN -+#include "tst_test.h" - #include "tst_clocks.h" -+#include "lapi/syscalls.h" - - int tst_clock_getres(clockid_t clk_id, struct timespec *res) - { -- return syscall(SYS_clock_getres, clk_id, res); -+ return tst_syscall(__NR_clock_getres, clk_id, res); - } - - int tst_clock_gettime(clockid_t clk_id, struct timespec *ts) - { -- return syscall(SYS_clock_gettime, clk_id, ts); -+ return tst_syscall(__NR_clock_gettime, clk_id, ts); - } - - int tst_clock_settime(clockid_t clk_id, struct timespec *ts) - { -- return syscall(SYS_clock_settime, clk_id, ts); -+ return tst_syscall(__NR_clock_settime, clk_id, ts); - } -diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c -index 583d8f7b9b..08ea1673ad 100644 ---- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c -+++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c -@@ -38,10 +38,8 @@ - #include - #include - #include "test.h" --#include - #include -- --#define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) -+#include "lapi/syscalls.h" - - char *TCID = "gettimeofday01"; - int TST_TOTAL = 1; -@@ -63,7 +61,7 @@ int main(int ac, char **av) - for (lc = 0; TEST_LOOPING(lc); lc++) { - tst_count = 0; - -- TEST(gettimeofday((void *)-1, (void *)-1)); -+ TEST(ltp_syscall(__NR_gettimeofday, (void *)-1, (void *)-1)); - - /* gettimeofday returns an int, so we need to turn the long - * TEST_RETURN into an int to test with */ -diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c -index 1d60f448e8..5170ad2f78 100644 ---- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c -+++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c -@@ -16,14 +16,12 @@ - #include - #include - #include --#include - #include - #include - #include - - #include "tst_test.h" -- --#define gettimeofday(a,b) syscall(__NR_gettimeofday,a,b) -+#include "lapi/syscalls.h" - - static volatile sig_atomic_t done; - static char *str_rtime; -@@ -48,13 +46,13 @@ static void verify_gettimeofday(void) - - alarm(rtime); - -- if (gettimeofday(&tv1, NULL)) { -+ if (tst_syscall(__NR_gettimeofday, &tv1, NULL)) { - tst_res(TBROK | TERRNO, "gettimeofday() failed"); - return; - } - - while (!done) { -- if (gettimeofday(&tv2, NULL)) { -+ if (tst_syscall(__NR_gettimeofday, &tv2, NULL)) { - tst_res(TBROK | TERRNO, "gettimeofday() failed"); - return; - } diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index 4f373c0ce4..eb349e2929 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,4 +1,4 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20200120/ltp-full-20200120.tar.xz.sha1 -sha1 8f622383907e2e64e60b69fd305fecb34311d6b6 ltp-full-20200120.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20200515/ltp-full-20200515.tar.xz.sha1 +sha1 7b3932b46295328c64d6f235bc54fa68806b9ede ltp-full-20200515.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 88b2e88293..4cee77bcd0 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20200120 +LTP_TESTSUITE_VERSION = 20200515 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+ @@ -69,23 +69,15 @@ LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ testcases/misc/math/float/float_bessel.c else ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) LTP_TESTSUITE_UNSUPPORTED_TEST_CASES = \ - testcases/kernel/pty/pty01.c \ - testcases/kernel/pty/pty02.c \ - testcases/kernel/pty/ptem01.c \ testcases/kernel/sched/process_stress/process.c \ - testcases/kernel/syscalls/accept4/accept4_01.c \ testcases/kernel/syscalls/confstr/confstr01.c \ testcases/kernel/syscalls/fmtmsg/fmtmsg01.c \ testcases/kernel/syscalls/getcontext/getcontext01.c \ testcases/kernel/syscalls/getdents/getdents01.c \ testcases/kernel/syscalls/getdents/getdents02.c \ - testcases/kernel/syscalls/ioctl/ioctl01.c \ - testcases/kernel/syscalls/ioctl/ioctl02.c \ testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c \ - testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c \ testcases/kernel/syscalls/timer_create/timer_create01.c \ testcases/kernel/syscalls/timer_create/timer_create03.c \ - testcases/misc/crash/crash01.c \ utils/benchmark/ebizzy-0.3 endif From a14a9629837a4de32a7a06a2f7b0e88958948ce5 Mon Sep 17 00:00:00 2001 From: Nicolas Robin Date: Fri, 15 May 2020 19:53:55 +0200 Subject: [PATCH 37/90] package/sdl2: enable SSE only if it's supported by the target Signed-off-by: Nicolas Robin Signed-off-by: Thomas Petazzoni --- package/sdl2/sdl2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 501bb4699d..4a287b66a3 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -30,6 +30,12 @@ else SDL2_CONF_OPTS += --disable-libudev endif +ifeq ($(BR2_X86_CPU_HAS_SSE),y) +SDL2_CONF_OPTS += --enable-sse +else +SDL2_CONF_OPTS += --disable-sse +endif + ifeq ($(BR2_PACKAGE_SDL2_DIRECTFB),y) SDL2_DEPENDENCIES += directfb SDL2_CONF_OPTS += --enable-video-directfb From f6cd56b9ce3587c3e56eaa5a8e5f44d777c41e60 Mon Sep 17 00:00:00 2001 From: Nicolas Robin Date: Fri, 15 May 2020 19:53:56 +0200 Subject: [PATCH 38/90] arch/x86: adds BR2_X86_CPU_HAS_3DNOW flag Signed-off-by: Nicolas Robin Signed-off-by: Thomas Petazzoni --- arch/Config.in.x86 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index eb655adbca..7aae3cafb7 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -1,6 +1,8 @@ # i386/x86_64 cpu features config BR2_X86_CPU_HAS_MMX bool +config BR2_X86_CPU_HAS_3DNOW + bool config BR2_X86_CPU_HAS_SSE bool config BR2_X86_CPU_HAS_SSE2 @@ -155,15 +157,18 @@ config BR2_x86_k6_2 bool "k6-2" depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_athlon bool "athlon" depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_athlon_4 bool "athlon-4" depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX select BR2_X86_CPU_HAS_SSE + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_opteron bool "opteron" select BR2_X86_CPU_HAS_MMX @@ -209,6 +214,7 @@ config BR2_x86_c3 bool "Via/Cyrix C3 (Samuel/Ezra cores)" depends on !BR2_x86_64 select BR2_X86_CPU_HAS_MMX + select BR2_X86_CPU_HAS_3DNOW config BR2_x86_c32 bool "Via C3-2 (Nehemiah cores)" depends on !BR2_x86_64 From fe29913fa96d2265ecf91e259f334dbdd67f92fb Mon Sep 17 00:00:00 2001 From: Nicolas Robin Date: Fri, 15 May 2020 19:53:57 +0200 Subject: [PATCH 39/90] package/sdl2: enable 3DNOW only if it's supported by the target Signed-off-by: Nicolas Robin Signed-off-by: Thomas Petazzoni --- package/sdl2/sdl2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 4a287b66a3..830873c9e4 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -36,6 +36,12 @@ else SDL2_CONF_OPTS += --disable-sse endif +ifeq ($(BR2_X86_CPU_HAS_3DNOW),y) +SDL2_CONF_OPTS += --enable-3dnow +else +SDL2_CONF_OPTS += --disable-3dnow +endif + ifeq ($(BR2_PACKAGE_SDL2_DIRECTFB),y) SDL2_DEPENDENCIES += directfb SDL2_CONF_OPTS += --enable-video-directfb From c2884cd6f8d3ae017e40dacba422c68b8949e419 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 11 May 2020 21:56:48 +0200 Subject: [PATCH 40/90] package/libyang: bump to version 1.0.167 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libyang/libyang.hash | 2 +- package/libyang/libyang.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index 9e1f60492e..52ce65516e 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c9703079f10fbf7154882562322b4b01764bc7735345da555ca51201b02e536c libyang-1.0.130.tar.gz +sha256 2431fa5c7cfbe6a6f2c0873547b976f018438967adfe268726911dd3d95eaa31 libyang-1.0.167.tar.gz sha256 f942fe693e03e4e3ff67a351c00dc8f468a042e0d7273b0aa6bc53060b568112 LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index 4e47c9f5fc..766c14fdcd 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 1.0.130 +LIBYANG_VERSION = 1.0.167 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE From 6e683608da103cd885dd3df0083193188bef3847 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 11 May 2020 21:56:50 +0200 Subject: [PATCH 41/90] package/libnetconf2: bump to version 1.1.24 The LICENSE file hash changed due to Copyright year updating to include 2020. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/libnetconf2/libnetconf2.hash | 4 ++-- package/libnetconf2/libnetconf2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index a73cb0ce91..f49972e957 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 35a1048754d6440674a193e4807b7cab5d03613b384436b67ef976ab3b1a2d01 libnetconf2-1.1.7.tar.gz -sha256 085122ea91161812dda9cd2f42d8c50ecc3a48cc1a4f15044d86cfc5aa887577 LICENSE +sha256 1a69db028bf970f0dab15ed508b58e0cf0806a7e4492828404b75c97ec8ab306 libnetconf2-1.1.24.tar.gz +sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index 724e4993bb..4ef3d85b17 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 1.1.7 +LIBNETCONF2_VERSION = 1.1.24 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause From 2c3dc380a0417915cddab14c925e2892585e76dc Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 11 May 2020 21:56:52 +0200 Subject: [PATCH 42/90] package/sysrepo: bump version to 1.4.58 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/sysrepo/sysrepo.hash | 2 +- package/sysrepo/sysrepo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index a759821614..ae72fc2b00 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d84d4f092feab83b0a39fef5d0d62bc6ed1f0f8aa274329f2cbf0a95a6528d8a sysrepo-1.4.2.tar.gz +sha256 9c134658a5b812cd86b9113c30fc01be5a094616f473e747032ccf614af9e4dd sysrepo-1.4.58.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 67290dad4f..aee40fa274 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 1.4.2 +SYSREPO_VERSION = 1.4.58 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = Apache-2.0 From 604fe088060c1c3b348f007459c40f51ed23cb0d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 11 May 2020 21:22:37 +0200 Subject: [PATCH 43/90] package/python-markdown2: fix CVE-2020-11888 python-markdown2 through 2.3.8 allows XSS because element names are mishandled unless a \w+ match succeeds. For example, an attack might use elementname@ or elementname- with an onclick attribute. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...gs-with-punctuation-after-as-part-of.patch | 53 +++++++++++++++++++ .../0002-Better-fix-for-issue-348.patch | 32 +++++++++++ package/python-markdown2/python-markdown2.mk | 4 ++ 3 files changed, 89 insertions(+) create mode 100644 package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch create mode 100644 package/python-markdown2/0002-Better-fix-for-issue-348.patch diff --git a/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch b/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch new file mode 100644 index 0000000000..ee980e22e8 --- /dev/null +++ b/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch @@ -0,0 +1,53 @@ +From 9144d0fc5d5249cc4d81287ee79091806e6dde52 Mon Sep 17 00:00:00 2001 +From: Gareth Simpson +Date: Fri, 1 May 2020 19:31:21 +0100 +Subject: [PATCH] Fix for issue 348 - incomplete tags with punctuation after as + part of the tag name are a source of XSS + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/trentm/python-markdown2/commit/9144d0fc5d5249cc4d81287ee79091806e6dde52] +--- + lib/markdown2.py | 2 +- + test/tm-cases/issue348_incomplete_tag.html | 1 + + test/tm-cases/issue348_incomplete_tag.opts | 1 + + test/tm-cases/issue348_incomplete_tag.text | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) + create mode 100644 test/tm-cases/issue348_incomplete_tag.html + create mode 100644 test/tm-cases/issue348_incomplete_tag.opts + create mode 100644 test/tm-cases/issue348_incomplete_tag.text + +diff --git a/lib/markdown2.py b/lib/markdown2.py +index 3a5d5d9..636bf07 100755 +--- a/lib/markdown2.py ++++ b/lib/markdown2.py +@@ -2164,7 +2164,7 @@ def _encode_amps_and_angles(self, text): + text = self._naked_gt_re.sub('>', text) + return text + +- _incomplete_tags_re = re.compile("<(/?\w+[\s/]+?)") ++ _incomplete_tags_re = re.compile("<(/?\w+?(?!://).?[\s/]+?)") + + def _encode_incomplete_tags(self, text): + if self.safe_mode not in ("replace", "escape"): +diff --git a/test/tm-cases/issue348_incomplete_tag.html b/test/tm-cases/issue348_incomplete_tag.html +new file mode 100644 +index 0000000..46059cc +--- /dev/null ++++ b/test/tm-cases/issue348_incomplete_tag.html +@@ -0,0 +1 @@ ++

<lol@/ //id="pwn"//onclick="alert(1)"//abc

+diff --git a/test/tm-cases/issue348_incomplete_tag.opts b/test/tm-cases/issue348_incomplete_tag.opts +new file mode 100644 +index 0000000..ad487c0 +--- /dev/null ++++ b/test/tm-cases/issue348_incomplete_tag.opts +@@ -0,0 +1 @@ ++{"safe_mode": "escape"} +diff --git a/test/tm-cases/issue348_incomplete_tag.text b/test/tm-cases/issue348_incomplete_tag.text +new file mode 100644 +index 0000000..bb4a0de +--- /dev/null ++++ b/test/tm-cases/issue348_incomplete_tag.text +@@ -0,0 +1 @@ ++ +Date: Sat, 2 May 2020 21:22:36 +0100 +Subject: [PATCH] Better fix for issue 348 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/trentm/python-markdown2/commit/0c0543846fa54281e2269b0bff841a0b9ffe23fe] +--- + lib/markdown2.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/lib/markdown2.py b/lib/markdown2.py +index 636bf07..be86502 100755 +--- a/lib/markdown2.py ++++ b/lib/markdown2.py +@@ -2164,11 +2164,14 @@ def _encode_amps_and_angles(self, text): + text = self._naked_gt_re.sub('>', text) + return text + +- _incomplete_tags_re = re.compile("<(/?\w+?(?!://).?[\s/]+?)") ++ _incomplete_tags_re = re.compile("<(/?\w+?(?!\w).+?[\s/]+?)") + + def _encode_incomplete_tags(self, text): + if self.safe_mode not in ("replace", "escape"): + return text ++ ++ if text.endswith(">"): ++ return text # this is not an incomplete tag, this is a link in the form + + return self._incomplete_tags_re.sub("<\\1", text) + diff --git a/package/python-markdown2/python-markdown2.mk b/package/python-markdown2/python-markdown2.mk index d8b946e140..f508c17a20 100644 --- a/package/python-markdown2/python-markdown2.mk +++ b/package/python-markdown2/python-markdown2.mk @@ -11,4 +11,8 @@ PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt +# 0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch +# 0002-Better-fix-for-issue-348.patch +PYTHON_MARKDOWN2_IGNORE_CVES += CVE-2020-11888 + $(eval $(python-package)) From 81b3fd8654dec3a76af5767f45455e0b9dc1d508 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 12 May 2020 18:54:36 +0200 Subject: [PATCH 44/90] package/python-markdown2: bump to version 2.3.9 - Drop patches (already in version) - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...gs-with-punctuation-after-as-part-of.patch | 53 ------------------- .../0002-Better-fix-for-issue-348.patch | 32 ----------- .../python-markdown2/python-markdown2.hash | 6 +-- package/python-markdown2/python-markdown2.mk | 8 +-- 4 files changed, 5 insertions(+), 94 deletions(-) delete mode 100644 package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch delete mode 100644 package/python-markdown2/0002-Better-fix-for-issue-348.patch diff --git a/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch b/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch deleted file mode 100644 index ee980e22e8..0000000000 --- a/package/python-markdown2/0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9144d0fc5d5249cc4d81287ee79091806e6dde52 Mon Sep 17 00:00:00 2001 -From: Gareth Simpson -Date: Fri, 1 May 2020 19:31:21 +0100 -Subject: [PATCH] Fix for issue 348 - incomplete tags with punctuation after as - part of the tag name are a source of XSS - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/trentm/python-markdown2/commit/9144d0fc5d5249cc4d81287ee79091806e6dde52] ---- - lib/markdown2.py | 2 +- - test/tm-cases/issue348_incomplete_tag.html | 1 + - test/tm-cases/issue348_incomplete_tag.opts | 1 + - test/tm-cases/issue348_incomplete_tag.text | 1 + - 4 files changed, 4 insertions(+), 1 deletion(-) - create mode 100644 test/tm-cases/issue348_incomplete_tag.html - create mode 100644 test/tm-cases/issue348_incomplete_tag.opts - create mode 100644 test/tm-cases/issue348_incomplete_tag.text - -diff --git a/lib/markdown2.py b/lib/markdown2.py -index 3a5d5d9..636bf07 100755 ---- a/lib/markdown2.py -+++ b/lib/markdown2.py -@@ -2164,7 +2164,7 @@ def _encode_amps_and_angles(self, text): - text = self._naked_gt_re.sub('>', text) - return text - -- _incomplete_tags_re = re.compile("<(/?\w+[\s/]+?)") -+ _incomplete_tags_re = re.compile("<(/?\w+?(?!://).?[\s/]+?)") - - def _encode_incomplete_tags(self, text): - if self.safe_mode not in ("replace", "escape"): -diff --git a/test/tm-cases/issue348_incomplete_tag.html b/test/tm-cases/issue348_incomplete_tag.html -new file mode 100644 -index 0000000..46059cc ---- /dev/null -+++ b/test/tm-cases/issue348_incomplete_tag.html -@@ -0,0 +1 @@ -+

<lol@/ //id="pwn"//onclick="alert(1)"//abc

-diff --git a/test/tm-cases/issue348_incomplete_tag.opts b/test/tm-cases/issue348_incomplete_tag.opts -new file mode 100644 -index 0000000..ad487c0 ---- /dev/null -+++ b/test/tm-cases/issue348_incomplete_tag.opts -@@ -0,0 +1 @@ -+{"safe_mode": "escape"} -diff --git a/test/tm-cases/issue348_incomplete_tag.text b/test/tm-cases/issue348_incomplete_tag.text -new file mode 100644 -index 0000000..bb4a0de ---- /dev/null -+++ b/test/tm-cases/issue348_incomplete_tag.text -@@ -0,0 +1 @@ -+ -Date: Sat, 2 May 2020 21:22:36 +0100 -Subject: [PATCH] Better fix for issue 348 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/trentm/python-markdown2/commit/0c0543846fa54281e2269b0bff841a0b9ffe23fe] ---- - lib/markdown2.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/markdown2.py b/lib/markdown2.py -index 636bf07..be86502 100755 ---- a/lib/markdown2.py -+++ b/lib/markdown2.py -@@ -2164,11 +2164,14 @@ def _encode_amps_and_angles(self, text): - text = self._naked_gt_re.sub('>', text) - return text - -- _incomplete_tags_re = re.compile("<(/?\w+?(?!://).?[\s/]+?)") -+ _incomplete_tags_re = re.compile("<(/?\w+?(?!\w).+?[\s/]+?)") - - def _encode_incomplete_tags(self, text): - if self.safe_mode not in ("replace", "escape"): - return text -+ -+ if text.endswith(">"): -+ return text # this is not an incomplete tag, this is a link in the form - - return self._incomplete_tags_re.sub("<\\1", text) - diff --git a/package/python-markdown2/python-markdown2.hash b/package/python-markdown2/python-markdown2.hash index 2d72a78053..03315fd3ea 100644 --- a/package/python-markdown2/python-markdown2.hash +++ b/package/python-markdown2/python-markdown2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/markdown2/json -md5 a8dee88993d05a3e10765a57b1e1ea07 markdown2-2.3.8.tar.gz -sha256 7ff88e00b396c02c8e1ecd8d176cfa418fb01fe81234dcea77803e7ce4f05dbe markdown2-2.3.8.tar.gz +md5 5c1f9002060cf534bde0bdd584d6b70a markdown2-2.3.9.tar.gz +sha256 89526090907ae5ece66d783c434b35c29ee500c1986309e306ce2346273ada6a markdown2-2.3.9.tar.gz # Locally computed sha256 checksums -sha256 f8c7c4d554409cf621b8d653dbfffb719745fd36f5c49b8305258649b403ef9c LICENSE.txt +sha256 f8c7c4d554409cf621b8d653dbfffb719745fd36f5c49b8305258649b403ef9c LICENSE.txt diff --git a/package/python-markdown2/python-markdown2.mk b/package/python-markdown2/python-markdown2.mk index f508c17a20..c7858a3966 100644 --- a/package/python-markdown2/python-markdown2.mk +++ b/package/python-markdown2/python-markdown2.mk @@ -4,15 +4,11 @@ # ################################################################################ -PYTHON_MARKDOWN2_VERSION = 2.3.8 +PYTHON_MARKDOWN2_VERSION = 2.3.9 PYTHON_MARKDOWN2_SOURCE = markdown2-$(PYTHON_MARKDOWN2_VERSION).tar.gz -PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/e3/93/d37055743009d1a492b2670cc215831a388b3d6e4a28b7672fdf0f7854f5 +PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/14/69/c542025f80916457ff4fe962404a27ab6417d43822fe54bf88ee2dd1b36f PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt -# 0001-Fix-for-issue-348-incomplete-tags-with-punctuation-after-as-part-of.patch -# 0002-Better-fix-for-issue-348.patch -PYTHON_MARKDOWN2_IGNORE_CVES += CVE-2020-11888 - $(eval $(python-package)) From b3ad18e8d2ef83ee8c45363d33bdae91575838cd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 12 May 2020 20:10:25 +0200 Subject: [PATCH 45/90] package/freeswitch: bump version to 1.10.3 Release notes: https://mailchi.mp/freeswitch.com/freeswitch-v1103-has-just-been-released Changelog: https://github.com/signalwire/freeswitch/releases/tag/v1.10.3 Reformatted hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/freeswitch/freeswitch.hash | 36 +++++++++++++++--------------- package/freeswitch/freeswitch.mk | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index f300e69bf4..de6cb6462c 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,19 +1,19 @@ -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.2.tar.xz.md5 -md5 89d66f87f0f6c2471aa95aee48f55fdc freeswitch-1.10.2.-release.tar.xz -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.2.tar.xz.sha1 -sha1 90dac82cb4fb8fc11e399fd4bdac7163fb40259b freeswitch-1.10.2.-release.tar.xz -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.2.tar.xz.sha256 -sha256 1fd46dee82ecc52ac90ebab6bd454e34c64950fae7d6dc0589c8daa14bfc7d34 freeswitch-1.10.2.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.3.-release.tar.xz.md5 +md5 c7d570da3a6fc66c1a286a105680dabf freeswitch-1.10.3.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.3.-release.tar.xz.sha1 +sha1 98139cda8054ec840611c6fc3a585a5c5565ae4d freeswitch-1.10.3.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.3.-release.tar.xz.sha256 +sha256 2d7db07a64ee2f19f9b6e3a4ce76fa42e0fe46c29d95edf1b690a3df3729f307 freeswitch-1.10.3.-release.tar.xz # Locally computed -sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING -sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt -sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE -sha256 1eefb2ea1db0af7729a9d8a27d7c65d8a37ab185393f935b029aac6828ce315a libs/apr-util/LICENSE -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE -sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c -sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 libs/sofia-sip/COPYING -sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 libs/sofia-sip/COPYRIGHTS -sha256 366576cb0b869cd9e95a4882878607314650488ac635e5df0692180382e9666a libs/spandsp/COPYING -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE +sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING +sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt +sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE +sha256 1eefb2ea1db0af7729a9d8a27d7c65d8a37ab185393f935b029aac6828ce315a libs/apr-util/LICENSE +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE +sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c +sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 libs/sofia-sip/COPYING +sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 libs/sofia-sip/COPYRIGHTS +sha256 366576cb0b869cd9e95a4882878607314650488ac635e5df0692180382e9666a libs/spandsp/COPYING +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index 5985df4a6e..79467ed618 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.2 +FREESWITCH_VERSION = 1.10.3 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging From 41d80c72c67e1016875b16e98f38a1bc3f5b25e1 Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Mon, 11 May 2020 20:04:04 +0200 Subject: [PATCH 46/90] package/python-redis: Bump to version 3.5.1 Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- package/python-redis/python-redis.hash | 4 ++-- package/python-redis/python-redis.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-redis/python-redis.hash b/package/python-redis/python-redis.hash index b30942311b..3f0c2d4d2c 100644 --- a/package/python-redis/python-redis.hash +++ b/package/python-redis/python-redis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/redis/json -md5 5b432eff77163a353c520737d057e494 redis-3.5.0.tar.gz -sha256 7378105cd8ea20c4edc49f028581e830c01ad5f00be851def0f4bc616a83cd89 redis-3.5.0.tar.gz +md5 a005acb0f05c7929c8b5961d216a0220 redis-3.5.1.tar.gz +sha256 6e9d2722a95d10ddf854596e66516d316d99c6a483e5db3b35c34e1158b2bfa1 redis-3.5.1.tar.gz # Locally computed sha256 checksums sha256 790148d8c12f8a38b2707a74be2343316bad126995ff54801a181b8b231ba124 LICENSE diff --git a/package/python-redis/python-redis.mk b/package/python-redis/python-redis.mk index 273f55748b..ffd18a00b8 100644 --- a/package/python-redis/python-redis.mk +++ b/package/python-redis/python-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REDIS_VERSION = 3.5.0 +PYTHON_REDIS_VERSION = 3.5.1 PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz -PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/05/5e/5e9a329ba600244f2d37f86131ccec19936d41cba0887240086b44cf4f54 +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/1c/74/4d3250366bd783f9907d8ed32140bf4beef11000200d7edf8245800e6c4c PYTHON_REDIS_SETUP_TYPE = setuptools PYTHON_REDIS_LICENSE = MIT PYTHON_REDIS_LICENSE_FILES = LICENSE From d4201027cbb3e033c84d5c95db1261e10e6ab641 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 11 May 2020 01:50:16 -0600 Subject: [PATCH 47/90] package/python-janus: bump to version 0.5.0 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-janus/python-janus.hash | 6 +++--- package/python-janus/python-janus.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-janus/python-janus.hash b/package/python-janus/python-janus.hash index 5098769901..9108db6325 100644 --- a/package/python-janus/python-janus.hash +++ b/package/python-janus/python-janus.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/janus/json -md5 26283b122439fbca4ae1db18ff839b7c janus-0.4.0.tar.gz -sha256 cfc221683160b91b35bae1917e2957b78dad10a2e634f4f8ed119ed72e2a88ef janus-0.4.0.tar.gz +md5 577c3c8939ef945c5dc00319bd59484f janus-0.5.0.tar.gz +sha256 0700f5537d076521851d19b7625545c5e76f6d5792ab17984f28230adcc3b34c janus-0.5.0.tar.gz # Locally computed sha256 checksums -sha256 8b177cccb6ddec12a9fc97bd49e7e2bbcd92464625624bd8bdbfad799ae606e9 LICENSE +sha256 8b177cccb6ddec12a9fc97bd49e7e2bbcd92464625624bd8bdbfad799ae606e9 LICENSE diff --git a/package/python-janus/python-janus.mk b/package/python-janus/python-janus.mk index f718d0c19d..b5fa44f727 100644 --- a/package/python-janus/python-janus.mk +++ b/package/python-janus/python-janus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JANUS_VERSION = 0.4.0 +PYTHON_JANUS_VERSION = 0.5.0 PYTHON_JANUS_SOURCE = janus-$(PYTHON_JANUS_VERSION).tar.gz -PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/e2/39/41fd545b99eac81d47fe346b8c78c09a3b187ce2fd9f3c9656dfe035e39a +PYTHON_JANUS_SITE = https://files.pythonhosted.org/packages/9a/76/fbb89aa5d3cb5f3fec6ce74d34cf980ccd475b015d1a59cb5a14fe4cd2c5 PYTHON_JANUS_SETUP_TYPE = setuptools PYTHON_JANUS_LICENSE = Apache-2.0 PYTHON_JANUS_LICENSE_FILES = LICENSE From df7ffdcc81b3c9aafa5476ea03bf88fef8da6a26 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 10 May 2020 21:29:56 +0200 Subject: [PATCH 48/90] package/libaacs: bump version to 0.10.0 Changelog: https://code.videolan.org/videolan/libaacs/-/blob/master/ChangeLog Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libaacs/libaacs.hash | 6 +++--- package/libaacs/libaacs.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libaacs/libaacs.hash b/package/libaacs/libaacs.hash index 22310295f8..82e8698616 100644 --- a/package/libaacs/libaacs.hash +++ b/package/libaacs/libaacs.hash @@ -1,5 +1,5 @@ -# From http://download.videolan.org/pub/videolan/libaacs/0.9.0/libaacs-0.9.0.tar.bz2.sha512 -sha512 b9c658db22a0966486070d3b762509a7c0120469ab29d1e57c1b624cad309701de8b92455ec649db4d731be4a5c29c38fb4f99bb7617dbb4254270284a1903f6 libaacs-0.9.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libaacs/0.10.0/libaacs-0.10.0.tar.bz2.sha512 +sha512 4527749c3c78fd270012b3b36e916356a4aeb8f90169e781a00739f01f190121691042607209864e9b676ede9741f614c6003a7dfbb350dc020e1fa94cd6d66e libaacs-0.10.0.tar.bz2 # Hash for license file: -sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libaacs/libaacs.mk b/package/libaacs/libaacs.mk index 143b0ff3d7..95f1cbdab8 100644 --- a/package/libaacs/libaacs.mk +++ b/package/libaacs/libaacs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBAACS_VERSION = 0.9.0 +LIBAACS_VERSION = 0.10.0 LIBAACS_SITE = http://download.videolan.org/pub/videolan/libaacs/$(LIBAACS_VERSION) LIBAACS_SOURCE = libaacs-$(LIBAACS_VERSION).tar.bz2 LIBAACS_LICENSE = LGPL-2.1+ From fcfdd8a80dffd1c7c4973d4e359c32372430c83f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 May 2020 23:26:39 +0200 Subject: [PATCH 49/90] package/libunwind: enable on AArch64 Since version 1.2, libunwind has support for the AArch64 architecture. It builds fine on glibc, needs a small patch on musl, but doesn't build with uClibc (stack_t undefined). Fixes: https://bugs.busybox.net/show_bug.cgi?id=12836 Signed-off-by: Thomas Petazzoni --- ...t_t-instead-of-__sigset_t-on-AArch64.patch | 46 +++++++++++++++++++ package/libunwind/Config.in | 7 +-- 2 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 package/libunwind/0002-Use-sigset_t-instead-of-__sigset_t-on-AArch64.patch diff --git a/package/libunwind/0002-Use-sigset_t-instead-of-__sigset_t-on-AArch64.patch b/package/libunwind/0002-Use-sigset_t-instead-of-__sigset_t-on-AArch64.patch new file mode 100644 index 0000000000..035bdae803 --- /dev/null +++ b/package/libunwind/0002-Use-sigset_t-instead-of-__sigset_t-on-AArch64.patch @@ -0,0 +1,46 @@ +From b9627ed74ab1f58be0de075be68d5cd2e96b8750 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 3 May 2020 23:08:54 +0200 +Subject: [PATCH] Use sigset_t instead of __sigset_t on AArch64 + +This fixes the build with the musl C library. sigset_t is the +documented type exposed by . + +This fix comes from Alpine Linux: + + https://git.alpinelinux.org/aports/plain/main/libunwind/fix-aarch64-sigset_t.patch + +It was authored by Leo . + +The issue has been reported upstream at +https://github.com/libunwind/libunwind/issues/176. + +Signed-off-by: Thomas Petazzoni +--- + include/libunwind-aarch64.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/libunwind-aarch64.h b/include/libunwind-aarch64.h +index 778b4362..926fbbc0 100644 +--- a/include/libunwind-aarch64.h ++++ b/include/libunwind-aarch64.h +@@ -34,6 +34,7 @@ extern "C" { + #include + #include + #include ++#include + + #define UNW_TARGET aarch64 + #define UNW_TARGET_AARCH64 1 +@@ -192,7 +193,7 @@ typedef struct + unsigned long uc_flags; + struct ucontext *uc_link; + stack_t uc_stack; +- __sigset_t uc_sigmask; ++ sigset_t uc_sigmask; + struct unw_sigcontext uc_mcontext; + } unw_tdep_context_t; + +-- +2.26.2 + diff --git a/package/libunwind/Config.in b/package/libunwind/Config.in index be576d13c4..5284b5864c 100644 --- a/package/libunwind/Config.in +++ b/package/libunwind/Config.in @@ -10,13 +10,14 @@ config BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS bool default y if BR2_TOOLCHAIN_USES_GLIBC && \ - (BR2_ARM_CPU_HAS_ARM || BR2_mips || BR2_mipsel || BR2_mips64 || \ - BR2_mips64el || BR2_powerpc || BR2_sh || BR2_i386 || BR2_x86_64) + (BR2_ARM_CPU_HAS_ARM || BR2_aarch64 || BR2_mips || BR2_mipsel || \ + BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_sh || \ + BR2_i386 || BR2_x86_64) default y if BR2_TOOLCHAIN_USES_UCLIBC && \ (BR2_ARM_CPU_HAS_ARM || BR2_mips || BR2_mipsel || \ BR2_mips64 || BR2_mips64el || BR2_x86_64) default y if BR2_TOOLCHAIN_USES_MUSL && \ - (BR2_ARM_CPU_HAS_ARM || BR2_x86_64) + (BR2_ARM_CPU_HAS_ARM || BR2_aarch64 || BR2_x86_64) config BR2_PACKAGE_LIBUNWIND bool "libunwind" From 5ebed9c9667f6d54504d65bf3b1881ce5298e6e7 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Mon, 18 May 2020 20:33:19 +0200 Subject: [PATCH 50/90] package/feh: bump to version 3.4 Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/feh/feh.hash | 2 +- package/feh/feh.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/feh/feh.hash b/package/feh/feh.hash index 2bfe5e48a8..c39abd0ee7 100644 --- a/package/feh/feh.hash +++ b/package/feh/feh.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 8f9741399b4b184ba28698c0fd7722638e79abac8e6c27eb526cc52b11ee0a1c feh-3.2.1.tar.bz2 +sha256 18545ca5c7537268810bec564db9cd3ad1ca98c2a2f23ec243d3bac56cfc0365 feh-3.4.tar.bz2 sha256 a289176a74d8e5d071456df5d4ee629aeb86f8eeeb6570076fe126f182c6b91d COPYING diff --git a/package/feh/feh.mk b/package/feh/feh.mk index 973eed60b0..90f8ff6579 100644 --- a/package/feh/feh.mk +++ b/package/feh/feh.mk @@ -4,7 +4,7 @@ # ################################################################################ -FEH_VERSION = 3.2.1 +FEH_VERSION = 3.4 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2 FEH_SITE = http://feh.finalrewind.org FEH_DEPENDENCIES = imlib2 libpng xlib_libXt From 10b1abfcb523889c1725c5860f77f7bff29f4a0a Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Mon, 18 May 2020 16:26:05 +0200 Subject: [PATCH 51/90] package/python-crontab: bump to version 2.5.1 Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- package/python-crontab/python-crontab.hash | 4 ++-- package/python-crontab/python-crontab.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-crontab/python-crontab.hash b/package/python-crontab/python-crontab.hash index d0e5725708..2247cf3d3d 100644 --- a/package/python-crontab/python-crontab.hash +++ b/package/python-crontab/python-crontab.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-crontab/json -md5 65fe16d44568de2671d334a637e64a3b python-crontab-2.4.2.tar.gz -sha256 ed9583cff430715d9560cbad28309429ac13f3fdb13051ac2288050e05abc392 python-crontab-2.4.2.tar.gz +md5 7731a2253e853abfb6eceb8045368f22 python-crontab-2.5.1.tar.gz +sha256 4bbe7e720753a132ca4ca9d4094915f40e9d9dc8a807a4564007651018ce8c31 python-crontab-2.5.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/python-crontab/python-crontab.mk b/package/python-crontab/python-crontab.mk index 0c6109dd7f..ddb1067db2 100644 --- a/package/python-crontab/python-crontab.mk +++ b/package/python-crontab/python-crontab.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CRONTAB_VERSION = 2.4.2 -PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/d1/c2/e92e801a0c504e62899d574a6d281d6e598861797c6798a664556d2bca8c +PYTHON_CRONTAB_VERSION = 2.5.1 +PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/1b/7e/fb78b96de58a49b8ef807c321870ef4de3de5928fd71a40a400aed714310 PYTHON_CRONTAB_SETUP_TYPE = setuptools PYTHON_CRONTAB_LICENSE = LGPL-3.0+ PYTHON_CRONTAB_LICENSE_FILES = COPYING From c195b88479e7be7586472b9e1e88fd06704d09a8 Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Mon, 18 May 2020 16:26:06 +0200 Subject: [PATCH 52/90] package/python-redis: bump to version 3.5.2 Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- package/python-redis/python-redis.hash | 4 ++-- package/python-redis/python-redis.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-redis/python-redis.hash b/package/python-redis/python-redis.hash index 3f0c2d4d2c..b7a62ca297 100644 --- a/package/python-redis/python-redis.hash +++ b/package/python-redis/python-redis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/redis/json -md5 a005acb0f05c7929c8b5961d216a0220 redis-3.5.1.tar.gz -sha256 6e9d2722a95d10ddf854596e66516d316d99c6a483e5db3b35c34e1158b2bfa1 redis-3.5.1.tar.gz +md5 e3155d2b7a7577ce61e572b4e3535545 redis-3.5.2.tar.gz +sha256 6d65e84bc58091140081ee9d9c187aab0480097750fac44239307a3bdf0b1251 redis-3.5.2.tar.gz # Locally computed sha256 checksums sha256 790148d8c12f8a38b2707a74be2343316bad126995ff54801a181b8b231ba124 LICENSE diff --git a/package/python-redis/python-redis.mk b/package/python-redis/python-redis.mk index ffd18a00b8..e09e3d8426 100644 --- a/package/python-redis/python-redis.mk +++ b/package/python-redis/python-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REDIS_VERSION = 3.5.1 +PYTHON_REDIS_VERSION = 3.5.2 PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz -PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/1c/74/4d3250366bd783f9907d8ed32140bf4beef11000200d7edf8245800e6c4c +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/08/ca/549a324a6a40611ac6d6192586ca562e79db86dd25fa59c3877ce69ce910 PYTHON_REDIS_SETUP_TYPE = setuptools PYTHON_REDIS_LICENSE = MIT PYTHON_REDIS_LICENSE_FILES = LICENSE From 7c16bf544953004f8a534ae447189ed90161e1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= Date: Tue, 19 May 2020 15:33:09 +0200 Subject: [PATCH 53/90] package/libpwquality: bump version to 1.4.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Sørensen Signed-off-by: Thomas Petazzoni --- package/libpwquality/libpwquality.hash | 4 ++-- package/libpwquality/libpwquality.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libpwquality/libpwquality.hash b/package/libpwquality/libpwquality.hash index b63501fa16..07c50ed24e 100644 --- a/package/libpwquality/libpwquality.hash +++ b/package/libpwquality/libpwquality.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a97d72b5c56b7e279c6e86dad70c1493ea5796f00a596fb9f3173b96f9bf5e46 libpwquality-1.4.1.tar.bz2 -sha256 aa44d09f651bf99b56253187c7778a240740c767d28453ab7fdc9804c842baee COPYING +sha256 5263e09ee62269c092f790ac159112aed3e66826a795e3afec85fdeac4281c8e libpwquality-1.4.2.tar.bz2 +sha256 aa44d09f651bf99b56253187c7778a240740c767d28453ab7fdc9804c842baee COPYING diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index bddafd59ca..a2fb00415f 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPWQUALITY_VERSION = 1.4.1 +LIBPWQUALITY_VERSION = 1.4.2 LIBPWQUALITY_SOURCE = libpwquality-$(LIBPWQUALITY_VERSION).tar.bz2 LIBPWQUALITY_SITE = https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$(LIBPWQUALITY_VERSION) LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+ From 70eab17ee245a939041d8e058ca4cc8e81182e76 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Tue, 19 May 2020 12:53:22 -0700 Subject: [PATCH 54/90] package/python-sentry-sdk: bump to version 0.14.4 Signed-off-by: Joseph Kogut Signed-off-by: Thomas Petazzoni --- package/python-sentry-sdk/python-sentry-sdk.hash | 8 ++++---- package/python-sentry-sdk/python-sentry-sdk.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index e9dc465592..a2c739e262 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.hash +++ b/package/python-sentry-sdk/python-sentry-sdk.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/sentry-sdk/json -md5 1b22a7cb91e1f9b83acbd61709d5e71d sentry-sdk-0.13.1.tar.gz -sha256 f6e850f304382d87c5c52c01db8c0004d2ced6a0b073df2f2257168cf31b31aa sentry-sdk-0.13.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/sentry_sdk/json +md5 21ec2fefe3561a12b4ee1efef3748400 sentry-sdk-0.14.4.tar.gz +sha256 0e5e947d0f7a969314aa23669a94a9712be5a688ff069ff7b9fc36c66adc160c sentry-sdk-0.14.4.tar.gz # Locally computed sha256 checksums -sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c LICENSE +sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index dd47e7c0c3..13495047b9 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 0.13.1 +PYTHON_SENTRY_SDK_VERSION = 0.14.4 PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/e2/5f/1f5881e98746c16464d46ae9d6ccdd6ce3c01c7e13093ea8a7d917642ee7 +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/ab/67/b653a44ce124a2b700a7fc349ca129282c5fec4fdc9197f558178a9e32ae PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE From f953135b72c80b207d588e4739969953d00b4989 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 18 May 2020 01:46:07 -0600 Subject: [PATCH 55/90] package/ser2net: bump to version 4.1.8 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/ser2net/ser2net.hash | 6 +++--- package/ser2net/ser2net.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ser2net/ser2net.hash b/package/ser2net/ser2net.hash index 91d97e74fc..359ab98ed3 100644 --- a/package/ser2net/ser2net.hash +++ b/package/ser2net/ser2net.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/ser2net/files/ser2net/ -md5 504345864f6110d5b6b63ad1f2ba3ed9 ser2net-4.1.7.tar.gz -sha1 8268c2f7937152a7bbbac6d2f289c257d11deb69 ser2net-4.1.7.tar.gz +md5 eb08bf2822d5c4293f798d9d8f3c1b66 ser2net-4.1.8.tar.gz +sha1 e3538f37b99f33a417c34e7b98eb9423262ff19a ser2net-4.1.8.tar.gz # Locally computed: -sha256 55bbeeed58eda7514ba7a52d14a930e57e1e5c6fd785a84ca0dd7c3b5615e0a5 ser2net-4.1.7.tar.gz +sha256 cffb5147021202b064eb0a9389d0db63d1bb2dcde5a896f7785f97b1b5f51a72 ser2net-4.1.8.tar.gz sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk index 1f29e2950e..861f954f76 100644 --- a/package/ser2net/ser2net.mk +++ b/package/ser2net/ser2net.mk @@ -4,7 +4,7 @@ # ################################################################################ -SER2NET_VERSION = 4.1.7 +SER2NET_VERSION = 4.1.8 SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net SER2NET_LICENSE = GPL-2.0+ SER2NET_LICENSE_FILES = COPYING From f1b335d43934356dd4bac8a8a959e237d94f2963 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 20 May 2020 19:14:55 +0200 Subject: [PATCH 56/90] package/kodi-inputstream-adaptive: bump version to 2.4.5 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index ff520781ac..561d94f37c 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ec2264aa620faa547e589b705c0393dbbfe4a8f866215d9a9f3d5b3ceea6560e kodi-inputstream-adaptive-2.4.4-Leia.tar.gz +sha256 14389878598f34c9eb931ee9c7b431ddd4ee19df7368fc718c34b8bf4b56b0a1 kodi-inputstream-adaptive-2.4.5-Leia.tar.gz sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index cd34047db4..643d608640 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.4.4-Leia +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.4.5-Leia KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,peak3d,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL From 285101c04826d255cb4e536745bfd50943cf660e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 20 May 2020 19:16:49 +0200 Subject: [PATCH 57/90] package/kodi-pvr-argustv: bump version to 3.5.6-Leia Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-argustv/kodi-pvr-argustv.hash | 2 +- package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index e9d3684b2f..5610418f7d 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2d0fae3721715a17e1c1454dd7029eb8d18e7f761ed65e00f8c488c7c08433e8 kodi-pvr-argustv-3.5.4-Leia.tar.gz +sha256 7bfedb27b2aec4015b2594df18b76fe42e97ec10f4b5cb9c6987b1a7a264c844 kodi-pvr-argustv-3.5.6-Leia.tar.gz sha256 17bc5450fff10fc46484886690adbf20c369f5baff021435feab1187b9943834 debian/copyright diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index b82a6f52d0..73a9f1c764 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 3.5.4-Leia +KODI_PVR_ARGUSTV_VERSION = 3.5.6-Leia KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = debian/copyright From 678d52b09934f9c4ecd67b98f777d659e2e70abe Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 20 May 2020 19:17:41 +0200 Subject: [PATCH 58/90] package/kodi-pvr-filmon: bump version to 2.4.6-Leia Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-filmon/kodi-pvr-filmon.hash | 2 +- package/kodi-pvr-filmon/kodi-pvr-filmon.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash index 947c81d2e6..8f181a2420 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.hash +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 763500fb4a7210569f05dba8307d400e532dd0e72b24f1a1d2cd516695145190 kodi-pvr-filmon-2.4.4-Leia.tar.gz +sha256 90988e4833c0f84ab08e08be3cd08b84e4ba2baf2ebc1545c62e5dbd6708d749 kodi-pvr-filmon-2.4.6-Leia.tar.gz sha256 081907693b03f27cb1b17e0a440ae05fd8c8b4631be6fe6fdba4e18a5d40fdc5 debian/copyright diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk index 0ee910db9f..078eae176a 100644 --- a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk +++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_FILMON_VERSION = 2.4.4-Leia +KODI_PVR_FILMON_VERSION = 2.4.6-Leia KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION)) KODI_PVR_FILMON_LICENSE = GPL-2.0+ KODI_PVR_FILMON_LICENSE_FILES = debian/copyright From ac53acc640ecd4777e94e3add1b1d5120fd2a335 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 20 May 2020 19:18:28 +0200 Subject: [PATCH 59/90] package/kodi-pvr-mythtv: bump version to 5.10.16-Leia Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index c70e032289..4faeb1f04d 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 36d9142e0e19b904e1c4a6d8cd67063d291e63971f80a98a6f24b7f4554bb2e3 kodi-pvr-mythtv-5.10.15-Leia.tar.gz +sha256 fef27e73009f095a22e4843e48455a343a4fe095ae9692b9fa96ffac7fb0844c kodi-pvr-mythtv-5.10.16-Leia.tar.gz sha256 0efb11009d447b39ec35d77dc265db3d1c3d261730bbc33b267587254d973ec8 debian/copyright diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index b89db3a455..ca1d533a57 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 5.10.15-Leia +KODI_PVR_MYTHTV_VERSION = 5.10.16-Leia KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = debian/copyright From 64f04c35f335c9b5d8cbdd9c53b3e4b75dd7a2e0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 20 May 2020 19:19:42 +0200 Subject: [PATCH 60/90] package/kodi-pvr-pctv: bump version to 2.4.7-Leia Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-pctv/kodi-pvr-pctv.hash | 2 +- package/kodi-pvr-pctv/kodi-pvr-pctv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash index f1bb8a4804..206c4f3dea 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.hash +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a9f1c5596786cf4cfa279d0b4477839ef7f5bb7267c65152dbcf7ae0bda56679 kodi-pvr-pctv-2.4.5-Leia.tar.gz +sha256 10124e5444c6cfb0c77bad1d1122f6ba5fc233248d6b33066ba799f4dedceeee kodi-pvr-pctv-2.4.7-Leia.tar.gz sha256 43376e70ae80133530c8ce71a3b0dcde8529a8162d3b3956009eb8fc0f5c559c debian/copyright diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk index 45c916df49..851788c96b 100644 --- a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk +++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_PCTV_VERSION = 2.4.5-Leia +KODI_PVR_PCTV_VERSION = 2.4.7-Leia KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION)) KODI_PVR_PCTV_LICENSE = GPL-2.0+ KODI_PVR_PCTV_LICENSE_FILES = debian/copyright From 6480cf63dcab7537f5f25c86f3722542b2b5ee45 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 20 May 2020 19:20:12 +0200 Subject: [PATCH 61/90] package/kodi-pvr-wmc: bump version to 2.4.6-Leia Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-wmc/kodi-pvr-wmc.hash | 2 +- package/kodi-pvr-wmc/kodi-pvr-wmc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash index e72e8d20a9..21e7414d0e 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.hash +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4cb81f29cba23172d042e50bbab00cd64cd5670ad7350fd9d25301f63178e5f7 kodi-pvr-wmc-2.4.5-Leia.tar.gz +sha256 7fb150ba3b8b41cf164425b56ae5dda3a5fb2f64cdea7229900113965d492fee kodi-pvr-wmc-2.4.6-Leia.tar.gz sha256 6d97c3d608a5d59565b567313bd3e53a1d0066ed59f4ae8e474c895d0c20e746 debian/copyright diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk index d669768e7e..c280f89df4 100644 --- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WMC_VERSION = 2.4.5-Leia +KODI_PVR_WMC_VERSION = 2.4.6-Leia KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION)) KODI_PVR_WMC_LICENSE = GPL-2.0+ KODI_PVR_WMC_LICENSE_FILES = debian/copyright From 850d9cbafca35530b479458aa48bb750e4d3c8df Mon Sep 17 00:00:00 2001 From: Jared Bents Date: Wed, 20 May 2020 17:28:50 -0500 Subject: [PATCH 62/90] package/xerces: add enable network option Update to add the option to compile xerces with network enabled by default so it can be unselected to compile without network support. When network support is enabled the Network Accessor feature will decode schema urls and if they don't appear as localhost or local files, it will open a stream (socket) session with the remote server. In an embedded setting having the option to disable this allows: * cleaner audit logging * smaller security attack surface * less library dependencies * no behind the scenes failed session attempts Signed-off-by: Jared Bents Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- package/xerces/Config.in | 10 ++++++++++ package/xerces/xerces.mk | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/package/xerces/Config.in b/package/xerces/Config.in index 2edc4346b5..a9b102bd5e 100644 --- a/package/xerces/Config.in +++ b/package/xerces/Config.in @@ -6,5 +6,15 @@ config BR2_PACKAGE_XERCES http://xerces.apache.org/xerces-c/ +if BR2_PACKAGE_XERCES + +config BR2_PACKAGE_XERCES_ENABLE_NETWORK + bool "Enable network support" + default y + help + Enable network support in xerces + +endif + comment "xerces-c++ needs a toolchain w/ C++, wchar" depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR) diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index c75a8b0d35..ae42b1e62f 100644 --- a/package/xerces/xerces.mk +++ b/package/xerces/xerces.mk @@ -31,12 +31,16 @@ XERCES_CONF_ENV += LIBS=-liconv XERCES_DEPENDENCIES += libiconv endif +ifeq ($(BR2_PACKAGE_XERCES_ENABLE_NETWORK),y) ifeq ($(BR2_PACKAGE_LIBCURL),y) XERCES_CONF_OPTS += -Dnetwork-accessor=curl XERCES_DEPENDENCIES += libcurl else XERCES_CONF_OPTS += -Dnetwork-accessor=socket endif +else +XERCES_CONF_OPTS += -Dnetwork=OFF +endif ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) XERCES_CONF_OPTS += -Dthreads=ON From 4e60247be67a8e7f9937a8bf2b123ddb2be9dad2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 21 May 2020 15:42:59 +0200 Subject: [PATCH 63/90] package/xerces: fix coding style in Config.in We generally use on "depends on" for each toolchain option, so let's do this as well in package/xerces/Config.in. Signed-off-by: Thomas Petazzoni --- package/xerces/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/xerces/Config.in b/package/xerces/Config.in index a9b102bd5e..d3f4967413 100644 --- a/package/xerces/Config.in +++ b/package/xerces/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_XERCES bool "xerces-c++" - depends on BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR + depends on BR2_INSTALL_LIBSTDCPP + depends on USE_WCHAR help Xerces-C++ is a validating XML parser written in portable C++. From af325be5db1144b6f0ffd8d87df85fe96e03b7e4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 21 May 2020 19:18:29 +0200 Subject: [PATCH 64/90] package/kodi: bump version to 18.7-Leia Release notes: http://www.kodi.tv/article/kodi-leia-187-release Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 934392e916..f1889f3195 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 18.6-Leia +KODI_JSONSCHEMABUILDER_VERSION = 18.7-Leia KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index dc5984cedc..ec8ffeae43 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 18.6-Leia +KODI_TEXTUREPACKER_VERSION = 18.7-Leia KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 357cd55c7b..be2659d385 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 47e6d7d4e01dbda92ff83a3e141ac43003e918133e78b3a4b79faff65184711c kodi-18.6-Leia.tar.gz +sha256 f6bb2ad9d8ca27d1b6bf68690d699f5e2bf3d0c7e5700d8e564b7583054c434e kodi-18.7-Leia.tar.gz sha256 e11e7594af35f36ab2711252c3d6bb106908f26605498aef4a9be2d7bc001db2 kodi-ffmpeg-4.0.4-Leia-18.4.tar.gz sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 0c4704ea84..180e3b9d10 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION = 18.6-Leia +KODI_VERSION = 18.7-Leia KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) KODI_LICENSE = GPL-2.0 KODI_LICENSE_FILES = LICENSE.md From 626be1a4184953b5e5862b4e7d218609e1566398 Mon Sep 17 00:00:00 2001 From: Yair Ben-Avraham Date: Tue, 19 May 2020 08:26:30 +0000 Subject: [PATCH 65/90] package/gloox: new package gloox is a rock-solid, full-featured Jabber/XMPP client library, written in clean ANSI C++. It makes writing spec-compliant clients easy and allows for hassle-free integration of Jabber/XMPP functionality into existing applications. gloox is released under the GNU GPLv3. Commercial licensing and support are available. Signed-off-by: Yair Ben Avraham Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/gloox/Config.in | 16 ++++++++++++++ package/gloox/gloox.hash | 3 +++ package/gloox/gloox.mk | 45 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 68 insertions(+) create mode 100644 package/gloox/Config.in create mode 100644 package/gloox/gloox.hash create mode 100644 package/gloox/gloox.mk diff --git a/DEVELOPERS b/DEVELOPERS index e427ab15d4..1320944186 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2633,6 +2633,9 @@ F: package/python-pyusb/ N: Wojciech Niziński F: package/fwup/ +N: Yair Ben Avraham +F: package/gloox/ + N: Yann E. MORIN F: board/friendlyarm/nanopi-neo/ F: configs/nanopi_neo_defconfig diff --git a/package/Config.in b/package/Config.in index c12676d859..e81f2f6bdb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2040,6 +2040,7 @@ menu "Networking applications" source "package/freeswitch-mod-bcg729/Config.in" source "package/gerbera/Config.in" source "package/gesftpserver/Config.in" + source "package/gloox/Config.in" source "package/glorytun/Config.in" source "package/gupnp-tools/Config.in" source "package/gutenprint/Config.in" diff --git a/package/gloox/Config.in b/package/gloox/Config.in new file mode 100644 index 0000000000..91e9f06e34 --- /dev/null +++ b/package/gloox/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_GLOOX + bool "gloox" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_MPC + help + gloox is a portable high-level Jabber/XMPP library for C++. It + is fully compliant with the XMPP RFCs, supports all of the + XMPP features (including SRV lookups, TLS, SASL, roster + management, and privacy lists), and implements several XEPs + that make it ideal for writing any kind of Jabber/XMPP client + or component. + + https://camaya.net/gloox/ + +comment "gloox needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/gloox/gloox.hash b/package/gloox/gloox.hash new file mode 100644 index 0000000000..ee42c079b2 --- /dev/null +++ b/package/gloox/gloox.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 97cb6a0c07e320ffa4a7c66e8ab06b2361086271dc87ed2398befef4e8435f8a gloox-1.0.23.tar.bz2 +sha256 40a20c41c8dabb8ba61bea983fa8f2f6989e67fac56bb62c2249053807fd26af LICENSE diff --git a/package/gloox/gloox.mk b/package/gloox/gloox.mk new file mode 100644 index 0000000000..46fe4d6a15 --- /dev/null +++ b/package/gloox/gloox.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# gloox +# +################################################################################ + +GLOOX_VERSION = 1.0.23 +GLOOX_SOURCE = gloox-$(GLOOX_VERSION).tar.bz2 +GLOOX_SITE = https://camaya.net/download +GLOOX_LICENSE = GPL-3.0 with OpenSSL exception +GLOOX_LICENSE_FILES = LICENSE +GLOOX_INSTALL_STAGING = YES +GLOOX_DEPENDENCIES = mpc +GLOOX_CONF_OPTS = \ + --without-libidn \ + --enable-getaddrinfo + +GLOOX_CXXFLAGS = $(TARGET_CXXFLAGS) +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +GLOOX_CXXFLAGS += -O0 +endif +GLOOX_CONF_ENV += CXXFLAGS="$(GLOOX_CXXFLAGS)" + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +GLOOX_CONF_ENV += LIBS=-latomic +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +GLOOX_CONF_OPTS += --with-zlib +GLOOX_DEPENDENCIES += zlib +else +GLOOX_CONF_OPTS += --without-zlib +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +GLOOX_CONF_OPTS += --with-openssl --without-gnutls +GLOOX_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_GNUTLS),y) +GLOOX_CONF_OPTS += --with-gnutls --without-openssl +GLOOX_DEPENDENCIES += gnutls +else +GLOOX_CONF_OPTS += --without-gnutls --without-openssl +endif + +$(eval $(autotools-package)) From 84e8f3aa901b482c4a5bda8a11fa0fadb44b5b39 Mon Sep 17 00:00:00 2001 From: "Guillaume W. Bres" Date: Thu, 28 May 2020 12:27:54 +0200 Subject: [PATCH 66/90] package/reaver: bump to v1.6.6 Signed-off-by: Guillaume W. Bres Signed-off-by: Thomas Petazzoni --- package/reaver/0001-fix-271.patch | 32 ------------------------------- package/reaver/Config.in | 4 ++++ package/reaver/reaver.hash | 4 ++-- package/reaver/reaver.mk | 2 +- 4 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 package/reaver/0001-fix-271.patch diff --git a/package/reaver/0001-fix-271.patch b/package/reaver/0001-fix-271.patch deleted file mode 100644 index 9f6b395120..0000000000 --- a/package/reaver/0001-fix-271.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c7040da3a9ff98cd8063b9d5b5a7721374186391 Mon Sep 17 00:00:00 2001 -From: rofl0r -Date: Fri, 22 Feb 2019 17:38:24 +0000 -Subject: [PATCH] fix #271 - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/t6x/reaver-wps-fork-t6x/commit/c7040da3a9ff98cd8063b9d5b5a7721374186391] ---- - src/wps/wps_attr_parse.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/wps/wps_attr_parse.c b/src/wps/wps_attr_parse.c -index 30b0e79..d681b70 100644 ---- a/src/wps/wps_attr_parse.c -+++ b/src/wps/wps_attr_parse.c -@@ -443,12 +443,12 @@ int wps_parse_msg(const struct wpabuf *msg, struct wps_parse_attr *attr) - * Mac OS X 10.6 seems to be adding 0x00 padding to the - * end of M1. Skip those to avoid interop issues. - */ -- int i; -- for (i = 0; i < end - pos; i++) { -+ uintptr_t i, left = end - pos; -+ for (i = 0; i < left; i++) { - if (pos[i]) - break; - } -- if (i == end - pos) { -+ if (i == left) { - wpa_printf(MSG_DEBUG, "WPS: Workaround - skip " - "unexpected message padding"); - break; diff --git a/package/reaver/Config.in b/package/reaver/Config.in index 0fd8ab7c6e..c286fa8d34 100644 --- a/package/reaver/Config.in +++ b/package/reaver/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_REAVER bool "reaver" + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBPCAP help Reaver is a tool to audit networks against brute WPS pins @@ -7,3 +8,6 @@ config BR2_PACKAGE_REAVER https://code.google.com/archive/p/reaver-wps/wikis/README.wiki https://github.com/t6x/reaver-wps-fork-t6x + +comment "reaver needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/reaver/reaver.hash b/package/reaver/reaver.hash index fad81fe326..780e6ac86d 100644 --- a/package/reaver/reaver.hash +++ b/package/reaver/reaver.hash @@ -1,3 +1,3 @@ # locally computed -sha256 e6761d2d4ef9cb2b45fe0a60d6b94048ce4442e4ac209904fe89506ff1e94c44 reaver-1.6.5.tar.gz -sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE +sha256 73189782b208d12b8dddc4f29d32e1f72b1f3609e573c9ea9510deebec394583 reaver-1.6.6.tar.gz +sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE diff --git a/package/reaver/reaver.mk b/package/reaver/reaver.mk index 093ac935af..2b5f82960b 100644 --- a/package/reaver/reaver.mk +++ b/package/reaver/reaver.mk @@ -6,7 +6,7 @@ # Older repos for this project will not cross-compile easily # while this one works right away -REAVER_VERSION = 1.6.5 +REAVER_VERSION = 1.6.6 REAVER_SITE = $(call github,t6x,reaver-wps-fork-t6x,v$(REAVER_VERSION)) REAVER_LICENSE = GPL-2.0+ REAVER_LICENSE_FILES = docs/LICENSE From f379e75dcd808a06e5d6494de6243f56fdda4477 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Thu, 28 May 2020 12:00:56 +0200 Subject: [PATCH 67/90] boot/at91bootstrap3: bump to version 3.9.2 Signed-off-by: Pierre-Jean Texier Signed-off-by: Thomas Petazzoni --- boot/at91bootstrap3/Config.in | 4 ++-- boot/at91bootstrap3/at91bootstrap3.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in index faab7635da..ccbb531833 100644 --- a/boot/at91bootstrap3/Config.in +++ b/boot/at91bootstrap3/Config.in @@ -19,7 +19,7 @@ choice prompt "AT91 Bootstrap 3 version" config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION - bool "3.9.0" + bool "3.9.2" config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT bool "Custom Git repository" @@ -51,7 +51,7 @@ endif config BR2_TARGET_AT91BOOTSTRAP3_VERSION string - default "v3.9.0" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION + default "v3.9.2" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \ if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT default "custom" if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL diff --git a/boot/at91bootstrap3/at91bootstrap3.hash b/boot/at91bootstrap3/at91bootstrap3.hash index 9f6c95ab08..5741b829f5 100644 --- a/boot/at91bootstrap3/at91bootstrap3.hash +++ b/boot/at91bootstrap3/at91bootstrap3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e23e6df23b79ca81e412cb73a1f48bd95df8d46c7d52a1d073c2ed9d4f3a1a71 at91bootstrap3-v3.9.0.tar.gz +sha256 6cf37df482024f3770fe1880f768a675beda16323a90e702860d9e5478105b3f at91bootstrap3-v3.9.2.tar.gz sha256 732b2a55b5905031d8ae420136ffb5f8889214865784386bf754cffab8d2bc6e main.c From f7286012e5d0ddf5b05df49b79938029f74aba6b Mon Sep 17 00:00:00 2001 From: Joris Offouga Date: Fri, 29 May 2020 15:49:28 +0200 Subject: [PATCH 68/90] configs/imx7dpico: bump kernel and U-Boot version Bump U-Boot to 2020.04 and kernel to version 5.6.3 Signed-off-by: Joris Offouga Signed-off-by: Thomas Petazzoni --- configs/imx7dpico_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/imx7dpico_defconfig b/configs/imx7dpico_defconfig index 190e77fbfe..b4a539b8e1 100644 --- a/configs/imx7dpico_defconfig +++ b/configs/imx7dpico_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +# Linux headers same as kernel, a 5.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4" @@ -12,7 +12,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6.3" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico-pi" @@ -25,7 +25,7 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_TARGET_UBOOT_BOARDNAME="pico-pi-imx7d" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y # wifi firmware for brcm43439 From b40393a8a0a465eca682fb7fb7eebe414f7d5157 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 29 May 2020 08:29:59 +0200 Subject: [PATCH 69/90] package/libdrm: bump version to 2.4.102 Removed patch applied upstream, reformatted hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0003-tests-amdgpu-needs-atomic_ops.patch | 27 ------------------- package/libdrm/libdrm.hash | 6 ++--- package/libdrm/libdrm.mk | 2 +- 3 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 package/libdrm/0003-tests-amdgpu-needs-atomic_ops.patch diff --git a/package/libdrm/0003-tests-amdgpu-needs-atomic_ops.patch b/package/libdrm/0003-tests-amdgpu-needs-atomic_ops.patch deleted file mode 100644 index 9c06675daf..0000000000 --- a/package/libdrm/0003-tests-amdgpu-needs-atomic_ops.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f0adb08424e624aeee340291343281256b7a98e8 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sat, 7 Mar 2020 12:23:09 +0100 -Subject: [PATCH] tests/amdgpu: needs atomic_ops - -[Upstream: https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/50] -Signed-off-by: Peter Seiderer ---- - tests/amdgpu/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/amdgpu/meson.build b/tests/amdgpu/meson.build -index 1726cb43..4dfa5c83 100644 ---- a/tests/amdgpu/meson.build -+++ b/tests/amdgpu/meson.build -@@ -26,7 +26,7 @@ if dep_cunit.found() - 'vce_tests.c', 'uvd_enc_tests.c', 'vcn_tests.c', 'deadlock_tests.c', - 'vm_tests.c', 'ras_tests.c', 'syncobj_tests.c', - ), -- dependencies : [dep_cunit, dep_threads], -+ dependencies : [dep_cunit, dep_threads, dep_atomic_ops], - include_directories : [inc_root, inc_drm, include_directories('../../amdgpu')], - link_with : [libdrm, libdrm_amdgpu], - install : with_install_tests, --- -2.25.1 - diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index 4c9c4c4fed..72330165d8 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,3 +1,3 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2020-April/261067.html -sha256 ddf31baa8e49473624860bd166ce654dc349873f7a6c7b3305964249315c78a7 libdrm-2.4.101.tar.xz -sha512 658cfc6f478b674b77b4613e1af9ce8f4fd2ace8a18e75729de254d14b7c1f5d67d4bfdb58744aea74abca0f6521326225f4156bd5cbeeed79ca3e025f657e8c libdrm-2.4.101.tar.xz +# From https://lists.freedesktop.org/archives/dri-devel/2020-May/267255.html +sha256 8bcbf9336c28e393d76c1f16d7e79e394a7fce8a2e929d52d3ad7ad8525ba05b libdrm-2.4.102.tar.xz +sha512 386afd228efd809fe32776a6ff5d9dd95d1409a6a6a89b3806a3b42ed27e84f1e090f3b7834973f834d6b0d1342b7034447fe8690d072f85f03292d7795c3e0c libdrm-2.4.102.tar.xz diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 4217fcc84c..9348b83295 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.101 +LIBDRM_VERSION = 2.4.102 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT From 08c8281290844b38d640e11d32990b39533d6227 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 May 2020 18:25:29 +0200 Subject: [PATCH 70/90] package/{mesa3d, mesa3d-headers}: bump version to 20.0.7 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index c1686aa6fd..51b10acdb5 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 = 20.0.6 +MESA3D_HEADERS_VERSION = 20.0.7 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 dec022c1e9..0a6d0c5a82 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2020-April/000579.html -sha256 30b5d8e9201a01a0e88e18bb79850e67b1d28443b34c4c5cacad4bd10f668b96 mesa-20.0.6.tar.xz -sha512 a93dc3ed57ed7469b7c60cdbdcf4f29c5da4ec3986171c7b534e009e136ca21fec16207ffab38a6747437a9b1060e2e6c4b74c4e5cdc168b9aba0fc1940b5e90 mesa-20.0.6.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2020-May/000583.html +sha256 fe6e258fe772c3cd2ac01741bf7408058c3ac02d66acff9a6e669bd72e3ea178 mesa-20.0.7.tar.xz +sha512 00baae50f14bf2b08b5654dffb11cf67499dc1825e1700b137fb5719e767e0e78e789979df2c194f677ea9c5e531f34965d47b9e37c239944c38d0570c7a9685 mesa-20.0.7.tar.xz # License sha256 1ddae7da415352a5b5360ff3a9d7ecf23ba81408f62eeecce0011f32e3ef9da6 docs/license.html diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 531dcf5b81..5304b05de0 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 = 20.0.6 +MESA3D_VERSION = 20.0.7 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos From 9ca15896b742d711d61c92c6406541222468bc4e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 29 May 2020 08:24:35 +0200 Subject: [PATCH 71/90] package/{mesa3d, mesa3d-headers}: bump version to 20.1.0 Rebased 0006-pan_bo.h-add-time.h-include-for-time_t.patch. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- ...-pan_bo.h-add-time.h-include-for-time_t.patch | 16 +++++++++------- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 51b10acdb5..008c2c3cf4 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 = 20.0.7 +MESA3D_HEADERS_VERSION = 20.1.0 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/0006-pan_bo.h-add-time.h-include-for-time_t.patch b/package/mesa3d/0006-pan_bo.h-add-time.h-include-for-time_t.patch index 1586b26bba..f90fb85aca 100644 --- a/package/mesa3d/0006-pan_bo.h-add-time.h-include-for-time_t.patch +++ b/package/mesa3d/0006-pan_bo.h-add-time.h-include-for-time_t.patch @@ -8,24 +8,26 @@ Content-Transfer-Encoding: 8bit Fixes: - ../src/gallium/drivers/panfrost/pan_bo.h:93:9: error: unknown type name ‘time_t’ + ../src/panfrost/encoder/pan_bo.h:93:9: error: unknown type name ‘time_t’ Signed-off-by: Peter Seiderer +[Bernd: rebased on 20.1] +Signed-off-by: Bernd Kuhls --- - src/gallium/drivers/panfrost/pan_bo.h | 1 + + src/panfrost/encoder/pan_bo.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/src/gallium/drivers/panfrost/pan_bo.h b/src/gallium/drivers/panfrost/pan_bo.h +diff --git a/src/panfrost/encoder/pan_bo.h b/src/panfrost/encoder/pan_bo.h index 414c356b95c..6dda393095d 100644 ---- a/src/gallium/drivers/panfrost/pan_bo.h -+++ b/src/gallium/drivers/panfrost/pan_bo.h +--- a/src/panfrost/encoder/pan_bo.h ++++ b/src/panfrost/encoder/pan_bo.h @@ -29,6 +29,7 @@ #include - #include "pipe/p_state.h" #include "util/list.h" + #include "pan_device.h" +#include - struct panfrost_screen; + /* Flags for allocated memory */ -- 2.25.1 diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 0a6d0c5a82..c8eda7b2ba 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2020-May/000583.html -sha256 fe6e258fe772c3cd2ac01741bf7408058c3ac02d66acff9a6e669bd72e3ea178 mesa-20.0.7.tar.xz -sha512 00baae50f14bf2b08b5654dffb11cf67499dc1825e1700b137fb5719e767e0e78e789979df2c194f677ea9c5e531f34965d47b9e37c239944c38d0570c7a9685 mesa-20.0.7.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2020-May/000585.html +sha256 2109055d7660514fc4c1bcd861bcba9db00c026119ae222720111732dba27c83 mesa-20.1.0.tar.xz +sha512 f49230d18febe1bfd7c6282ab95fc244530f5cef56df0f804d8bece8a70bafcb445b8b83df96ad1b4c5af022c4e39a71f19a8f7e47b1fb09ada2b1a1317ff3be mesa-20.1.0.tar.xz # License sha256 1ddae7da415352a5b5360ff3a9d7ecf23ba81408f62eeecce0011f32e3ef9da6 docs/license.html diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5304b05de0..abab93bd20 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 = 20.0.7 +MESA3D_VERSION = 20.1.0 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos From b4cda668d8a1cf1085581e16b1a6c2622ebb5578 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 29 May 2020 19:58:56 +0200 Subject: [PATCH 72/90] package/hiawatha: enable optional xslt support Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/hiawatha/hiawatha.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index eefd0f6f89..28fd286ea8 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -17,9 +17,15 @@ else HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF endif +ifeq ($(BR2_PACKAGE_LIBXSLT),y) +HIAWATHA_CONF_OPTS += -DENABLE_XSLT=ON +HIAWATHA_DEPENDENCIES += libxslt +else +HIAWATHA_CONF_OPTS += -DENABLE_XSLT=OFF +endif + HIAWATHA_CONF_OPTS += \ -DENABLE_TOOLKIT=OFF \ - -DENABLE_XSLT=OFF \ -DCONFIG_DIR=/etc/hiawatha \ -DLOG_DIR=/var/log \ -DPID_DIR=/var/run \ From b35df346a61c1b4d8835679dc5416734dfc07419 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 29 May 2020 22:49:15 +0200 Subject: [PATCH 73/90] package/hiawatha: reorder CONF_OPTS in the .mk file Move the unconditional CONF_OPTS assignment toward the beginning of the file, before the conditionals on optional dependencies. And use = for this unconditional assignment instead of +=. No functional changes, just to align with the coding style used in most other packages. Signed-off-by: Thomas Petazzoni --- package/hiawatha/hiawatha.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 28fd286ea8..01b9292035 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -10,6 +10,14 @@ HIAWATHA_DEPENDENCIES = zlib HIAWATHA_LICENSE = GPL-2.0 HIAWATHA_LICENSE_FILES = LICENSE +HIAWATHA_CONF_OPTS = \ + -DENABLE_TOOLKIT=OFF \ + -DCONFIG_DIR=/etc/hiawatha \ + -DLOG_DIR=/var/log \ + -DPID_DIR=/var/run \ + -DWEBROOT_DIR=/var/www/hiawatha \ + -DWORK_DIR=/var/lib/hiawatha + ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) HIAWATHA_CONF_OPTS += -DUSE_SYSTEM_MBEDTLS=ON HIAWATHA_DEPENDENCIES += mbedtls @@ -24,12 +32,4 @@ else HIAWATHA_CONF_OPTS += -DENABLE_XSLT=OFF endif -HIAWATHA_CONF_OPTS += \ - -DENABLE_TOOLKIT=OFF \ - -DCONFIG_DIR=/etc/hiawatha \ - -DLOG_DIR=/var/log \ - -DPID_DIR=/var/run \ - -DWEBROOT_DIR=/var/www/hiawatha \ - -DWORK_DIR=/var/lib/hiawatha - $(eval $(cmake-package)) From 61b606541a392a02bfb42e4ced152ca08cfc53a0 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Thu, 28 May 2020 12:00:57 +0200 Subject: [PATCH 74/90] configs/atmel_sama5d27_som1: bump to linux4sam-2020.04 This commit: - bump Linux & U-Boot to linux4sam-2020.04 - bump at91bootstrap to v3.9.2 Signed-off-by: Pierre-Jean Texier Signed-off-by: Thomas Petazzoni --- configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig index 6b5def3c64..b608bac0c6 100644 --- a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +++ b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a5=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d27_som1_ek_mmc/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam_6.2)/linux-linux4sam_6.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,linux-at91,linux4sam-2020.04)/linux-at91-linux4sam-2020.04.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d27_som1_ek" @@ -71,12 +71,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_AT91BOOTSTRAP3=y BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL=y -BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.0)/at91bootstrap3-v3.9.0.tar.gz" +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,at91bootstrap,v3.9.2)/at91bootstrap3-v3.9.2.tar.gz" BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_som1_eksd_uboot" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam_6.2)/u-boot-at91-linux4sam_6.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,linux4sam,u-boot-at91,linux4sam-2020.04)/u-boot-at91-linux4sam-2020.04.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d27_som1_ek_mmc" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y From 9789f56ee3221c181b10abccd23e74969783b479 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Thu, 28 May 2020 11:48:53 +0200 Subject: [PATCH 75/90] package/python-modbus-tk: bump to version 1.1.1 This includes the following changes: 5732f86 1.1.1 d8e9b32 pep8 4795bc7 Add Jackson Matheson to contributors 26db934 Merge branch 'master' of https://github.com/ljean/modbus-tk 837a12b Merge pull request #125 from jacksonmatheson/master 07b06f8 Fixed READ_WRITE_MULTIPLE_REGISTERS, added write_starting_address_FC23 Also update hash file formatting (2 spaces). Signed-off-by: Pierre-Jean Texier Signed-off-by: Thomas Petazzoni --- package/python-modbus-tk/python-modbus-tk.hash | 8 ++++---- package/python-modbus-tk/python-modbus-tk.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-modbus-tk/python-modbus-tk.hash b/package/python-modbus-tk/python-modbus-tk.hash index fc9899366b..c4fde683c3 100644 --- a/package/python-modbus-tk/python-modbus-tk.hash +++ b/package/python-modbus-tk/python-modbus-tk.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/modbus-tk/json -md5 65e0a1b12bd6650bdc4f7d823669ab6f modbus_tk-1.1.0.tar.gz -sha256 8e31db8f148871006b569931c31ef17692363acf90a0d0bafd2d868f51b70772 modbus_tk-1.1.0.tar.gz +md5 e52d5de22cc9d97f2c1086d9b11f0f1e modbus_tk-1.1.1.tar.gz +sha256 c6dd004bc6bbff6d9fa93e61654c30a26c817c6632036c656383c9ecadca6639 modbus_tk-1.1.1.tar.gz # Locally computed sha256 checksums -sha256 3b6a7f9c478ac1982e86cdadb45eb4788241b95839500eb26839d5053b74a24a license.txt -sha256 aa7ca42152a13db6a27b31944f99851efc3b9ee813912ff21d7d6ceadca62e6f copying.txt +sha256 3b6a7f9c478ac1982e86cdadb45eb4788241b95839500eb26839d5053b74a24a license.txt +sha256 aa7ca42152a13db6a27b31944f99851efc3b9ee813912ff21d7d6ceadca62e6f copying.txt diff --git a/package/python-modbus-tk/python-modbus-tk.mk b/package/python-modbus-tk/python-modbus-tk.mk index a2a0cd0e6c..37927575ae 100644 --- a/package/python-modbus-tk/python-modbus-tk.mk +++ b/package/python-modbus-tk/python-modbus-tk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MODBUS_TK_VERSION = 1.1.0 +PYTHON_MODBUS_TK_VERSION = 1.1.1 PYTHON_MODBUS_TK_SOURCE = modbus_tk-$(PYTHON_MODBUS_TK_VERSION).tar.gz -PYTHON_MODBUS_TK_SITE = https://files.pythonhosted.org/packages/49/aa/97e40e2da1b9904a78466b4d759091ef015f6946a423f1675bfcab7950c8 +PYTHON_MODBUS_TK_SITE = https://files.pythonhosted.org/packages/63/2e/991c8965fd45db4c38fefe1fa70356825e847e1bbb1f14e127aa2b4d37aa PYTHON_MODBUS_TK_SETUP_TYPE = setuptools PYTHON_MODBUS_TK_LICENSE = LGPL-2.1+ PYTHON_MODBUS_TK_LICENSE_FILES = license.txt copying.txt From 02703108eca8353ff45c0842d9b882a0dc37c04b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 26 May 2020 20:20:37 +0200 Subject: [PATCH 76/90] package/rust: allow using python3 interpreter Fedora packaging use python3 as python interpreter since rust 1.24.0 [1] by removing python2 tests from configure script [2]. Using python3 will help to remove python2 in a near future. [1] https://src.fedoraproject.org/rpms/rust/c/216b2d27716bf1031c526dbd0e01a1fa8e6d5aa2 [2] https://src.fedoraproject.org/rpms/rust/blob/216b2d27716bf1031c526dbd0e01a1fa8e6d5aa2/f/rust.spec#_314 Signed-off-by: Romain Naour Cc: Titouan Christophe Cc: Arnout Vandecappelle Cc: Patrick Havelange Tested-by: Titouan Christophe Signed-off-by: Thomas Petazzoni --- ...igure-use-default-python-interpreter.patch | 37 +++++++++++++++++++ package/rust/rust.mk | 17 ++++++--- 2 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 package/rust/0002-configure-use-default-python-interpreter.patch diff --git a/package/rust/0002-configure-use-default-python-interpreter.patch b/package/rust/0002-configure-use-default-python-interpreter.patch new file mode 100644 index 0000000000..0ae9fab786 --- /dev/null +++ b/package/rust/0002-configure-use-default-python-interpreter.patch @@ -0,0 +1,37 @@ +From aca7abb537f5caf1c9f027cf65dd0f53fb664e73 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 26 May 2020 18:24:25 +0200 +Subject: [PATCH] configure: use default python interpreter + +Don't try to use python2 if available, use the python interpreter available +in ouput/host/bin/python whatever the python version is. + +Signed-off-by: Romain Naour +--- + configure | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/configure b/configure +index eeb8d081d34..6014a982f47 100755 +--- a/configure ++++ b/configure +@@ -2,16 +2,4 @@ + + script="$(dirname $0)"/src/bootstrap/configure.py + +-try() { +- cmd=$1 +- shift +- T=$($cmd --version 2>/dev/null) +- if [ $? -eq 0 ]; then +- exec $cmd "$script" "$@" +- fi +-} +- +-try python2.7 "$@" +-try python27 "$@" +-try python2 "$@" + exec python $script "$@" +-- +2.25.4 + diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 5d14fc6682..25153966f2 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -17,9 +17,16 @@ HOST_RUST_DEPENDENCIES = \ host-rust-bin \ host-cargo-bin \ host-openssl \ - host-python \ $(BR2_CMAKE_HOST_DEPENDENCY) +ifeq ($(BR2_PACKAGE_PYTHON3),y) +HOST_RUST_PYTHON_VERSION = $(PYTHON3_VERSION_MAJOR) +HOST_RUST_DEPENDENCIES += host-python3 +else +HOST_RUST_PYTHON_VERSION = $(PYTHON_VERSION_MAJOR) +HOST_RUST_DEPENDENCIES += host-python +endif + HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0) # Some vendor crates contain Cargo.toml.orig files. The associated @@ -44,7 +51,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'target = ["$(RUSTC_TARGET_NAME)"]'; \ echo 'cargo = "$(HOST_CARGO_BIN_DIR)/cargo/bin/cargo"'; \ echo 'rustc = "$(HOST_RUST_BIN_DIR)/rustc/bin/rustc"'; \ - echo 'python = "$(HOST_DIR)/bin/python2"'; \ + echo 'python = "$(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION)"'; \ echo 'submodules = false'; \ echo 'vendor = true'; \ echo 'compiler-docs = false'; \ @@ -61,12 +68,12 @@ define HOST_RUST_CONFIGURE_CMDS endef define HOST_RUST_BUILD_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py build + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py build endef define HOST_RUST_INSTALL_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py dist - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py install + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py dist + cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(HOST_RUST_PYTHON_VERSION) x.py install endef $(eval $(host-generic-package)) From 2ed441f95c8f6b3db48cc214f57d3bf35bfd5419 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 26 May 2020 14:25:41 -0300 Subject: [PATCH 77/90] configs/imx28evk: bump U-Boot and kernel versions Bump U-Boot to 2020.04 and kernel to 5.4.42 versions. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/freescale_imx28evk_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/freescale_imx28evk_defconfig b/configs/freescale_imx28evk_defconfig index 520c63f673..bd5b007ed1 100644 --- a/configs/freescale_imx28evk_defconfig +++ b/configs/freescale_imx28evk_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_arm926t=y -# Linux headers same as kernel, a 5.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -11,7 +11,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.42" BR2_LINUX_KERNEL_DEFCONFIG="mxs" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk" @@ -20,7 +20,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx28evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" BR2_TARGET_UBOOT_FORMAT_SD=y # Filesystem From b5a1306e1afdba7e79c5e74303ce37e00655aa35 Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Mon, 25 May 2020 23:15:23 +0300 Subject: [PATCH 78/90] toolchain: update ARC tools to arc-2020.03-release This commit bumps ARC toolchain to arc-2020.03-release. ARC GNU tools of version arc-2020.03-release bring some quite significant changes like: * Binutils 2.34 with additional ARC patches * GCC 9.3 with additional ARC patches * glibc 2.30 with additional ARC patches * GDB 10-prerelease with additional ARC patches Signed-off-by: Evgeniy Didin Cc: Thomas Petazzoni Cc: arc-buildroot@synopsys.com Signed-off-by: Thomas Petazzoni --- package/binutils/Config.in.host | 2 +- .../0001-poison-system-directories.patch | 7 ++++--- package/binutils/binutils.hash | 2 +- package/binutils/binutils.mk | 4 ++-- package/gcc/Config.in.host | 2 +- .../0100-uclibc-conf.patch | 0 package/gcc/gcc.hash | 2 +- package/gdb/Config.in.host | 2 +- package/gdb/gdb.hash | 2 +- .../glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- 11 files changed, 14 insertions(+), 13 deletions(-) rename package/binutils/{arc-2019.09-release => arc-2020.03-release}/0001-poison-system-directories.patch (98%) rename package/gcc/{arc-2019.09-release => arc-2020.03-release}/0100-uclibc-conf.patch (100%) rename package/glibc/{arc-2019.09-release => arc-2020.03-release}/glibc.hash (75%) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 9beabe357c..378d16a931 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -40,7 +40,7 @@ endchoice config BR2_BINUTILS_VERSION string - default "arc-2019.09-release" if BR2_BINUTILS_VERSION_ARC + default "arc-2020.03-release" if BR2_BINUTILS_VERSION_ARC default "c66d8bbcebfddf713b2b436e1b135e6b125a55a5" if BR2_BINUTILS_VERSION_CSKY 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-2019.09-release/0001-poison-system-directories.patch b/package/binutils/arc-2020.03-release/0001-poison-system-directories.patch similarity index 98% rename from package/binutils/arc-2019.09-release/0001-poison-system-directories.patch rename to package/binutils/arc-2020.03-release/0001-poison-system-directories.patch index f6a78c7cdd..7a76ef2963 100644 --- a/package/binutils/arc-2019.09-release/0001-poison-system-directories.patch +++ b/package/binutils/arc-2020.03-release/0001-poison-system-directories.patch @@ -229,13 +229,14 @@ diff --git a/ld/ldlex.h b/ld/ldlex.h index 32a7a6409e8..c02b64bf92f 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h -@@ -150,6 +150,8 @@ enum option_values - OPTION_FORCE_GROUP_ALLOCATION, - OPTION_PRINT_MAP_DISCARDED, +@@ -152,6 +152,8 @@ enum option_values OPTION_NO_PRINT_MAP_DISCARDED, + OPTION_NON_CONTIGUOUS_REGIONS, + OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS, + OPTION_NO_POISON_SYSTEM_DIRECTORIES, + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, }; + /* The initial parser states. */ diff --git a/ld/ldmain.c b/ld/ldmain.c diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 797dd5b923..2e93dd0576 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -4,7 +4,7 @@ sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724a sha512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac binutils-2.33.1.tar.xz # Locally calculated (fetched from Github) -sha512 33ac5ad662db551870193f5c76c35a18de465adfa1c7f4bf5c1bb4145805a47507bf11ec21eb446b52f91f70cfe392252dd2b02724dc9dad3505258e3f6f4d45 binutils-gdb-arc-2019.09-release.tar.gz +sha512 99c87ea97b43719dd9ce8193d60a5a6f0abc0479e8ebabbd32876f54807cd02d1280c691ef19e12cb79946280d2a4c1562bbb1a175a31ff1533720a623c3059a binutils-gdb-arc-2020.03-release.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 876c9c59f8..0f6bc6de59 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -9,13 +9,13 @@ BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION)) ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) -BINUTILS_VERSION = arc-2019.09-release +BINUTILS_VERSION = arc-2020.03-release else BINUTILS_VERSION = 2.32 endif endif # BINUTILS_VERSION -ifeq ($(BINUTILS_VERSION),arc-2019.09-release) +ifeq ($(BINUTILS_VERSION),arc-2020.03-release) 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 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 034dfb5463..a41408b72b 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -75,7 +75,7 @@ config BR2_GCC_VERSION default "7.5.0" if BR2_GCC_VERSION_7_X default "8.4.0" if BR2_GCC_VERSION_8_X default "9.3.0" if BR2_GCC_VERSION_9_X - default "arc-2019.09-release" if BR2_GCC_VERSION_ARC + default "arc-2020.03-release" if BR2_GCC_VERSION_ARC default "48152afb96c59733d5bc79e3399bb7b3d4b44266" if BR2_GCC_VERSION_CSKY config BR2_EXTRA_GCC_CONFIG_OPTIONS diff --git a/package/gcc/arc-2019.09-release/0100-uclibc-conf.patch b/package/gcc/arc-2020.03-release/0100-uclibc-conf.patch similarity index 100% rename from package/gcc/arc-2019.09-release/0100-uclibc-conf.patch rename to package/gcc/arc-2020.03-release/0100-uclibc-conf.patch diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 321b3767ab..ef1290fc7c 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -6,7 +6,7 @@ sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b sha512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de gcc-9.3.0.tar.xz # Locally calculated (fetched from Github) -sha512 84648d13f174102733e06ccdf7b351150babe06af0f2b99b8dfb2b2d3c3f13e424547349939806fe19932ad347977cad79cd8b37be9cbb03e6a4d03cdf95a72e gcc-arc-2019.09-release.tar.gz +sha512 09ad77fce757d77f2db49cd049b78861abfa5c1c6c3be76228815ec2b15810c1985525c48b0300e83e88f3fa33dee0062f34790cc8b6bc2fa6b0301595acf42b gcc-arc-2020.03-release.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) diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index 8de7f8395b..c5776c20e6 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -85,7 +85,7 @@ endif # If cross-gdb is not enabled, the latest working version is chosen. config BR2_GDB_VERSION string - default "arc-2019.09-release-gdb" if BR2_arc + default "arc-2020.03-release-gdb" if BR2_arc default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky default "8.1.1" if BR2_GDB_VERSION_8_1 default "8.2.1" if BR2_GDB_VERSION_8_2 || !BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index 60b0954ff9..291c224b0f 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -4,7 +4,7 @@ sha512 2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5 sha512 9053a2dc6b9eb921907afbc4cecc75d635aa76df5e8c4f0e5824ccf57cb206b299c19b127fff000b65c334826ff8304a54ff6098428365a8e997cca886c39e9a gdb-8.3.1.tar.xz # Locally calculated (fetched from Github) -sha512 c33818f8679d99d5315220578864b04b87f69c46ebe62472809ee6e1d260e5ec84d598f38d80c127a2045d6624f28803c2720d89434204acbd94e988a45870f1 gdb-arc-2019.09-release-gdb.tar.gz +sha512 74346a2a2b2082d35377711946b12c824222005c66813d5648350b101697eac67d3d01617e1daea03e41c196c2b7b4a4b225d1ee58af91dc69731bffed0e5d51 gdb-arc-2020.03-release-gdb.tar.gz # Locally calculated (fetched from https://github.com/c-sky/binutils-gdb) sha512 c421e1f3c0d6cfb3c04544573c0c4b0075c8d8e3d563c6c234fcc1e4c2167ab203d1e57aec3b58abd348dc46f8cf9b47b753d3a43dba3ea970c9c9a6bd78c07b gdb-4ecb98fbc2f94dbe01b69384afbc515107de73df.tar.gz diff --git a/package/glibc/arc-2019.09-release/glibc.hash b/package/glibc/arc-2020.03-release/glibc.hash similarity index 75% rename from package/glibc/arc-2019.09-release/glibc.hash rename to package/glibc/arc-2020.03-release/glibc.hash index 296035c495..07ed06bfb5 100644 --- a/package/glibc/arc-2019.09-release/glibc.hash +++ b/package/glibc/arc-2020.03-release/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 0e0fd7603938fd8ebd793385a3d72c6e1fba22e16a600a16cc953a93f0e85943 glibc-arc-2019.09-release.tar.gz +sha256 e265e7179dfdee0add8c89a6be56ed2a9309174d39e7acd50d146ff948319e29 glibc-arc-2020.03-release.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 2ca73343b3..4ed5bc33f2 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_arc),y) -GLIBC_VERSION = arc-2019.09-release +GLIBC_VERSION = arc-2020.03-release GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION)) else ifeq ($(BR2_RISCV_32),y) GLIBC_VERSION = 06983fe52cfe8e4779035c27e8cc5d2caab31531 From 7a3be87d55735798407aa92d66c2ea302c1ee028 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Mon, 25 May 2020 18:22:38 +0200 Subject: [PATCH 79/90] package/libubootenv: bump to version c91dcca c91dcca ubi, write: fix invalid envsize ptr to UBI_IOCVOLUP Signed-off-by: Pierre-Jean Texier Signed-off-by: Thomas Petazzoni --- package/libubootenv/libubootenv.hash | 2 +- package/libubootenv/libubootenv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libubootenv/libubootenv.hash b/package/libubootenv/libubootenv.hash index d7d71fc717..753f8f54b9 100644 --- a/package/libubootenv/libubootenv.hash +++ b/package/libubootenv/libubootenv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1afd4e70242a8196bf25622a4558d0baf9db5652d37d217156c08f6e37fd8e80 libubootenv-f4b9cde3815abe84a98079cedd515283ea08c16b.tar.gz +sha256 9a905431113db379900e862e8175575ecda21b3c63a87389ffc4a65122dfec9e libubootenv-c91dccab34294b5ea9c6502d01bfdaa49639fd90.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Licenses/lgpl-2.1.txt diff --git a/package/libubootenv/libubootenv.mk b/package/libubootenv/libubootenv.mk index 2a7c0e7415..1b6f116678 100644 --- a/package/libubootenv/libubootenv.mk +++ b/package/libubootenv/libubootenv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUBOOTENV_VERSION = f4b9cde3815abe84a98079cedd515283ea08c16b +LIBUBOOTENV_VERSION = c91dccab34294b5ea9c6502d01bfdaa49639fd90 LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,$(LIBUBOOTENV_VERSION)) LIBUBOOTENV_LICENSE = LGPL-2.1 LIBUBOOTENV_LICENSE_FILES = Licenses/lgpl-2.1.txt From 517bae2087032f36b04639ccc8aec00638e1be1f Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Mon, 25 May 2020 18:24:20 +0200 Subject: [PATCH 80/90] package/mongoose: bump to to version 6.18 See https://github.com/cesanta/mongoose/releases/tag/6.18 Signed-off-by: Pierre-Jean Texier Signed-off-by: Thomas Petazzoni --- package/mongoose/mongoose.hash | 2 +- package/mongoose/mongoose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mongoose/mongoose.hash b/package/mongoose/mongoose.hash index c5de11bec2..b8be69be0b 100644 --- a/package/mongoose/mongoose.hash +++ b/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5bff3cc70bb2248cf87d06a3543f120f3b29b9368d25a7715443cb10612987cc mongoose-6.17.tar.gz +sha256 f5c10346abc9c72f7cac7885d853ca064fb09aad57580433941a8fd7a3543769 mongoose-6.18.tar.gz sha256 fdc34eeea97327d75c83492abd34f1a3200c53dec04422ecda8071dc60a36d10 LICENSE diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 7944f5e534..87f56d7894 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGOOSE_VERSION = 6.17 +MONGOOSE_VERSION = 6.18 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE From 20a9f7b92181d1abc930b328ab7f387758fa323b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 May 2020 18:16:56 +0200 Subject: [PATCH 81/90] package/dav1d: bump version to 0.7.0 Release notes: https://code.videolan.org/videolan/dav1d/-/releases/0.7.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dav1d/dav1d.hash | 2 +- package/dav1d/dav1d.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index b91ae0710a..812b4fb13b 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7fcfb4d2e43681f99faaad29d2a81c0ecc42d6e2b94eb4d1fded4e9dcb3661f1 dav1d-0.6.0.tar.bz2 +sha256 8057149f5f08c5ca47e1344fba9046ff84ac85ca409d7adbec8268c707ec5c19 dav1d-0.7.0.tar.bz2 sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 4dc1e46826..9243267e97 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 0.6.0 +DAV1D_VERSION = 0.7.0 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause From 6bb7f3b81092e7005470c7d689a566dbc1d059c6 Mon Sep 17 00:00:00 2001 From: Stephane Viau Date: Wed, 27 May 2020 07:07:44 +0200 Subject: [PATCH 82/90] package/freescale-imx: Add option for DDR FW need Only some i.MX8 needs a DDR training firmware (8M, 8MM, 8MN). Some other i.MX8 (QuadMax, QuadXPlus) rely on system controller for that task. Suggested-by: Julien Olivain Signed-off-by: Stephane Viau Reviewed-by: Gary Bisson [yann.morin.1998@free.fr: - use the new variable to drive the firmware installation ] Signed-off-by: Yann E. MORIN --- package/freescale-imx/Config.in | 6 ++++++ package/freescale-imx/firmware-imx/firmware-imx.mk | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index b0c7de8436..0be37ce956 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -45,12 +45,15 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M bool "imx8m" + select BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM bool "imx8mm" + select BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN bool "imx8mn" + select BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X bool "imx8x" @@ -96,6 +99,9 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X +config BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW + bool + source "package/freescale-imx/imx-alsa-plugins/Config.in" source "package/freescale-imx/imx-codec/Config.in" source "package/freescale-imx/imx-kobs/Config.in" diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index cd0dafb3de..7309d21b7a 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -18,7 +18,7 @@ define FIRMWARE_IMX_EXTRACT_CMDS $(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef -ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN),y) +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW),y) FIRMWARE_IMX_INSTALL_IMAGES = YES FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys define FIRMWARE_IMX_PREPARE_LPDDR4_FW From d981a3227e4341c9c4639f070e8aae46e40c91bd Mon Sep 17 00:00:00 2001 From: Stephane Viau Date: Wed, 27 May 2020 07:07:45 +0200 Subject: [PATCH 83/90] package/freescale-imx/firmware-imx: add choice for DDR training binaries Several i.MX8 (e.g.: 8M, 8MM, 8MN) support many DDR types (LPDDR4, DDR4, etc.), for which the DDR training is performed in the bootloader. Some boards have LPDDR4 (e.g.: nitrogen8mn) and some others have the DDR4 (e.g.: NXP's reference board EVK). This patch allows the selection of either of the binaries used to train the DDR. Note that DDR and HDMI FW copies are now separated, which makes latter being properly copied only for the relevant SoC (i.MX8MQ). Suggested-by: Gary Bisson Signed-off-by: Stephane Viau Reviewed-by: Maeva Manuel Reviewed-by: Julien Olivain Reviewed-by: Gary Bisson Signed-off-by: Yann E. MORIN --- package/freescale-imx/firmware-imx/Config.in | 24 +++++++++++ .../firmware-imx/firmware-imx.mk | 41 ++++++++++++++++++- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in index 56d5b80741..4962992346 100644 --- a/package/freescale-imx/firmware-imx/Config.in +++ b/package/freescale-imx/firmware-imx/Config.in @@ -8,3 +8,27 @@ config BR2_PACKAGE_FIRMWARE_IMX This library is provided by Freescale as-is and doesn't have an upstream. + +if BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW + +choice + bool "DDR training binaries" + default BR2_PACKAGE_FIRMWARE_DDRFW_LPDDR4 + help + Choose the DDR training binaries to be used depending on the + kind of memory that is available on the target board (DDR4, + LPDDR4, etc...). + +config BR2_PACKAGE_FIRMWARE_DDRFW_LPDDR4 + bool "lpddr4" + help + Use LPDDR4 binaries (i.e.: lpddr4_pmu_train_*.bin) + +config BR2_PACKAGE_FIRMWARE_DDRFW_DDR4 + bool "DDR4" + help + Use DDR4 binaries (i.e.: ddr4_*_201810.bin). + +endchoice # DDR training FW + +endif diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 7309d21b7a..9fd1c54b48 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -20,6 +20,8 @@ endef ifeq ($(BR2_PACKAGE_FREESCALE_IMX_NEED_DDR_FW),y) FIRMWARE_IMX_INSTALL_IMAGES = YES + +ifeq ($(BR2_PACKAGE_FIRMWARE_DDRFW_LPDDR4),y) FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys define FIRMWARE_IMX_PREPARE_LPDDR4_FW $(TARGET_OBJCOPY) -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 \ @@ -33,7 +35,7 @@ define FIRMWARE_IMX_PREPARE_LPDDR4_FW $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_$(1)_fw.bin endef -define FIRMWARE_IMX_INSTALL_IMAGES_CMDS +define FIRMWARE_IMX_PREPARE_DDR_FW # Create padded versions of lpddr4_pmu_* and generate lpddr4_pmu_train_fw.bin. # lpddr4_pmu_train_fw.bin is needed when generating imx8-boot-sd.bin # which is done in post-image script. @@ -42,9 +44,46 @@ define FIRMWARE_IMX_INSTALL_IMAGES_CMDS cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_1d_fw.bin \ $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_2d_fw.bin > \ $(BINARIES_DIR)/lpddr4_pmu_train_fw.bin + ln -sf $(BINARIES_DIR)/lpddr4_pmu_train_fw.bin $(BINARIES_DIR)/ddr_fw.bin +endef +else ifeq ($(BR2_PACKAGE_FIRMWARE_DDRFW_DDR4),y) +FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys +define FIRMWARE_IMX_PREPARE_DDR4_FW + $(TARGET_OBJCOPY) -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 \ + $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_imem_$(1)_201810.bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_imem_$(1)_201810_pad.bin + $(TARGET_OBJCOPY) -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 \ + $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_dmem_$(1)_201810.bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_dmem_$(1)_201810_pad.bin + cat $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_imem_$(1)_201810_pad.bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_dmem_$(1)_201810_pad.bin > \ + $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_$(1)_201810_fw.bin +endef + +define FIRMWARE_IMX_PREPARE_DDR_FW + # Create padded versions of ddr4_* and generate ddr4_fw.bin. + # ddr4_fw.bin is needed when generating imx8-boot-sd.bin + # which is done in post-image script. + $(call FIRMWARE_IMX_PREPARE_DDR4_FW,1d) + $(call FIRMWARE_IMX_PREPARE_DDR4_FW,2d) + cat $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_1d_201810_fw.bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_2d_201810_fw.bin > \ + $(BINARIES_DIR)/ddr4_201810_fw.bin + ln -sf $(BINARIES_DIR)/ddr4_201810_fw.bin $(BINARIES_DIR)/ddr_fw.bin +endef +endif + +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M),y) +define FIRMWARE_IMX_PREPARE_HDMI_FW cp $(@D)/firmware/hdmi/cadence/signed_hdmi_imx8m.bin \ $(BINARIES_DIR)/signed_hdmi_imx8m.bin endef +endif + +define FIRMWARE_IMX_INSTALL_IMAGES_CMDS + $(FIRMWARE_IMX_PREPARE_DDR_FW) + $(FIRMWARE_IMX_PREPARE_HDMI_FW) +endef else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y) define FIRMWARE_IMX_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0644 $(@D)/firmware/vpu/vpu_fw_imx8_dec.bin \ From 798853245b24825cd523ee5c43e3323ed42e687c Mon Sep 17 00:00:00 2001 From: Stephane Viau Date: Wed, 27 May 2020 07:07:46 +0200 Subject: [PATCH 84/90] board/freescale/common/imx: use generic ddr_fw.bin name For some SoCs (i.e.: i.MX8M Nano for now), the DDR training firmware in the boot image depends on the type of memory installed on a board (LPDDR4, DDR4, etc...). The previous patch makes this firmware name agnostic of the DDR type and uses ddr_fw.bin as a generic name. This patch makes imx8-bootloader-prepare.sh use this generic name, independently of the kind board DDR type. Signed-off-by: Stephane Viau Reviewed-by: Maeva Manuel Reviewed-by: Julien Olivain Reviewed-by: Gary Bisson Signed-off-by: Yann E. MORIN --- board/freescale/common/imx/imx8-bootloader-prepare.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh index abf2e43de8..cb7c37bfcd 100755 --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -9,21 +9,21 @@ main () fi if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00920000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00960000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its From 96fc4e47ea124be999f0693301eaec405dd84ca7 Mon Sep 17 00:00:00 2001 From: Stephane Viau Date: Wed, 27 May 2020 07:07:47 +0200 Subject: [PATCH 85/90] board/freescale/common/imx: add support for i.MX8M Nano Signed-off-by: Stephane Viau Reviewed-by: Maeva Manuel Reviewed-by: Julien Olivain Reviewed-by: Gary Bisson Signed-off-by: Yann E. MORIN --- board/freescale/common/imx/post-image.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh index 138ea7b123..06ccaac3a4 100755 --- a/board/freescale/common/imx/post-image.sh +++ b/board/freescale/common/imx/post-image.sh @@ -38,6 +38,8 @@ genimage_type() echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_imx8" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" ${BR2_CONFIG}; then + echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then From 2c01eeece96ce449163e066566c787bfc2a10651 Mon Sep 17 00:00:00 2001 From: Stephane Viau Date: Wed, 27 May 2020 07:07:48 +0200 Subject: [PATCH 86/90] configs/freescale_imx8mnevk: new defconfig This patch adds support for the i.MX8M Nano EVK Board [1]. The final boot image is created from uboot and firmware binaries in post image script board/freescale/common/imx/imx8-bootloader-prepare.sh Note that this config is based on 4.19.35_1.1.0 ; hence, the kernel configuration needs host-openssl to build. [1] https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/evaluation-kit-for-the-i-mx-8m-nano-applications-processor:8MNANOD4-EVK Signed-off-by: Stephane Viau Reviewed-by: Maeva Manuel Reviewed-by: Julien Olivain Signed-off-by: Yann E. MORIN --- .gitlab-ci.yml | 1 + DEVELOPERS | 4 ++ board/freescale/imx8mnevk/readme.txt | 73 +++++++++++++++++++++++++++ configs/freescale_imx8mnevk_defconfig | 43 ++++++++++++++++ 4 files changed, 121 insertions(+) create mode 100644 board/freescale/imx8mnevk/readme.txt create mode 100644 configs/freescale_imx8mnevk_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa8e077a07..0bf8a73b36 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -190,6 +190,7 @@ freescale_imx8mmevk_defconfig: { extends: .defconfig } freescale_imx8mqevk_defconfig: { extends: .defconfig } freescale_imx8qmmek_defconfig: { extends: .defconfig } freescale_imx8qxpmek_defconfig: { extends: .defconfig } +freescale_imx8mnevk_defconfig: { extends: .defconfig } freescale_p1025twr_defconfig: { extends: .defconfig } freescale_t1040d4rdb_defconfig: { extends: .defconfig } freescale_t2080_qds_rdb_defconfig: { extends: .defconfig } diff --git a/DEVELOPERS b/DEVELOPERS index 1320944186..04811b6288 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2402,6 +2402,10 @@ F: package/mtdev2tuio/ N: Stephan Hoffmann F: package/libhttpserver/ +N: Stephane Viau +F: board/freescale/imx8mnevk/ +F: configs/freescale_imx8mnevk_defconfig + N: Steve Calfee F: package/python-pymysql/ F: package/python-pyratemp/ diff --git a/board/freescale/imx8mnevk/readme.txt b/board/freescale/imx8mnevk/readme.txt new file mode 100644 index 0000000000..d7700568fa --- /dev/null +++ b/board/freescale/imx8mnevk/readme.txt @@ -0,0 +1,73 @@ +*************************** +Freescale i.MX8MN EVK board +*************************** + +This file documents the Buildroot support for the i.MX8M Nano EVK board. + +Build +===== + +First, configure Buildroot for the i.MX8MN EVK board: + + make freescale_imx8mnevk_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - bl31.bin + - boot.vfat + - ddr4_201810_fw.bin + - ddr_fw.bin + - fsl-imx8mn-ddr4-evk.dtb + - Image + - imx8-boot-sd.bin + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot.bin + - u-boot.imx + - u-boot.itb + - u-boot-nodtb.bin + - u-boot-spl.bin + - u-boot-spl-ddr.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template_imx8. + +Boot the i.MX8MN EVK board +========================== + +To boot your newly created system (refer to the i.MX8MNano EVK Quick Start Guide +[1] for guidance): +- insert the SD card in the SD slot of the board; +- Configure the switches as follows (X = "don't care"): +SW1101: 1100XXXXXX [D1-D10] +SW1102: XXXXXXXXXX [D1-D10] +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Enjoy! + +References +========== +[1] https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/evaluation-kit-for-the-i-mx-8m-nano-applications-processor:8MNANOD4-EVK diff --git a/configs/freescale_imx8mnevk_defconfig b/configs/freescale_imx8mnevk_defconfig new file mode 100644 index 0000000000..a859d1c743 --- /dev/null +++ b/configs/freescale_imx8mnevk_defconfig @@ -0,0 +1,43 @@ +BR2_aarch64=y +BR2_ARM_FPU_VFPV3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8mn-ddr4-evk.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8mn-ddr4-evk" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_FIRMWARE_DDRFW_DDR4=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.19.35_1.1.0" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_ddr4_evk" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y From 5587f366cde8fb6b8393c7ce3670f548dc8e5fad Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 1 May 2020 18:22:16 +0200 Subject: [PATCH 87/90] package/linux-tools/perf: bear the kernel options munging perf by itself is not a standalone package; instead, it is part of a bigger package, linux-tools. Even though perf is the only one to need kernel .config fixups, we still do it in a generic way, as it blends nicely in the existing variables, which all use a loop over all the tools. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 2 -- package/linux-tools/linux-tool-perf.mk.in | 4 ++++ package/linux-tools/linux-tools.mk | 7 +++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index 69bbad99e1..60dc343efa 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -355,8 +355,6 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER)) $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV), $(call KCONFIG_ENABLE_OPT,CONFIG_NET)) - $(if $(BR2_PACKAGE_LINUX_TOOLS_PERF), - $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS)) $(if $(BR2_LINUX_KERNEL_APPENDED_DTB), $(call KCONFIG_ENABLE_OPT,CONFIG_ARM_APPENDED_DTB)) $(if $(LINUX_KERNEL_CUSTOM_LOGO_PATH), diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index 7106b622cb..53b7c5b9cd 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -158,3 +158,7 @@ define PERF_INSTALL_TARGET_CMDS $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/ $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/tests/ endef + +define PERF_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS) +endef diff --git a/package/linux-tools/linux-tools.mk b/package/linux-tools/linux-tools.mk index 65d9e850e0..81b1fbc176 100644 --- a/package/linux-tools/linux-tools.mk +++ b/package/linux-tools/linux-tools.mk @@ -42,6 +42,13 @@ LINUX_TOOLS_POST_INSTALL_TARGET_HOOKS += $(foreach tool,$(LINUX_TOOLS),\ $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ $(call UPPERCASE,$(tool))_INSTALL_TARGET_CMDS)) +define LINUX_TOOLS_LINUX_CONFIG_FIXUPS + $(foreach tool,$(LINUX_TOOLS),\ + $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ + $($(call UPPERCASE,$(tool))_LINUX_CONFIG_FIXUPS)) + ) +endef + define LINUX_TOOLS_INSTALL_INIT_SYSTEMD $(foreach tool,$(LINUX_TOOLS),\ $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ From b4cc1fc06523d37c5fca922d9127365089a795ff Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 2 May 2020 15:52:04 +0200 Subject: [PATCH 88/90] package/libcap-ng: add host variant Qemu 5.0.0 recently switched to libcap-ng [1]. Add the host variant for host-qemu package. [1] https://git.qemu.org/?p=qemu.git;a=commit;h=7e46261368d129c5ee8be927f5bcadc7ecd800d7 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/libcap-ng/libcap-ng.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk index 0f29ef0972..102b472d1a 100644 --- a/package/libcap-ng/libcap-ng.mk +++ b/package/libcap-ng/libcap-ng.mk @@ -15,4 +15,8 @@ LIBCAP_NG_AUTORECONF = YES LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no LIBCAP_NG_CONF_OPTS = --without-python +HOST_LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no +HOST_LIBCAP_NG_CONF_OPTS = --without-python + $(eval $(autotools-package)) +$(eval $(host-autotools-package)) From 20f45029cc76ba41e7087041f87bba314336a6d9 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 23 May 2020 01:22:12 +0200 Subject: [PATCH 89/90] package/qemu: remove csky fork We have a qemu fork for csky cpus [1] but since qemu version bump to 4.2.0 [2] and libssh2/libssh change the csky build is broken. The csky fork is based on Qemu 3.0.0 but unlike autotools packages any unknown option is handled as error. Since we don't want to support all options from previous qemu release and the github repository has been removed [3] and the only remaining archive is located on http://sources.buildroot.net, remove the qemu csky fork as suggested by [4]. [1] https://git.buildroot.net/buildroot/commit/?id=f816e5b276f1ef15840bec6667f1e8219717ab7d [2] https://git.buildroot.net/buildroot/commit/?id=0ea17054ce7dfc54efca5634133cef786445e7b1 [3] https://github.com/c-sky/qemu [4] http://lists.busybox.net/pipermail/buildroot/2020-May/281885.html Signed-off-by: Romain Naour Cc: Guo Ren Cc: Peter Korsgaard [Peter: move patches out of 4.2.0 subdir] Signed-off-by: Peter Korsgaard --- ...-fix-usage-of-mcontext-structure-on-ARM-uCl.patch | 0 ...heinfo-fix-crash-when-compiling-with-uClibc.patch | 0 ...m-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch | 0 package/qemu/Config.in.host | 1 - package/qemu/qemu.hash | 3 --- package/qemu/qemu.mk | 12 ------------ 6 files changed, 16 deletions(-) rename package/qemu/{4.2.0 => }/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch (100%) rename package/qemu/{4.2.0 => }/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch (100%) rename package/qemu/{4.2.0 => }/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch (100%) diff --git a/package/qemu/4.2.0/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch similarity index 100% rename from package/qemu/4.2.0/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch rename to package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch diff --git a/package/qemu/4.2.0/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch b/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch similarity index 100% rename from package/qemu/4.2.0/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch rename to package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch diff --git a/package/qemu/4.2.0/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch b/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch similarity index 100% rename from package/qemu/4.2.0/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch rename to package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index 5ed160159a..7ccf768d15 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -3,7 +3,6 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS default y if BR2_arm default y if BR2_armeb default y if BR2_aarch64 - default y if BR2_csky default y if BR2_i386 default y if BR2_m68k default y if BR2_microblazeel diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index dae11cb3fe..322b4fdf16 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -2,6 +2,3 @@ sha256 d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0 qemu-4.2.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB - -# Locally computed -sha256 61091767ffd16002e77f005155d096208094e69dee35e6d5ddcaa6c8a13b5e26 qemu-b517e1dc3125a57555d67a8deed9eac7b42288e2.tar.gz diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 0bb29f9369..7fe64e3605 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,14 +4,9 @@ # ################################################################################ -ifeq ($(BR2_csky),y) -QEMU_VERSION = b517e1dc3125a57555d67a8deed9eac7b42288e2 -QEMU_SITE = $(call github,c-sky,qemu,$(QEMU_VERSION)) -else QEMU_VERSION = 4.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org -endif QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c QEMU_LICENSE_FILES = COPYING COPYING.LIB # NOTE: there is no top-level license file for non-(L)GPL licenses; @@ -238,13 +233,6 @@ endif ifeq ($(HOST_QEMU_ARCH),sh4aeb) HOST_QEMU_ARCH = sh4eb endif -ifeq ($(HOST_QEMU_ARCH),csky) -ifeq ($(BR2_ck610),y) -HOST_QEMU_ARCH = cskyv1 -else -HOST_QEMU_ARCH = cskyv2 -endif -endif HOST_QEMU_SYS_ARCH ?= $(HOST_QEMU_ARCH) HOST_QEMU_CFLAGS = $(HOST_CFLAGS) From 4675c7d4418f567e4d23a8935151caa3a8b9e179 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 2 May 2020 15:52:05 +0200 Subject: [PATCH 90/90] package/qemu: bump to 5.0.0 Remove upstream patches [1][2]. Switch to libcap-ng for virtio support [3]. Remove bluez option [4]. Disable container build [5] since we don't want to use containers for cross-building. Disable io_uring [6] since there is no such package in Buildroot (yet). The ARM Cortex-m7 cpu is now supported [7] a defconfig can be added in follup patch. [1] https://git.qemu.org/?p=qemu.git;a=commit;h=00b5032eaddb7193f03f0a28b10286244d2e2a7b [2] https://git.qemu.org/?p=qemu.git;a=commit;h=21bf9b06cb6d07c6cc437dfd47b47b28c2bb79db [3] https://git.qemu.org/?p=qemu.git;a=commit;h=7e46261368d129c5ee8be927f5bcadc7ecd800d7 [4] https://git.qemu.org/?p=qemu.git;a=commit;h=1d4ffe8dc77cbc9aafe8bcf514ca0e43f85aaae3 [5] https://git.qemu.org/?p=qemu.git;a=commit;h=afc3a8f9f1df09c091f9903eaef82b35c152cacf [6] https://git.qemu.org/?p=qemu.git;a=commit;h=c10dd8565defdb14695580c9369b20f4544e65a2 [7] https://git.qemu.org/?p=qemu.git;a=commit;h=cf7beda5072e106ddce875c1996446540c5fe239 See: https://wiki.qemu.org/ChangeLog/5.0 https://www.qemu.org/2020/04/29/qemu-5-0-0/ Signed-off-by: Romain Naour Cc: Adam Duskett Signed-off-by: Thomas Petazzoni --- ...age-of-mcontext-structure-on-ARM-uCl.patch | 10 +-- ...fix-crash-when-compiling-with-uClibc.patch | 43 ---------- ...emi-fix-SYS_OPEN-to-return-nonzero-f.patch | 78 ------------------- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 14 ++-- 5 files changed, 15 insertions(+), 132 deletions(-) delete mode 100644 package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch delete mode 100644 package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch index 157d28b112..548ec3e765 100644 --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch +++ b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch @@ -1,4 +1,4 @@ -From d3f1e7e9ff9aae3f770b0bcb9aa3c2f787f76a1b Mon Sep 17 00:00:00 2001 +From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 5 May 2017 09:07:15 +0200 Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc @@ -14,14 +14,14 @@ uClibc. Signed-off-by: Thomas Petazzoni --- - user-exec.c | 2 +- + accel/tcg/user-exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c -index 6db0758..2b3d116 100644 +index 4be78eb9b3..0a690bec55 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c -@@ -506,7 +506,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, +@@ -508,7 +508,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, #if defined(__NetBSD__) pc = uc->uc_mcontext.__gregs[_REG_R15]; @@ -31,5 +31,5 @@ index 6db0758..2b3d116 100644 #else pc = uc->uc_mcontext.arm_pc; -- -2.7.4 +2.25.3 diff --git a/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch b/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch deleted file mode 100644 index d1b9e35709..0000000000 --- a/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d82b8540ecaf3cb09a033e4971d8645d3343211e Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Wed, 16 Oct 2019 22:27:30 -0300 -Subject: [PATCH] util/cacheinfo: fix crash when compiling with uClibc - -uClibc defines _SC_LEVEL1_ICACHE_LINESIZE and _SC_LEVEL1_DCACHE_LINESIZE -but the corresponding sysconf calls returns -1, which is a valid result, -meaning that the limit is indeterminate. - -Handle this situation using the fallback values instead of crashing due -to an assertion failure. - -Signed-off-by: Carlos Santos ---- - util/cacheinfo.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/util/cacheinfo.c b/util/cacheinfo.c -index ea6f3e99bf..d94dc6adc8 100644 ---- a/util/cacheinfo.c -+++ b/util/cacheinfo.c -@@ -93,10 +93,16 @@ static void sys_cache_info(int *isize, int *dsize) - static void sys_cache_info(int *isize, int *dsize) - { - # ifdef _SC_LEVEL1_ICACHE_LINESIZE -- *isize = sysconf(_SC_LEVEL1_ICACHE_LINESIZE); -+ int tmp_isize = (int) sysconf(_SC_LEVEL1_ICACHE_LINESIZE); -+ if (tmp_isize > 0) { -+ *isize = tmp_isize; -+ } - # endif - # ifdef _SC_LEVEL1_DCACHE_LINESIZE -- *dsize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); -+ int tmp_dsize = (int) sysconf(_SC_LEVEL1_DCACHE_LINESIZE); -+ if (tmp_dsize > 0) { -+ *dsize = tmp_dsize; -+ } - # endif - } - #endif /* sys_cache_info */ --- -2.18.1 - diff --git a/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch b/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch deleted file mode 100644 index 46652d8298..0000000000 --- a/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 318f83f387678a3c0a2a729b506613011c6830b2 Mon Sep 17 00:00:00 2001 -From: Masahiro Yamada -Date: Fri, 17 Jan 2020 14:09:30 +0000 -Subject: [PATCH] target/arm/arm-semi: fix SYS_OPEN to return nonzero - filehandle - -According to the specification "Semihosting for AArch32 and Aarch64", -the SYS_OPEN operation should return: - - - A nonzero handle if the call is successful - - -1 if the call is not successful - -So, it should never return 0. - -Prior to commit 35e9a0a8ce4b ("target/arm/arm-semi: Make semihosting -code hand out its own file descriptors"), the guest fd matched to the -host fd. It returned a nonzero handle on success since the fd 0 is -already used for stdin. - -Now that the guest fd is the index of guestfd_array, it starts from 0. - -I noticed this issue particularly because Trusted Firmware-A built with -PLAT=qemu is no longer working. Its io_semihosting driver only handles -a positive return value as a valid filehandle. - -Basically, there are two ways to fix this: - - - Use (guestfd - 1) as the index of guestfs_arrary. We need to insert - increment/decrement to convert the guestfd and the array index back - and forth. - - - Keep using guestfd as the index of guestfs_array. The first entry - of guestfs_array is left unused. - -I thought the latter is simpler. We end up with wasting a small piece -of memory for the unused first entry of guestfd_array, but this is -probably not a big deal. - -Fixes: 35e9a0a8ce4b ("target/arm/arm-semi: Make semihosting code hand out its own file descriptors") -Cc: qemu-stable@nongnu.org -Signed-off-by: Masahiro Yamada -Reviewed-by: Richard Henderson -Message-id: 20200109041228.10131-1-masahiroy@kernel.org -Signed-off-by: Peter Maydell - -(cherry picked from commit 21bf9b06cb6d07c6cc437dfd47b47b28c2bb79db) -Signed-off-by: Adrien Grassein -Signed-off-by: Romain Naour ---- - target/arm/arm-semi.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c -index 6f7b6d801b..4275dfc345 100644 ---- a/target/arm/arm-semi.c -+++ b/target/arm/arm-semi.c -@@ -144,7 +144,8 @@ static int alloc_guestfd(void) - guestfd_array = g_array_new(FALSE, TRUE, sizeof(GuestFD)); - } - -- for (i = 0; i < guestfd_array->len; i++) { -+ /* SYS_OPEN should return nonzero handle on success. Start guestfd from 1 */ -+ for (i = 1; i < guestfd_array->len; i++) { - GuestFD *gf = &g_array_index(guestfd_array, GuestFD, i); - - if (gf->type == GuestFDUnused) { -@@ -168,7 +169,7 @@ static GuestFD *do_get_guestfd(int guestfd) - return NULL; - } - -- if (guestfd < 0 || guestfd >= guestfd_array->len) { -+ if (guestfd <= 0 || guestfd >= guestfd_array->len) { - return NULL; - } - --- -2.24.1 - diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 322b4fdf16..7199d433cf 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0 qemu-4.2.0.tar.xz +sha256 2f13a92a0fa5c8b69ff0796b59b86b080bbb92ebad5d301a7724dd06b5e78cb6 qemu-5.0.0.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 7fe64e3605..cb138fd488 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,7 +4,7 @@ # ################################################################################ -QEMU_VERSION = 4.2.0 +QEMU_VERSION = 5.0.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c @@ -131,15 +131,16 @@ define QEMU_CONFIGURE_CMDS --enable-attr \ --enable-vhost-net \ --disable-bsd-user \ + --disable-containers \ --disable-xen \ --disable-vnc \ --disable-virtfs \ --disable-brlapi \ --disable-curses \ --disable-curl \ - --disable-bluez \ --disable-vde \ --disable-linux-aio \ + --disable-linux-io-uring \ --disable-cap-ng \ --disable-docs \ --disable-spice \ @@ -264,11 +265,12 @@ HOST_QEMU_OPTS += --enable-vde HOST_QEMU_DEPENDENCIES += host-vde2 endif +# virtfs-proxy-helper is the only user of libcap-ng. ifeq ($(BR2_PACKAGE_HOST_QEMU_VIRTFS),y) -HOST_QEMU_OPTS += --enable-virtfs -HOST_QEMU_DEPENDENCIES += host-libcap +HOST_QEMU_OPTS += --enable-virtfs --enable-cap-ng +HOST_QEMU_DEPENDENCIES += host-libcap-ng else -HOST_QEMU_OPTS += --disable-virtfs +HOST_QEMU_OPTS += --disable-virtfs --disable-cap-ng endif ifeq ($(BR2_PACKAGE_HOST_QEMU_USB),y) @@ -293,8 +295,10 @@ define HOST_QEMU_CONFIGURE_CMDS --extra-ldflags="$(HOST_LDFLAGS)" \ --python=$(HOST_DIR)/bin/python3 \ --disable-bzip2 \ + --disable-containers \ --disable-curl \ --disable-libssh \ + --disable-linux-io-uring \ --disable-sdl \ --disable-vnc-jpeg \ --disable-vnc-png \