Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
commit
8ea4f3b549
@ -236,7 +236,6 @@ package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch Upstre
|
||||
package/bmx7/0002-Fix-linking-error.patch Upstream
|
||||
package/bmx7/0003-Reorder-includes-to-avoid-ethhdr-collision.patch Upstream
|
||||
package/boinc/S99boinc-client Indent Shellcheck Variables
|
||||
package/bootgen/0001-Fix-build-on-machines-with-modern-flex.patch Upstream
|
||||
package/botan/0001-Add-superh-alias-needed-by-Debian.patch Upstream
|
||||
package/botan/0002-src-build-data-arch-superh.txt-add-sh4-eb-aeb.patch Upstream
|
||||
package/brickd/S70brickd Indent Shellcheck Variables
|
||||
@ -883,7 +882,6 @@ package/libwebsock/0002-fix-ssl.patch Upstream
|
||||
package/libwebsock/0003-fix-incorrect-inline.patch Upstream
|
||||
package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch Upstream
|
||||
package/libyuv/0001-i386-sse2.patch Upstream
|
||||
package/lightning/0001-lib-jit_disasm.c-fix-build.patch Upstream
|
||||
package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch Upstream
|
||||
package/lighttpd/S50lighttpd EmptyLastLine Indent Shellcheck Variables
|
||||
package/linknx/0001-configure-ac-tweak-CPPUNIT-conditional.patch Upstream
|
||||
|
@ -2,12 +2,12 @@ BR2_arm=y
|
||||
BR2_cortex_a9=y
|
||||
BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
|
||||
BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
|
||||
BR2_LINUX_KERNEL_UIMAGE=y
|
||||
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
|
||||
@ -19,11 +19,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
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,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz"
|
||||
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt"
|
||||
BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-microzed"
|
||||
BR2_TARGET_UBOOT_NEEDS_DTC=y
|
||||
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
|
||||
BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
|
||||
BR2_TARGET_UBOOT_FORMAT_IMG=y
|
||||
BR2_TARGET_UBOOT_SPL=y
|
||||
BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
|
||||
|
@ -2,12 +2,12 @@ BR2_arm=y
|
||||
BR2_cortex_a9=y
|
||||
BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
|
||||
BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
|
||||
BR2_LINUX_KERNEL_UIMAGE=y
|
||||
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
|
||||
@ -19,11 +19,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
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,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz"
|
||||
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt"
|
||||
BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zc706"
|
||||
BR2_TARGET_UBOOT_NEEDS_DTC=y
|
||||
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
|
||||
BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
|
||||
BR2_TARGET_UBOOT_FORMAT_IMG=y
|
||||
BR2_TARGET_UBOOT_SPL=y
|
||||
BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
|
||||
|
@ -2,12 +2,12 @@ BR2_arm=y
|
||||
BR2_cortex_a9=y
|
||||
BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
|
||||
BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.1)/xlnx_rebase_v6.1_LTS_2023.1.tar.gz"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
|
||||
BR2_LINUX_KERNEL_UIMAGE=y
|
||||
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
|
||||
@ -19,11 +19,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
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,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz"
|
||||
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.1)/xlnx_rebase_v2023.01_2023.1.tar.gz"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt"
|
||||
BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zed"
|
||||
BR2_TARGET_UBOOT_NEEDS_DTC=y
|
||||
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
|
||||
BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
|
||||
BR2_TARGET_UBOOT_FORMAT_IMG=y
|
||||
BR2_TARGET_UBOOT_SPL=y
|
||||
BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
|
||||
|
@ -1,133 +0,0 @@
|
||||
From 7251dce3dc974c7372e7024ade3e8a455266cfd2 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Korsgaard <peter@korsgaard.com>
|
||||
Date: Fri, 18 Mar 2022 09:02:31 +0100
|
||||
Subject: [PATCH] Fix build on machines with modern flex
|
||||
|
||||
Bootgen embeds an old version of flex, but uses the system include syntax
|
||||
(#include <>) to reference it, causing conflicts on systems with the
|
||||
development headers for a modern flex version installed, leading to build
|
||||
issues like:
|
||||
|
||||
../bisonflex/bif.yy.cpp: In member function 'virtual int BIF::FlexScanner::yylex()':
|
||||
../bisonflex/bif.yy.cpp:1608:18: error: no match for 'operator=' (operand types are 'std::istream' {aka 'std::basic_istream<char>'} and 'std::istream*' {aka 'std::basic_istream<char>*'})
|
||||
|
||||
Fix it by using normal local #include statements by:
|
||||
|
||||
sed -i 's/<FlexLexer.h>/"FlexLexer.h"/g' *
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
[Submitted upstream: https://github.com/Xilinx/bootgen/pull/20]
|
||||
---
|
||||
FlexLexer.h | 6 +++---
|
||||
bif.yy.cpp | 2 +-
|
||||
bifscanner.h | 2 +-
|
||||
cmdoptions.yy.cpp | 2 +-
|
||||
cmdoptionsscanner.h | 2 +-
|
||||
reginit.yy.cpp | 2 +-
|
||||
reginitscanner.h | 2 +-
|
||||
7 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/FlexLexer.h b/FlexLexer.h
|
||||
index b115b5d..1c0386f 100755
|
||||
--- a/FlexLexer.h
|
||||
+++ b/FlexLexer.h
|
||||
@@ -33,15 +33,15 @@
|
||||
//
|
||||
// If you want to create multiple lexer classes, you use the -P flag
|
||||
// to rename each yyFlexLexer to some other xxFlexLexer. You then
|
||||
-// include <FlexLexer.h> in your other sources once per lexer class:
|
||||
+// include "FlexLexer.h" in your other sources once per lexer class:
|
||||
//
|
||||
// #undef yyFlexLexer
|
||||
// #define yyFlexLexer xxFlexLexer
|
||||
-// #include <FlexLexer.h>
|
||||
+// #include "FlexLexer.h"
|
||||
//
|
||||
// #undef yyFlexLexer
|
||||
// #define yyFlexLexer zzFlexLexer
|
||||
-// #include <FlexLexer.h>
|
||||
+// #include "FlexLexer.h"
|
||||
// ...
|
||||
|
||||
#ifndef __FLEX_LEXER_H
|
||||
diff --git a/bif.yy.cpp b/bif.yy.cpp
|
||||
index 7dd0841..9e09267 100644
|
||||
--- a/bif.yy.cpp
|
||||
+++ b/bif.yy.cpp
|
||||
@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
|
||||
|
||||
#define yytext_ptr yytext
|
||||
|
||||
-#include <FlexLexer.h>
|
||||
+#include "FlexLexer.h"
|
||||
|
||||
int yyFlexLexer::yywrap() { return 1; }
|
||||
int yyFlexLexer::yylex()
|
||||
diff --git a/bifscanner.h b/bifscanner.h
|
||||
index a6ec9e4..ded78da 100755
|
||||
--- a/bifscanner.h
|
||||
+++ b/bifscanner.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#if ! defined(yyFlexLexerOnce)
|
||||
#undef yyFlexLexer
|
||||
#define yyFlexLexer bifFlexLexer
|
||||
-#include <FlexLexer.h>
|
||||
+#include "FlexLexer.h"
|
||||
#endif
|
||||
|
||||
// Override the interface for yylex since we namespaced it
|
||||
diff --git a/cmdoptions.yy.cpp b/cmdoptions.yy.cpp
|
||||
index 6ee80de..1acfcce 100644
|
||||
--- a/cmdoptions.yy.cpp
|
||||
+++ b/cmdoptions.yy.cpp
|
||||
@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
|
||||
|
||||
#define yytext_ptr yytext
|
||||
|
||||
-#include <FlexLexer.h>
|
||||
+#include "FlexLexer.h"
|
||||
|
||||
int yyFlexLexer::yywrap() { return 1; }
|
||||
int yyFlexLexer::yylex()
|
||||
diff --git a/cmdoptionsscanner.h b/cmdoptionsscanner.h
|
||||
index a48af09..e02c1f1 100755
|
||||
--- a/cmdoptionsscanner.h
|
||||
+++ b/cmdoptionsscanner.h
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
#undef yyFlexLexer
|
||||
#define yyFlexLexer reginitFlexLexer
|
||||
-#include <FlexLexer.h>
|
||||
+#include "FlexLexer.h"
|
||||
#endif
|
||||
|
||||
// Override the interface for yylex since we namespaced it
|
||||
diff --git a/reginit.yy.cpp b/reginit.yy.cpp
|
||||
index 8422867..ff088f9 100644
|
||||
--- a/reginit.yy.cpp
|
||||
+++ b/reginit.yy.cpp
|
||||
@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR;
|
||||
|
||||
#define yytext_ptr yytext
|
||||
|
||||
-#include <FlexLexer.h>
|
||||
+#include "FlexLexer.h"
|
||||
|
||||
int yyFlexLexer::yywrap() { return 1; }
|
||||
int yyFlexLexer::yylex()
|
||||
diff --git a/reginitscanner.h b/reginitscanner.h
|
||||
index 4e78af9..23177be 100755
|
||||
--- a/reginitscanner.h
|
||||
+++ b/reginitscanner.h
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
#undef yyFlexLexer
|
||||
#define yyFlexLexer reginitFlexLexer
|
||||
-#include <FlexLexer.h>
|
||||
+#include "FlexLexer.h"
|
||||
#endif
|
||||
|
||||
// Override the interface for yylex since we namespaced it
|
||||
--
|
||||
2.30.2
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 7e07c75aa3e3965c8e33faefde037877f78130451cebc2056b096db9c66acbb3 bootgen-xilinx_v2022.2.tar.gz
|
||||
sha256 2fda35fac28f5753cfdd9c6d5c07fd2b018d55984681af79415a67ba5372ea8e bootgen-xilinx_v2023.1.tar.gz
|
||||
sha256 4da5f5eff0592e5d275f1871faf9e9a4fc0f6346027bfb777fa59d0aa6a59aa3 LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BOOTGEN_VERSION = xilinx_v2022.2
|
||||
BOOTGEN_VERSION = xilinx_v2023.1
|
||||
BOOTGEN_SITE = $(call github,Xilinx,bootgen,$(BOOTGEN_VERSION))
|
||||
HOST_BOOTGEN_DEPENDENCIES = host-openssl host-pkgconf
|
||||
BOOTGEN_LICENSE = Apache-2.0
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc
|
||||
sha256 4893b8b98eefc9fdc4b0e7ca249e340004faa7804a433d17429e311e1fef21d2 git-2.40.1.tar.xz
|
||||
sha256 e748bafd424cfe80b212cbc6f1bbccc3a47d4862fb1eb7988877750478568040 git-2.41.0.tar.xz
|
||||
# Locally calculated
|
||||
sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING
|
||||
sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GIT_VERSION = 2.40.1
|
||||
GIT_VERSION = 2.41.0
|
||||
GIT_SOURCE = git-$(GIT_VERSION).tar.xz
|
||||
GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git
|
||||
GIT_LICENSE = GPL-2.0, LGPL-2.1+
|
||||
|
@ -1,6 +1,6 @@
|
||||
# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.6/
|
||||
md5 da719235bb2f46830f9d2101d04b14a5 gnuplot-5.4.6.tar.gz
|
||||
sha1 31ea0c00af5c156e5d068e3b1cc2fb1847f471ab gnuplot-5.4.6.tar.gz
|
||||
# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.7/
|
||||
md5 cdc9bb3ac0cc7e717246ed3df2d6ffa2 gnuplot-5.4.7.tar.gz
|
||||
sha1 6e68f94af822ff56549beab3a465c2fe976d3b34 gnuplot-5.4.7.tar.gz
|
||||
# Locally computed
|
||||
sha256 02fc27918200ed64d8f0c3b84fe81b95b59cd47ad99f270939ae497c19f27419 gnuplot-5.4.6.tar.gz
|
||||
sha256 318a1501c9e659f39cf05ee5268335671bddc6c20eae06851f262fde27c2e739 gnuplot-5.4.7.tar.gz
|
||||
sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GNUPLOT_VERSION = 5.4.6
|
||||
GNUPLOT_VERSION = 5.4.7
|
||||
GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION)
|
||||
GNUPLOT_LICENSE = gnuplot license (open source)
|
||||
GNUPLOT_LICENSE_FILES = Copyright
|
||||
|
@ -9,5 +9,17 @@ config BR2_PACKAGE_LIBWEBSOCKETS
|
||||
|
||||
https://libwebsockets.org/
|
||||
|
||||
if BR2_PACKAGE_LIBWEBSOCKETS
|
||||
|
||||
config BR2_PACKAGE_LIBWEBSOCKETS_EXT_POLL
|
||||
bool "enable external poll loop support"
|
||||
default y # legacy, was previously always enabled
|
||||
help
|
||||
Enable external poll loop support code. This was
|
||||
unconditionally compiled in for library versions
|
||||
prior to 3.2.0.
|
||||
|
||||
endif
|
||||
|
||||
comment "libwebsockets needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
@ -94,4 +94,8 @@ ifeq ($(BR2_SHARED_LIBS),y)
|
||||
LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_STATIC=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS_EXT_POLL),y)
|
||||
LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_EXTERNAL_POLL=ON
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
@ -1,42 +0,0 @@
|
||||
From 0d828c96c373c34b201ca7ea37b61c1e3b0485cd Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 19 Dec 2022 23:55:31 +0100
|
||||
Subject: [PATCH] lib/jit_disasm.c: fix build
|
||||
|
||||
Fix the following build failure raised since
|
||||
http://git.savannah.gnu.org/cgit/lightning.git/commit/?id=837c7a1e8d08fb9294578dc84694077f4d6106f9:
|
||||
|
||||
jit_disasm.c: In function 'fprintf_styled':
|
||||
jit_disasm.c:57:27: error: parameter name omitted
|
||||
57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...)
|
||||
| ^~~~~~
|
||||
jit_disasm.c:57:35: error: parameter name omitted
|
||||
57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...)
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/e15e01e98e0d8c873efd3f512b671d98e4daf6c0
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[yann.morin.1998@free.fr: make it a backport now it's applied upstream]
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
---
|
||||
lib/jit_disasm.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/jit_disasm.c b/lib/jit_disasm.c
|
||||
index 58a269b..68c966d 100644
|
||||
--- a/lib/jit_disasm.c
|
||||
+++ b/lib/jit_disasm.c
|
||||
@@ -54,7 +54,7 @@ static FILE *disasm_stream;
|
||||
#endif
|
||||
|
||||
#if BINUTILS_2_38
|
||||
-static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...)
|
||||
+static int fprintf_styled(void * stream, enum disassembler_style style, const char* fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
int r;
|
||||
--
|
||||
2.25.1
|
||||
|
@ -1,12 +1,14 @@
|
||||
comment "lightning needs a toolchain w/ dynamic library, threads"
|
||||
depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \
|
||||
BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64
|
||||
BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 || \
|
||||
BR2_mips64 || BR2_mips64el
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_LIGHTNING
|
||||
bool "lightning"
|
||||
depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \
|
||||
BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64
|
||||
BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 || \
|
||||
BR2_mips64 || BR2_mips64el
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 4e3984ff1ccf0ba30a985211d40fc5c06b25f014ebdf3d80d0fe3d0c80dd7c0e lightning-2.2.0.tar.gz
|
||||
sha256 98671681d5684770ccb06a07fa3b8f032a454bdb56eafc18e6fab04459ea3caa lightning-2.2.1.tar.gz
|
||||
sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIGHTNING_VERSION = 2.2.0
|
||||
LIGHTNING_VERSION = 2.2.1
|
||||
LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning
|
||||
LIGHTNING_LICENSE = LGPL-3.0+
|
||||
LIGHTNING_LICENSE_FILES = COPYING.LESSER
|
||||
|
@ -25,6 +25,7 @@ config BR2_PACKAGE_MOSQUITTO_BROKER
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on !BR2_STATIC_LIBS # include <dlfcn.h>
|
||||
depends on BR2_PACKAGE_MOSQUITTO
|
||||
select BR2_PACKAGE_LIBWEBSOCKETS_EXT_POLL if BR2_PACKAGE_LIBWEBSOCKETS
|
||||
help
|
||||
Build and install the mosquitto broker onto target.
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
config BR2_PACKAGE_OPENVPN
|
||||
bool "openvpn"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_LIBCAP_NG
|
||||
select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS
|
||||
select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL
|
||||
help
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated after checking signature
|
||||
sha256 08340a389905c84196b6cd750add1bc0fa2d46a1afebfd589c24120946c13e68 openvpn-2.5.7.tar.gz
|
||||
sha256 371a2a323a99a79299b9b4caa4a31bc7b2cdff63236e68d429f3ee50e75f3dd4 openvpn-2.6.4.tar.gz
|
||||
sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL
|
||||
|
@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENVPN_VERSION = 2.5.7
|
||||
OPENVPN_VERSION = 2.6.4
|
||||
OPENVPN_SITE = https://swupdate.openvpn.net/community/releases
|
||||
OPENVPN_DEPENDENCIES = host-pkgconf
|
||||
OPENVPN_DEPENDENCIES = host-pkgconf libcap-ng
|
||||
OPENVPN_LICENSE = GPL-2.0
|
||||
OPENVPN_LICENSE_FILES = COPYRIGHT.GPL
|
||||
OPENVPN_CPE_ID_VENDOR = openvpn
|
||||
@ -16,6 +16,13 @@ OPENVPN_CONF_OPTS = \
|
||||
$(if $(BR2_STATIC_LIBS),--disable-plugins)
|
||||
OPENVPN_CONF_ENV = NETSTAT=/bin/netstat
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBNL),y)
|
||||
OPENVPN_CONF_OPTS += --enable-dco
|
||||
OPENVPN_DEPENDENCIES += libnl
|
||||
else
|
||||
OPENVPN_CONF_OPTS += --disable-dco
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENVPN_SMALL),y)
|
||||
OPENVPN_CONF_OPTS += \
|
||||
--enable-small \
|
||||
|
@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking signature with RSA key 0xA8041FA839E16E36
|
||||
# https://strace.io/files/6.2/strace-6.2.tar.xz.asc
|
||||
sha256 0c7d38a449416268d3004029a220a15a77c2206a03cc88120f37f46e949177e8 strace-6.2.tar.xz
|
||||
# https://strace.io/files/6.3/strace-6.3.tar.xz.asc
|
||||
sha256 e17878e301506c1cc301611118ad14efee7f8bcef63b27ace5d290acce7bb731 strace-6.3.tar.xz
|
||||
sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING
|
||||
sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
STRACE_VERSION = 6.2
|
||||
STRACE_VERSION = 6.3
|
||||
STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
|
||||
STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION)
|
||||
STRACE_LICENSE = LGPL-2.1+
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 a3735fabf00e1341adcc70394993c05fd3e2ae167a3e9bb46045e33084eb64a3 z3-4.12.1.tar.gz
|
||||
sha256 9f58f3710bd2094085951a75791550f547903d75fe7e2fcb373c5f03fc761b8f z3-4.12.2.tar.gz
|
||||
sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
Z3_VERSION = 4.12.1
|
||||
Z3_VERSION = 4.12.2
|
||||
Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION))
|
||||
Z3_LICENSE = MIT
|
||||
Z3_LICENSE_FILES = LICENSE.txt
|
||||
|
Loading…
Reference in New Issue
Block a user