Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eeb8c004da | ||
|
|
49b1a3ef2e | ||
|
|
a7b9636286 | ||
|
|
bec884cf3b | ||
|
|
57fb6f5201 | ||
|
|
b8caff2cf2 | ||
|
|
eb84d08807 | ||
|
|
e3fdd72274 | ||
|
|
8ab26921c2 | ||
|
|
0cc9eed5d4 | ||
|
|
3a1d44dfa0 | ||
|
|
9d48687bb2 | ||
|
|
3e7238e9d1 | ||
|
|
f34fcc03cf | ||
|
|
8c97451ab9 | ||
|
|
9ca49fba1a | ||
|
|
701ce0ad69 | ||
|
|
e91440b904 | ||
|
|
d5658ab951 | ||
|
|
953e0595f8 | ||
|
|
49d3d2eea1 | ||
|
|
beb91a11f7 | ||
|
|
2521b5bbb9 | ||
|
|
f3da0a3fce | ||
|
|
16a75a76af | ||
|
|
d0b10e4473 | ||
|
|
2e2990954a | ||
|
|
f487a0e33d | ||
|
|
f4b18f72c9 | ||
|
|
8e734ee443 | ||
|
|
9d63e24e6a | ||
|
|
59f0bb204f | ||
|
|
f7d2453564 | ||
|
|
1a9431d52d | ||
|
|
8d79accf96 | ||
|
|
c060023e10 | ||
|
|
1c5f3083c7 | ||
|
|
1e25ae6943 | ||
|
|
257b355bba | ||
|
|
0903ad64eb | ||
|
|
79c424facd | ||
|
|
8af5c11205 | ||
|
|
dc58180087 | ||
|
|
72673613aa | ||
|
|
e293b10d1c | ||
|
|
086cb59322 | ||
|
|
521a8184e7 | ||
|
|
8c378d9c71 | ||
|
|
374b496efb | ||
|
|
5806baf9fe | ||
|
|
2fbfb5271e | ||
|
|
5f24db1f96 | ||
|
|
d6b61411a3 | ||
|
|
0d32c53ee7 | ||
|
|
0139ab83d6 | ||
|
|
73c8fbe2a8 | ||
|
|
32181572eb | ||
|
|
6dc7146962 | ||
|
|
7c20887e1f | ||
|
|
168f8e4358 | ||
|
|
91a66a566b | ||
|
|
f1341cecb4 | ||
|
|
94c3c2fa49 | ||
|
|
b9794087bd | ||
|
|
9ff7b21657 | ||
|
|
2a660956f3 | ||
|
|
f0b03fb942 | ||
|
|
eb7af923b2 | ||
|
|
08e8792c50 | ||
|
|
95f5dcef1b | ||
|
|
6400186971 | ||
|
|
b8eb50e3dc | ||
|
|
873223cae1 | ||
|
|
b2f57d410a |
@@ -1,3 +1,26 @@
|
||||
2021.11.2, released February 28th, 2022
|
||||
|
||||
Important / security related fixes.
|
||||
|
||||
Defconfigs: Andes ae3xx, Intel galileo: Fix build with host
|
||||
gcc >= 10, ROC-RK3399-PC: Bump rootfs size to fix build issue.
|
||||
|
||||
Add conditional patching logic to fix build issues for older
|
||||
U-Boot / Linux kernel versions when built with a host gcc >=
|
||||
10.
|
||||
|
||||
Updated/fixed packages: apitrace, binutils, casync, cgilua,
|
||||
connman, expat, gauche, gdb, gensio, glibc, go, gst-omx,
|
||||
gst1-devtools, gst1-libav, gst1-plugins-bad,
|
||||
gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly,
|
||||
gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1,
|
||||
gstreamer1-editing-services, kf5-extra-cmake-modules, kodi,
|
||||
libarchive, linux, lm-sensors, localedef, log4cxx, mpd,
|
||||
nfs-utils, php, pistache, pkcs11-helper, prosody,
|
||||
python-django, python-pyzmq, python-regex,
|
||||
python-sqliteschema, resiprocate, rtl8723bu, thermald, tiff,
|
||||
tor, util-linux, vim, xen
|
||||
|
||||
2021.11.1, released January 29th, 2022
|
||||
|
||||
Important / security related fixes.
|
||||
|
||||
+7
-3
@@ -1056,6 +1056,7 @@ F: configs/asus_tinker_rk3288_defconfig
|
||||
F: configs/olimex_a*
|
||||
F: package/at/
|
||||
F: package/binutils/
|
||||
F: package/cryptsetup/
|
||||
F: package/erlang-jiffy/
|
||||
F: package/gcc/
|
||||
F: package/harfbuzz/
|
||||
@@ -1756,9 +1757,6 @@ F: package/rpi-wifi-firmware/
|
||||
F: package/tzdata/
|
||||
F: package/zic/
|
||||
|
||||
N: Martin Hicks <mort@bork.org>
|
||||
F: package/cryptsetup/
|
||||
|
||||
N: Martin Kepplinger <martink@posteo.de>
|
||||
F: package/tslib/
|
||||
F: package/x11r7/xdriver_xf86-input-tslib/
|
||||
@@ -2098,6 +2096,8 @@ F: package/lightning/
|
||||
F: package/umtprd/
|
||||
|
||||
N: Pedro Aguilar <paguilar@paguilar.org>
|
||||
F: package/bdwgc/
|
||||
F: package/guile/
|
||||
F: package/libunistring/
|
||||
|
||||
N: Peter Korsgaard <peter@korsgaard.com>
|
||||
@@ -2886,6 +2886,7 @@ F: package/circus/
|
||||
F: package/dhcpcd/
|
||||
F: package/feh/
|
||||
F: package/giblib/
|
||||
F: package/hostapd/
|
||||
F: package/imlib2/
|
||||
F: package/jquery-datetimepicker/
|
||||
F: package/jquery-sidebar/
|
||||
@@ -2895,6 +2896,8 @@ F: package/libical/
|
||||
F: package/libmbim/
|
||||
F: package/libndp/
|
||||
F: package/libnftnl/
|
||||
F: package/libqmi/
|
||||
F: package/libqrtr-glib/
|
||||
F: package/libsoc/
|
||||
F: package/libsocketcan/
|
||||
F: package/libubox/
|
||||
@@ -2914,6 +2917,7 @@ F: package/swig/
|
||||
F: package/qt5/qt5serialbus/
|
||||
F: package/sdparm/
|
||||
F: package/ti-utils/
|
||||
F: package/wpa_supplicant/
|
||||
F: package/x11r7/xapp_xconsole/
|
||||
F: package/x11r7/xapp_xinput-calibrator/
|
||||
F: package/zlog/
|
||||
|
||||
@@ -92,9 +92,9 @@ all:
|
||||
.PHONY: all
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2021.11.1
|
||||
export BR2_VERSION := 2021.11.2
|
||||
# Actual time the release is cut (for reproducible builds)
|
||||
BR2_VERSION_EPOCH = 1643497000
|
||||
BR2_VERSION_EPOCH = 1646080000
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
|
||||
+52
@@ -0,0 +1,52 @@
|
||||
From f9df4186c17d686f1ca38f973d7a3a49e8e37c01 Mon Sep 17 00:00:00 2001
|
||||
From: Dirk Mueller <dmueller@suse.com>
|
||||
Date: Tue, 14 Jan 2020 18:53:41 +0100
|
||||
Subject: [PATCH] scripts/dtc: Remove redundant YYLOC global declaration
|
||||
|
||||
gcc 10 will default to -fno-common, which causes this error at link
|
||||
time:
|
||||
|
||||
(.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here
|
||||
|
||||
This is because both dtc-lexer as well as dtc-parser define the same
|
||||
global symbol yyloc. Before with -fcommon those were merged into one
|
||||
defintion. The proper solution would be to to mark this as "extern",
|
||||
however that leads to:
|
||||
|
||||
dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls]
|
||||
26 | extern YYLTYPE yylloc;
|
||||
| ^~~~~~
|
||||
In file included from dtc-lexer.l:24:
|
||||
dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here
|
||||
127 | extern YYLTYPE yylloc;
|
||||
| ^~~~~~
|
||||
cc1: all warnings being treated as errors
|
||||
|
||||
which means the declaration is completely redundant and can just be
|
||||
dropped.
|
||||
|
||||
Signed-off-by: Dirk Mueller <dmueller@suse.com>
|
||||
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
|
||||
[robh: cherry-pick from upstream]
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Rob Herring <robh@kernel.org>
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
scripts/dtc/dtc-lexer.l | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
|
||||
index 06c040902444..d1b3810156c7 100644
|
||||
--- a/scripts/dtc/dtc-lexer.l
|
||||
+++ b/scripts/dtc/dtc-lexer.l
|
||||
@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n
|
||||
#include "srcpos.h"
|
||||
#include "dtc-parser.tab.h"
|
||||
|
||||
-YYLTYPE yylloc;
|
||||
extern bool treesource_error;
|
||||
|
||||
/* CAUTION: this will stop working if we ever use yyless() or yyunput() */
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001
|
||||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Wed, 24 Sep 2014 13:30:12 +0100
|
||||
Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static
|
||||
|
||||
per_cpu_load_addr is only used for 64-bit relocations, but is
|
||||
declared in both configurations of relocs.c - with different
|
||||
types. This has undefined behaviour in general. GNU ld is
|
||||
documented to use the larger size in this case, but other tools
|
||||
may differ and some warn about this.
|
||||
|
||||
References: https://bugs.debian.org/748577
|
||||
Reported-by: Michael Tautschnig <mt@debian.org>
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
Cc: 748577@bugs.debian.org
|
||||
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
Link: http://lkml.kernel.org/r/1411561812.3659.23.camel@decadent.org.uk
|
||||
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
|
||||
---
|
||||
arch/x86/tools/relocs.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
|
||||
index bbb1d2259ecf..a5efb21d5228 100644
|
||||
--- a/arch/x86/tools/relocs.c
|
||||
+++ b/arch/x86/tools/relocs.c
|
||||
@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
|
||||
*
|
||||
*/
|
||||
static int per_cpu_shndx = -1;
|
||||
-Elf_Addr per_cpu_load_addr;
|
||||
+static Elf_Addr per_cpu_load_addr;
|
||||
|
||||
static void percpu_init(void)
|
||||
{
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -238,6 +238,13 @@ endef
|
||||
UBOOT_POST_EXTRACT_HOOKS += UBOOT_COPY_OLD_LICENSE_FILE
|
||||
UBOOT_POST_RSYNC_HOOKS += UBOOT_COPY_OLD_LICENSE_FILE
|
||||
|
||||
# Older versions break on gcc 10+ because of redefined symbols
|
||||
define UBOOT_DROP_YYLLOC
|
||||
$(Q)grep -Z -l -r -E '^YYLTYPE yylloc;$$' $(@D) \
|
||||
|xargs -0 -r $(SED) '/^YYLTYPE yylloc;$$/d'
|
||||
endef
|
||||
UBOOT_POST_PATCH_HOOKS += UBOOT_DROP_YYLLOC
|
||||
|
||||
ifneq ($(ARCH_XTENSA_OVERLAY_FILE),)
|
||||
define UBOOT_XTENSA_OVERLAY_EXTRACT
|
||||
$(call arch-xtensa-overlay-extract,$(@D),u-boot)
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
BR2_x86_x1000=y
|
||||
BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches
|
||||
# Needed for TARGET_GRUB2
|
||||
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
|
||||
# Linux headers same as kernel, a 3.14 series
|
||||
|
||||
@@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc"
|
||||
BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_ROOTFS_EXT2_SIZE="64M"
|
||||
BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
|
||||
BR2_PACKAGE_HOST_DOSFSTOOLS=y
|
||||
BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
||||
|
||||
@@ -196,13 +196,13 @@ config BR2_PACKAGE_E
|
||||
--------------------------
|
||||
config BR2_PACKAGE_D
|
||||
bool "Package D"
|
||||
select BR2_PACKAGE_B
|
||||
depends on BR2_PACKAGE_A
|
||||
select BR2_PACKAGE_B
|
||||
|
||||
config BR2_PACKAGE_E
|
||||
bool "Package E"
|
||||
select BR2_PACKAGE_D
|
||||
depends on BR2_PACKAGE_A
|
||||
select BR2_PACKAGE_D
|
||||
--------------------------
|
||||
|
||||
Overall, for package library dependencies, +select+ should be
|
||||
@@ -554,3 +554,99 @@ over time. Such patches should not be downloaded, and instead be added
|
||||
locally to the package folder.
|
||||
|
||||
If the +.hash+ file is missing, then no check is done at all.
|
||||
|
||||
[[adding-packages-start-script]]
|
||||
=== The +SNNfoo+ start script
|
||||
|
||||
Packages that provide a system daemon usually need to be started somehow
|
||||
at boot. Buildroot comes with support for several init systems, some
|
||||
are considered tier one (see xref:init-system[]), while others are also
|
||||
available but do not have the same level of integration. Ideally, all
|
||||
packages providing a system daemon should provide a start script for
|
||||
BusyBox/SysV init and a systemd unit file.
|
||||
|
||||
For consistency, the start script must follow the style and composition
|
||||
as shown in the reference: +package/busybox/S01syslogd+. An annotated
|
||||
example of this style is shown below. There is no specific coding style
|
||||
for systemd unit files, but if a package comes with its own unit file,
|
||||
that is preferred over a buildroot specific one, if it is compatible
|
||||
with buildroot.
|
||||
|
||||
The name of the start script is composed of the +SNN+ and the daemon
|
||||
name. The +NN+ is the start order number which needs to be carefully
|
||||
chosen. For example, a program that requires networking to be up should
|
||||
not start before +S40network+. The scripts are started in alphabetical
|
||||
order, so +S01syslogd+ starts before +S01watchdogd+, and +S02sysctl+
|
||||
start thereafter.
|
||||
|
||||
------------------------------
|
||||
01: #!/bin/sh
|
||||
02:
|
||||
03: DAEMON="syslogd"
|
||||
04: PIDFILE="/var/run/$DAEMON.pid"
|
||||
05:
|
||||
06: SYSLOGD_ARGS=""
|
||||
07:
|
||||
08: # shellcheck source=/dev/null
|
||||
09: [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
|
||||
10:
|
||||
11: # BusyBox' syslogd does not create a pidfile, so pass "-n" in the command line
|
||||
12: # and use "-m" to instruct start-stop-daemon to create one.
|
||||
13: start() {
|
||||
14: printf 'Starting %s: ' "$DAEMON"
|
||||
15: # shellcheck disable=SC2086 # we need the word splitting
|
||||
16: start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \
|
||||
17: -- -n $SYSLOGD_ARGS
|
||||
18: status=$?
|
||||
19: if [ "$status" -eq 0 ]; then
|
||||
20: echo "OK"
|
||||
21: else
|
||||
22: echo "FAIL"
|
||||
23: fi
|
||||
24: return "$status"
|
||||
25: }
|
||||
26:
|
||||
27: stop() {
|
||||
28: printf 'Stopping %s: ' "$DAEMON"
|
||||
29: start-stop-daemon -K -q -p "$PIDFILE"
|
||||
30: status=$?
|
||||
31: if [ "$status" -eq 0 ]; then
|
||||
32: rm -f "$PIDFILE"
|
||||
33: echo "OK"
|
||||
34: else
|
||||
35: echo "FAIL"
|
||||
36: fi
|
||||
37: return "$status"
|
||||
38: }
|
||||
39:
|
||||
40: restart() {
|
||||
41: stop
|
||||
42: sleep 1
|
||||
43: start
|
||||
44: }
|
||||
45:
|
||||
46: case "$1" in
|
||||
47: start|stop|restart)
|
||||
48: "$1";;
|
||||
49: reload)
|
||||
50: # Restart, since there is no true "reload" feature.
|
||||
51: restart;;
|
||||
52: *)
|
||||
53: echo "Usage: $0 {start|stop|restart|reload}"
|
||||
54: exit 1
|
||||
55: esac
|
||||
------------------------------
|
||||
|
||||
*Note:* programs that support reloading their configuration in some
|
||||
fashion (+SIGHUP+) should provide a +reload()+ function similar to
|
||||
+stop()+. The +start-stop-daemon+ supports +-K -s HUP+ for this.
|
||||
It is recommended to always append +-x "/sbin/$DAEMON"+ to all the
|
||||
+start-stop-daemon+ commands to ensure signals are set to a PID that
|
||||
matches +$DAEMON+.
|
||||
|
||||
Both start scripts and unit files can source command line arguments from
|
||||
+/etc/default/foo+, in general, if such a file does not exist it should
|
||||
not block the start of the daemon, unless there is some site specirfic
|
||||
command line argument the daemon requires to start. For start scripts a
|
||||
+FOO_ARGS="-s -o -m -e -args"+ can be defined to a default value in and
|
||||
the user can override this from +/etc/default/foo+.
|
||||
|
||||
@@ -314,8 +314,7 @@ not and can not work as people would expect it should:
|
||||
13:45+01" see "man cvs" for further details).
|
||||
** +git+ for retrieving source code from a Git repository. Used by
|
||||
default when +LIBFOO_SITE+ begins with +git://+. The downloaded
|
||||
source code is cached as with the +svn+
|
||||
method.
|
||||
source code is cached as with the +svn+ method.
|
||||
** +hg+ for retrieving source code from a Mercurial repository. One
|
||||
'must' specify +LIBFOO_SITE_METHOD=hg+ when +LIBFOO_SITE+
|
||||
contains a Mercurial repository URL. The downloaded source code
|
||||
|
||||
@@ -377,6 +377,7 @@ good solution.
|
||||
Note that if +systemd+ is chosen as init system, /dev management will
|
||||
be performed by the +udev+ program provided by +systemd+.
|
||||
|
||||
[[init-system]]
|
||||
=== init system
|
||||
|
||||
The _init_ program is the first userspace program started by the
|
||||
|
||||
@@ -184,7 +184,7 @@ image sdimage.img {
|
||||
* Every node(+section+, +partition+, +file+, +subnode+) must have an open
|
||||
curly bracket on the same line of the node's name, while the closing one
|
||||
must be on a newline and after it a newline must be added except for the
|
||||
last one node. Same goes for its option, for example option +size = +.
|
||||
last one node. Same goes for its option, for example option +size+ +=+.
|
||||
|
||||
* Every +option+(i.e. +image+, +offset+, +size+) must have the +=+
|
||||
assignment one space from it and one space from the value specified.
|
||||
|
||||
+4
-3
@@ -411,9 +411,10 @@ config BR2_LINUX_KERNEL_INTREE_DTS_NAME
|
||||
config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH
|
||||
string "Out-of-tree Device Tree Source file paths"
|
||||
help
|
||||
Path to the out-of-tree device tree source files.
|
||||
You can provide a list of dts paths to copy and
|
||||
build, separated by spaces.
|
||||
Paths to out-of-tree Device Tree Source (.dts) and Device Tree
|
||||
Source Include (.dtsi) files, separated by spaces. These files
|
||||
will be copied to the kernel sources and the .dts files will
|
||||
be compiled from there.
|
||||
|
||||
config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME
|
||||
bool "Keep the directory name of the Device Tree"
|
||||
|
||||
+11
-1
@@ -72,7 +72,8 @@ LINUX_MAKE_ENV = \
|
||||
LINUX_INSTALL_IMAGES = YES
|
||||
LINUX_DEPENDENCIES = host-kmod \
|
||||
$(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) \
|
||||
$(if $(BR2_PACKAGE_LINUX_FIRMWARE),linux-firmware)
|
||||
$(if $(BR2_PACKAGE_LINUX_FIRMWARE),linux-firmware) \
|
||||
$(if $(BR2_PACKAGE_WIRELESS_REGDB),wireless-regdb)
|
||||
|
||||
# Starting with 4.16, the generated kconfig paser code is no longer
|
||||
# shipped with the kernel sources, so we need flex and bison, but
|
||||
@@ -231,6 +232,8 @@ ifeq ($(KERNEL_ARCH),i386)
|
||||
LINUX_ARCH_PATH = $(LINUX_DIR)/arch/x86
|
||||
else ifeq ($(KERNEL_ARCH),x86_64)
|
||||
LINUX_ARCH_PATH = $(LINUX_DIR)/arch/x86
|
||||
else ifeq ($(KERNEL_ARCH),sparc64)
|
||||
LINUX_ARCH_PATH = $(LINUX_DIR)/arch/sparc
|
||||
else
|
||||
LINUX_ARCH_PATH = $(LINUX_DIR)/arch/$(KERNEL_ARCH)
|
||||
endif
|
||||
@@ -257,6 +260,13 @@ endef
|
||||
|
||||
LINUX_POST_PATCH_HOOKS += LINUX_APPLY_LOCAL_PATCHES
|
||||
|
||||
# Older versions break on gcc 10+ because of redefined symbols
|
||||
define LINUX_DROP_YYLLOC
|
||||
$(Q)grep -Z -l -r -E '^YYLTYPE yylloc;$$' $(@D) \
|
||||
|xargs -0 -r $(SED) '/^YYLTYPE yylloc;$$/d'
|
||||
endef
|
||||
LINUX_POST_PATCH_HOOKS += LINUX_DROP_YYLLOC
|
||||
|
||||
# Older linux kernels use deprecated perl constructs in timeconst.pl
|
||||
# that were removed for perl 5.22+ so it breaks on newer distributions
|
||||
# Try a dry-run patch to see if this applies, if it does go ahead
|
||||
|
||||
@@ -38,6 +38,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
|
||||
APITRACE_CXXFLAGS += -O0
|
||||
endif
|
||||
|
||||
# m68k needs 32-bit offsets in switch tables to build
|
||||
ifeq ($(BR2_m68k),y)
|
||||
APITRACE_CXXFLAGS += -mlong-jump-table-offsets
|
||||
endif
|
||||
|
||||
APITRACE_CONF_OPTS += \
|
||||
-DCMAKE_C_FLAGS="$(APITRACE_CFLAGS)" \
|
||||
-DCMAKE_CXX_FLAGS="$(APITRACE_CXXFLAGS)"
|
||||
|
||||
+236
@@ -0,0 +1,236 @@
|
||||
From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001
|
||||
From: "H.J. Lu" <hjl.tools@gmail.com>
|
||||
Date: Mon, 26 Jul 2021 05:59:55 -0700
|
||||
Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd
|
||||
|
||||
Close the file descriptor if there is no archive plugin file descriptor
|
||||
to avoid running out of file descriptors on thin archives with many
|
||||
archive members.
|
||||
|
||||
bfd/
|
||||
|
||||
PR ld/28138
|
||||
* plugin.c (bfd_plugin_close_file_descriptor): Close the file
|
||||
descriptor there is no archive plugin file descriptor.
|
||||
|
||||
ld/
|
||||
|
||||
PR ld/28138
|
||||
* testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for
|
||||
native build.
|
||||
|
||||
PR ld/28138
|
||||
* testsuite/ld-plugin/lto.exp: Run ld/28138 tests.
|
||||
* testsuite/ld-plugin/pr28138.c: New file.
|
||||
* testsuite/ld-plugin/pr28138-1.c: Likewise.
|
||||
* testsuite/ld-plugin/pr28138-2.c: Likewise.
|
||||
* testsuite/ld-plugin/pr28138-3.c: Likewise.
|
||||
* testsuite/ld-plugin/pr28138-4.c: Likewise.
|
||||
* testsuite/ld-plugin/pr28138-5.c: Likewise.
|
||||
* testsuite/ld-plugin/pr28138-6.c: Likewise.
|
||||
* testsuite/ld-plugin/pr28138-7.c: Likewise.
|
||||
|
||||
(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742)
|
||||
(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2)
|
||||
|
||||
[Upstream:
|
||||
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1c611b40e6bfc8029bff7696814330b5bc0ee5c0]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
bfd/plugin.c | 8 +++++++
|
||||
ld/testsuite/ld-plugin/lto.exp | 34 ++++++++++++++++++++++++++++++
|
||||
ld/testsuite/ld-plugin/pr28138-1.c | 6 ++++++
|
||||
ld/testsuite/ld-plugin/pr28138-2.c | 6 ++++++
|
||||
ld/testsuite/ld-plugin/pr28138-3.c | 6 ++++++
|
||||
ld/testsuite/ld-plugin/pr28138-4.c | 6 ++++++
|
||||
ld/testsuite/ld-plugin/pr28138-5.c | 6 ++++++
|
||||
ld/testsuite/ld-plugin/pr28138-6.c | 6 ++++++
|
||||
ld/testsuite/ld-plugin/pr28138-7.c | 6 ++++++
|
||||
ld/testsuite/ld-plugin/pr28138.c | 20 ++++++++++++++++++
|
||||
10 files changed, 104 insertions(+)
|
||||
create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c
|
||||
create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c
|
||||
create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c
|
||||
create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c
|
||||
create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c
|
||||
create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c
|
||||
create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c
|
||||
create mode 100644 ld/testsuite/ld-plugin/pr28138.c
|
||||
|
||||
diff --git a/bfd/plugin.c b/bfd/plugin.c
|
||||
index 6cfa2b66470..3bab8febe88 100644
|
||||
--- a/bfd/plugin.c
|
||||
+++ b/bfd/plugin.c
|
||||
@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd)
|
||||
&& !bfd_is_thin_archive (abfd->my_archive))
|
||||
abfd = abfd->my_archive;
|
||||
|
||||
+ /* Close the file descriptor if there is no archive plugin file
|
||||
+ descriptor. */
|
||||
+ if (abfd->archive_plugin_fd == -1)
|
||||
+ {
|
||||
+ close (fd);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
abfd->archive_plugin_fd_open_count--;
|
||||
/* Dup the archive plugin file descriptor for later use, which
|
||||
will be closed by _bfd_archive_close_and_cleanup. */
|
||||
diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
|
||||
index def69e43ab3..999d911ce6a 100644
|
||||
--- a/ld/testsuite/ld-plugin/lto.exp
|
||||
+++ b/ld/testsuite/ld-plugin/lto.exp
|
||||
@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } {
|
||||
}
|
||||
}
|
||||
|
||||
+run_cc_link_tests [list \
|
||||
+ [list \
|
||||
+ "Build pr28138.a" \
|
||||
+ "-T" "" \
|
||||
+ {pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \
|
||||
+ pr28138-6.c pr28138-7.c} {} "pr28138.a" \
|
||||
+ ] \
|
||||
+ [list \
|
||||
+ "Build pr28138.o" \
|
||||
+ "" "" \
|
||||
+ {pr28138.c} {} \
|
||||
+ ] \
|
||||
+]
|
||||
+
|
||||
+set exec_output [run_host_cmd "sh" \
|
||||
+ "-c \"ulimit -n 20; \
|
||||
+ $CC -Btmpdir/ld -o tmpdir/pr28138 \
|
||||
+ tmpdir/pr28138.o tmpdir/pr28138.a\""]
|
||||
+set exec_output [prune_warnings $exec_output]
|
||||
+if [string match "" $exec_output] then {
|
||||
+ if { [isnative] } {
|
||||
+ set exec_output [run_host_cmd "tmpdir/pr28138" ""]
|
||||
+ if [string match "PASS" $exec_output] then {
|
||||
+ pass "PR ld/28138"
|
||||
+ } else {
|
||||
+ fail "PR ld/28138"
|
||||
+ }
|
||||
+ } else {
|
||||
+ pass "PR ld/28138"
|
||||
+ }
|
||||
+} else {
|
||||
+ fail "PR ld/28138"
|
||||
+}
|
||||
+
|
||||
set testname "Build liblto-11.a"
|
||||
remote_file host delete "tmpdir/liblto-11.a"
|
||||
set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
|
||||
diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c
|
||||
new file mode 100644
|
||||
index 00000000000..51d119e1642
|
||||
--- /dev/null
|
||||
+++ b/ld/testsuite/ld-plugin/pr28138-1.c
|
||||
@@ -0,0 +1,6 @@
|
||||
+extern int a0(void);
|
||||
+int
|
||||
+a1(void)
|
||||
+{
|
||||
+ return 1 + a0();
|
||||
+}
|
||||
diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c
|
||||
new file mode 100644
|
||||
index 00000000000..1120cd797e9
|
||||
--- /dev/null
|
||||
+++ b/ld/testsuite/ld-plugin/pr28138-2.c
|
||||
@@ -0,0 +1,6 @@
|
||||
+extern int a1(void);
|
||||
+int
|
||||
+a2(void)
|
||||
+{
|
||||
+ return 1 + a1();
|
||||
+}
|
||||
diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c
|
||||
new file mode 100644
|
||||
index 00000000000..ec464947ee6
|
||||
--- /dev/null
|
||||
+++ b/ld/testsuite/ld-plugin/pr28138-3.c
|
||||
@@ -0,0 +1,6 @@
|
||||
+extern int a2(void);
|
||||
+int
|
||||
+a3(void)
|
||||
+{
|
||||
+ return 1 + a2();
|
||||
+}
|
||||
diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c
|
||||
new file mode 100644
|
||||
index 00000000000..475701b2c5c
|
||||
--- /dev/null
|
||||
+++ b/ld/testsuite/ld-plugin/pr28138-4.c
|
||||
@@ -0,0 +1,6 @@
|
||||
+extern int a3(void);
|
||||
+int
|
||||
+a4(void)
|
||||
+{
|
||||
+ return 1 + a3();
|
||||
+}
|
||||
diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c
|
||||
new file mode 100644
|
||||
index 00000000000..e24f86c363e
|
||||
--- /dev/null
|
||||
+++ b/ld/testsuite/ld-plugin/pr28138-5.c
|
||||
@@ -0,0 +1,6 @@
|
||||
+extern int a4(void);
|
||||
+int
|
||||
+a5(void)
|
||||
+{
|
||||
+ return 1 + a4();
|
||||
+}
|
||||
diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c
|
||||
new file mode 100644
|
||||
index 00000000000..b5b938bdb21
|
||||
--- /dev/null
|
||||
+++ b/ld/testsuite/ld-plugin/pr28138-6.c
|
||||
@@ -0,0 +1,6 @@
|
||||
+extern int a5(void);
|
||||
+int
|
||||
+a6(void)
|
||||
+{
|
||||
+ return 1 + a5();
|
||||
+}
|
||||
diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c
|
||||
new file mode 100644
|
||||
index 00000000000..4ef75bf0f0c
|
||||
--- /dev/null
|
||||
+++ b/ld/testsuite/ld-plugin/pr28138-7.c
|
||||
@@ -0,0 +1,6 @@
|
||||
+extern int a6(void);
|
||||
+int
|
||||
+a7(void)
|
||||
+{
|
||||
+ return 1 + a6();
|
||||
+}
|
||||
diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c
|
||||
new file mode 100644
|
||||
index 00000000000..68252c9f382
|
||||
--- /dev/null
|
||||
+++ b/ld/testsuite/ld-plugin/pr28138.c
|
||||
@@ -0,0 +1,20 @@
|
||||
+#include <stdio.h>
|
||||
+
|
||||
+extern int a7(void);
|
||||
+
|
||||
+int
|
||||
+a0(void)
|
||||
+{
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+main()
|
||||
+{
|
||||
+ if (a7() == 7)
|
||||
+ {
|
||||
+ printf ("PASS\n");
|
||||
+ return 0;
|
||||
+ }
|
||||
+ return 1;
|
||||
+}
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -40,8 +40,8 @@ else
|
||||
CASYNC_CONF_OPTS += -Dudev=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBZSTD),y)
|
||||
CASYNC_DEPENDENCIES += libzstd
|
||||
ifeq ($(BR2_PACKAGE_ZSTD),y)
|
||||
CASYNC_DEPENDENCIES += zstd
|
||||
CASYNC_CONF_OPTS += -Dlibzstd=enabled
|
||||
else
|
||||
CASYNC_CONF_OPTS += -Dlibzstd=disabled
|
||||
|
||||
@@ -8,5 +8,6 @@ CGILUA_VERSION = 6.0.2-0
|
||||
CGILUA_SUBDIR = cgilua
|
||||
CGILUA_LICENSE = MIT
|
||||
CGILUA_LICENSE_FILES = $(CGILUA_SUBDIR)/doc/us/license.html
|
||||
CGILUA_CPE_ID_VENDOR = keplerproject
|
||||
|
||||
$(eval $(luarocks-package))
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc
|
||||
sha256 1a57ae7ce234aa3a1744aac3be5c2121d98dce999440ef8ab9cc4edfd5edcb12 connman-1.40.tar.xz
|
||||
sha256 79fb40f4fdd5530c45aa8e592fb16ba23d3674f3a98cf10b89a6576f198de589 connman-1.41.tar.xz
|
||||
# Locally computed
|
||||
sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CONNMAN_VERSION = 1.40
|
||||
CONNMAN_VERSION = 1.41
|
||||
CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz
|
||||
CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman
|
||||
CONNMAN_DEPENDENCIES = libglib2 dbus
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# From https://sourceforge.net/projects/expat/files/expat/2.4.3/
|
||||
md5 b1137f030590b3f0c41c69c6cd68fa90 expat-2.4.3.tar.xz
|
||||
sha1 cfaacc4f929b34cfbde2b8f33b74ec84c0cbb329 expat-2.4.3.tar.xz
|
||||
# From https://sourceforge.net/projects/expat/files/expat/2.4.4/
|
||||
md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz
|
||||
sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz
|
||||
|
||||
# Locally calculated
|
||||
sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.3.tar.xz
|
||||
sha256 b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8 expat-2.4.4.tar.xz
|
||||
sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EXPAT_VERSION = 2.4.3
|
||||
EXPAT_VERSION = 2.4.4
|
||||
EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
|
||||
EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz
|
||||
EXPAT_INSTALL_STAGING = YES
|
||||
|
||||
@@ -10,8 +10,6 @@ GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche
|
||||
GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm)
|
||||
GAUCHE_LICENSE_FILES = COPYING
|
||||
GAUCHE_DEPENDENCIES = host-gauche
|
||||
# We're patching configure.ac
|
||||
GAUCHE_AUTORECONF = YES
|
||||
|
||||
HOST_GAUCHE_CONF_OPTS = --without-zlib
|
||||
GAUCHE_CONF_OPTS = --without-libatomic-ops
|
||||
|
||||
@@ -0,0 +1,320 @@
|
||||
From eb79b2318066cafb75ffdce310e3bbd44f7c79e3 Mon Sep 17 00:00:00 2001
|
||||
From: Luis Machado <luis.machado@linaro.org>
|
||||
Date: Fri, 29 Oct 2021 14:54:36 -0300
|
||||
Subject: [PATCH] [AArch64] Make gdbserver register set selection dynamic
|
||||
|
||||
The current register set selection mechanism for AArch64 is static, based
|
||||
on a pre-populated array of register sets.
|
||||
|
||||
This means that we might potentially probe register sets that are not
|
||||
available. This is OK if the kernel errors out during ptrace, but probing the
|
||||
tag_ctl register, for example, does not result in a ptrace error if the kernel
|
||||
supports the tagged address ABI but not MTE (PR 28355).
|
||||
|
||||
Making the register set selection dynamic, based on feature checks, solves
|
||||
this and simplifies the code a bit. It allows us to list all of the register
|
||||
sets only once, and pick and choose based on HWCAP/HWCAP2 or other properties.
|
||||
|
||||
gdb/ChangeLog:
|
||||
|
||||
2021-11-03 Luis Machado <luis.machado@linaro.org>
|
||||
|
||||
PR gdb/28355
|
||||
|
||||
* arch/aarch64.h (struct aarch64_features): New struct.
|
||||
|
||||
gdbserver/ChangeLog:
|
||||
|
||||
2021-11-03 Luis Machado <luis.machado@linaro.org>
|
||||
|
||||
PR gdb/28355
|
||||
|
||||
* linux-aarch64-low.cc (is_sve_tdesc): Remove.
|
||||
(aarch64_target::low_arch_setup): Rework to adjust the register sets.
|
||||
(aarch64_regsets): Update to list all register sets.
|
||||
(aarch64_regsets_info, regs_info_aarch64): Replace NULL with nullptr.
|
||||
(aarch64_sve_regsets, aarch64_sve_regsets_info)
|
||||
(regs_info_aarch64_sve): Remove.
|
||||
(aarch64_adjust_register_sets): New.
|
||||
(aarch64_target::get_regs_info): Remove references to removed structs.
|
||||
(initialize_low_arch): Likewise.
|
||||
|
||||
Backported from: eb79b2318066cafb75ffdce310e3bbd44f7c79e3
|
||||
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
|
||||
---
|
||||
gdb/arch/aarch64.h | 9 ++
|
||||
gdbserver/linux-aarch64-low.cc | 186 ++++++++++++++++++---------------
|
||||
4 files changed, 130 insertions(+), 85 deletions(-)
|
||||
|
||||
diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h
|
||||
index 0eb702c5b5e..95edb664b55 100644
|
||||
--- a/gdb/arch/aarch64.h
|
||||
+++ b/gdb/arch/aarch64.h
|
||||
@@ -22,6 +22,15 @@
|
||||
|
||||
#include "gdbsupport/tdesc.h"
|
||||
|
||||
+/* Holds information on what architectural features are available. This is
|
||||
+ used to select register sets. */
|
||||
+struct aarch64_features
|
||||
+{
|
||||
+ bool sve = false;
|
||||
+ bool pauth = false;
|
||||
+ bool mte = false;
|
||||
+};
|
||||
+
|
||||
/* Create the aarch64 target description. A non zero VQ value indicates both
|
||||
the presence of SVE and the Vector Quotient - the number of 128bit chunks in
|
||||
an SVE Z register. HAS_PAUTH_P indicates the presence of the PAUTH
|
||||
diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc
|
||||
index daccfef746e..9a8cb4169a7 100644
|
||||
--- a/gdbserver/linux-aarch64-low.cc
|
||||
+++ b/gdbserver/linux-aarch64-low.cc
|
||||
@@ -196,16 +196,6 @@ is_64bit_tdesc (void)
|
||||
return register_size (regcache->tdesc, 0) == 8;
|
||||
}
|
||||
|
||||
-/* Return true if the regcache contains the number of SVE registers. */
|
||||
-
|
||||
-static bool
|
||||
-is_sve_tdesc (void)
|
||||
-{
|
||||
- struct regcache *regcache = get_thread_regcache (current_thread, 0);
|
||||
-
|
||||
- return tdesc_contains_feature (regcache->tdesc, "org.gnu.gdb.aarch64.sve");
|
||||
-}
|
||||
-
|
||||
static void
|
||||
aarch64_fill_gregset (struct regcache *regcache, void *buf)
|
||||
{
|
||||
@@ -680,40 +670,6 @@ aarch64_target::low_new_fork (process_info *parent,
|
||||
*child->priv->arch_private = *parent->priv->arch_private;
|
||||
}
|
||||
|
||||
-/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */
|
||||
-#define AARCH64_HWCAP_PACA (1 << 30)
|
||||
-
|
||||
-/* Implementation of linux target ops method "low_arch_setup". */
|
||||
-
|
||||
-void
|
||||
-aarch64_target::low_arch_setup ()
|
||||
-{
|
||||
- unsigned int machine;
|
||||
- int is_elf64;
|
||||
- int tid;
|
||||
-
|
||||
- tid = lwpid_of (current_thread);
|
||||
-
|
||||
- is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine);
|
||||
-
|
||||
- if (is_elf64)
|
||||
- {
|
||||
- uint64_t vq = aarch64_sve_get_vq (tid);
|
||||
- unsigned long hwcap = linux_get_hwcap (8);
|
||||
- unsigned long hwcap2 = linux_get_hwcap2 (8);
|
||||
- bool pauth_p = hwcap & AARCH64_HWCAP_PACA;
|
||||
- /* MTE is AArch64-only. */
|
||||
- bool mte_p = hwcap2 & HWCAP2_MTE;
|
||||
-
|
||||
- current_process ()->tdesc
|
||||
- = aarch64_linux_read_description (vq, pauth_p, mte_p);
|
||||
- }
|
||||
- else
|
||||
- current_process ()->tdesc = aarch32_linux_read_description ();
|
||||
-
|
||||
- aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread));
|
||||
-}
|
||||
-
|
||||
/* Wrapper for aarch64_sve_regs_copy_to_reg_buf. */
|
||||
|
||||
static void
|
||||
@@ -730,21 +686,36 @@ aarch64_sve_regs_copy_from_regcache (struct regcache *regcache, void *buf)
|
||||
return aarch64_sve_regs_copy_from_reg_buf (regcache, buf);
|
||||
}
|
||||
|
||||
+/* Array containing all the possible register sets for AArch64/Linux. During
|
||||
+ architecture setup, these will be checked against the HWCAP/HWCAP2 bits for
|
||||
+ validity and enabled/disabled accordingly.
|
||||
+
|
||||
+ Their sizes are set to 0 here, but they will be adjusted later depending
|
||||
+ on whether each register set is available or not. */
|
||||
static struct regset_info aarch64_regsets[] =
|
||||
{
|
||||
+ /* GPR registers. */
|
||||
{ PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS,
|
||||
- sizeof (struct user_pt_regs), GENERAL_REGS,
|
||||
+ 0, GENERAL_REGS,
|
||||
aarch64_fill_gregset, aarch64_store_gregset },
|
||||
+ /* Floating Point (FPU) registers. */
|
||||
{ PTRACE_GETREGSET, PTRACE_SETREGSET, NT_FPREGSET,
|
||||
- sizeof (struct user_fpsimd_state), FP_REGS,
|
||||
+ 0, FP_REGS,
|
||||
aarch64_fill_fpregset, aarch64_store_fpregset
|
||||
},
|
||||
+ /* Scalable Vector Extension (SVE) registers. */
|
||||
+ { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE,
|
||||
+ 0, EXTENDED_REGS,
|
||||
+ aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache
|
||||
+ },
|
||||
+ /* PAC registers. */
|
||||
{ PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK,
|
||||
- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS,
|
||||
- NULL, aarch64_store_pauthregset },
|
||||
+ 0, OPTIONAL_REGS,
|
||||
+ nullptr, aarch64_store_pauthregset },
|
||||
+ /* Tagged address control / MTE registers. */
|
||||
{ PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL,
|
||||
- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset,
|
||||
- aarch64_store_mteregset },
|
||||
+ 0, OPTIONAL_REGS,
|
||||
+ aarch64_fill_mteregset, aarch64_store_mteregset },
|
||||
NULL_REGSET
|
||||
};
|
||||
|
||||
@@ -752,47 +723,95 @@ static struct regsets_info aarch64_regsets_info =
|
||||
{
|
||||
aarch64_regsets, /* regsets */
|
||||
0, /* num_regsets */
|
||||
- NULL, /* disabled_regsets */
|
||||
+ nullptr, /* disabled_regsets */
|
||||
};
|
||||
|
||||
static struct regs_info regs_info_aarch64 =
|
||||
{
|
||||
- NULL, /* regset_bitmap */
|
||||
- NULL, /* usrregs */
|
||||
+ nullptr, /* regset_bitmap */
|
||||
+ nullptr, /* usrregs */
|
||||
&aarch64_regsets_info,
|
||||
};
|
||||
|
||||
-static struct regset_info aarch64_sve_regsets[] =
|
||||
+/* Given FEATURES, adjust the available register sets by setting their
|
||||
+ sizes. A size of 0 means the register set is disabled and won't be
|
||||
+ used. */
|
||||
+
|
||||
+static void
|
||||
+aarch64_adjust_register_sets (const struct aarch64_features &features)
|
||||
{
|
||||
- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_PRSTATUS,
|
||||
- sizeof (struct user_pt_regs), GENERAL_REGS,
|
||||
- aarch64_fill_gregset, aarch64_store_gregset },
|
||||
- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_SVE,
|
||||
- SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE), EXTENDED_REGS,
|
||||
- aarch64_sve_regs_copy_from_regcache, aarch64_sve_regs_copy_to_regcache
|
||||
- },
|
||||
- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_PAC_MASK,
|
||||
- AARCH64_PAUTH_REGS_SIZE, OPTIONAL_REGS,
|
||||
- NULL, aarch64_store_pauthregset },
|
||||
- { PTRACE_GETREGSET, PTRACE_SETREGSET, NT_ARM_TAGGED_ADDR_CTRL,
|
||||
- AARCH64_LINUX_SIZEOF_MTE, OPTIONAL_REGS, aarch64_fill_mteregset,
|
||||
- aarch64_store_mteregset },
|
||||
- NULL_REGSET
|
||||
-};
|
||||
+ struct regset_info *regset;
|
||||
|
||||
-static struct regsets_info aarch64_sve_regsets_info =
|
||||
- {
|
||||
- aarch64_sve_regsets, /* regsets. */
|
||||
- 0, /* num_regsets. */
|
||||
- NULL, /* disabled_regsets. */
|
||||
- };
|
||||
+ for (regset = aarch64_regsets; regset->size >= 0; regset++)
|
||||
+ {
|
||||
+ switch (regset->nt_type)
|
||||
+ {
|
||||
+ case NT_PRSTATUS:
|
||||
+ /* General purpose registers are always present. */
|
||||
+ regset->size = sizeof (struct user_pt_regs);
|
||||
+ break;
|
||||
+ case NT_FPREGSET:
|
||||
+ /* This is unavailable when SVE is present. */
|
||||
+ if (!features.sve)
|
||||
+ regset->size = sizeof (struct user_fpsimd_state);
|
||||
+ break;
|
||||
+ case NT_ARM_SVE:
|
||||
+ if (features.sve)
|
||||
+ regset->size = SVE_PT_SIZE (AARCH64_MAX_SVE_VQ, SVE_PT_REGS_SVE);
|
||||
+ break;
|
||||
+ case NT_ARM_PAC_MASK:
|
||||
+ if (features.pauth)
|
||||
+ regset->size = AARCH64_PAUTH_REGS_SIZE;
|
||||
+ break;
|
||||
+ case NT_ARM_TAGGED_ADDR_CTRL:
|
||||
+ if (features.mte)
|
||||
+ regset->size = AARCH64_LINUX_SIZEOF_MTE;
|
||||
+ break;
|
||||
+ default:
|
||||
+ gdb_assert_not_reached ("Unknown register set found.");
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
|
||||
-static struct regs_info regs_info_aarch64_sve =
|
||||
- {
|
||||
- NULL, /* regset_bitmap. */
|
||||
- NULL, /* usrregs. */
|
||||
- &aarch64_sve_regsets_info,
|
||||
- };
|
||||
+/* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h. */
|
||||
+#define AARCH64_HWCAP_PACA (1 << 30)
|
||||
+
|
||||
+/* Implementation of linux target ops method "low_arch_setup". */
|
||||
+
|
||||
+void
|
||||
+aarch64_target::low_arch_setup ()
|
||||
+{
|
||||
+ unsigned int machine;
|
||||
+ int is_elf64;
|
||||
+ int tid;
|
||||
+
|
||||
+ tid = lwpid_of (current_thread);
|
||||
+
|
||||
+ is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine);
|
||||
+
|
||||
+ if (is_elf64)
|
||||
+ {
|
||||
+ struct aarch64_features features;
|
||||
+
|
||||
+ uint64_t vq = aarch64_sve_get_vq (tid);
|
||||
+ features.sve = (vq > 0);
|
||||
+ /* A-profile PAC is 64-bit only. */
|
||||
+ features.pauth = linux_get_hwcap (8) & AARCH64_HWCAP_PACA;
|
||||
+ /* A-profile MTE is 64-bit only. */
|
||||
+ features.mte = linux_get_hwcap2 (8) & HWCAP2_MTE;
|
||||
+
|
||||
+ current_process ()->tdesc
|
||||
+ = aarch64_linux_read_description (vq, features.pauth, features.mte);
|
||||
+
|
||||
+ /* Adjust the register sets we should use for this particular set of
|
||||
+ features. */
|
||||
+ aarch64_adjust_register_sets (features);
|
||||
+ }
|
||||
+ else
|
||||
+ current_process ()->tdesc = aarch32_linux_read_description ();
|
||||
+
|
||||
+ aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread));
|
||||
+}
|
||||
|
||||
/* Implementation of linux target ops method "get_regs_info". */
|
||||
|
||||
@@ -802,9 +821,7 @@ aarch64_target::get_regs_info ()
|
||||
if (!is_64bit_tdesc ())
|
||||
return ®s_info_aarch32;
|
||||
|
||||
- if (is_sve_tdesc ())
|
||||
- return ®s_info_aarch64_sve;
|
||||
-
|
||||
+ /* AArch64 64-bit registers. */
|
||||
return ®s_info_aarch64;
|
||||
}
|
||||
|
||||
@@ -3294,5 +3311,4 @@ initialize_low_arch (void)
|
||||
initialize_low_arch_aarch32 ();
|
||||
|
||||
initialize_regsets_info (&aarch64_regsets_info);
|
||||
- initialize_regsets_info (&aarch64_sve_regsets_info);
|
||||
}
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@@ -9,6 +9,7 @@ GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net
|
||||
GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
|
||||
GENSIO_LICENSE_FILES = COPYING.LIB COPYING
|
||||
GENSIO_INSTALL_STAGING = YES
|
||||
GENSIO_DEPENDENCIES = $(if $(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),avahi)
|
||||
GENSIO_CONF_OPTS = \
|
||||
--without-openipmi \
|
||||
--without-swig \
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
# Locally calculated (fetched from Github)
|
||||
sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz
|
||||
sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz
|
||||
|
||||
# Hashes for license files
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
@@ -7,7 +7,7 @@
|
||||
# Generate version string using:
|
||||
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
|
||||
# When updating the version, please also update localedef
|
||||
GLIBC_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4
|
||||
GLIBC_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c
|
||||
# Upstream doesn't officially provide an https download link.
|
||||
# There is one (https://sourceware.org/git/glibc.git) but it's not reliable,
|
||||
# sometimes the connection times out. So use an unofficial github mirror.
|
||||
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
# From https://golang.org/dl/
|
||||
sha256 4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8 go1.17.6.src.tar.gz
|
||||
sha256 c108cd33b73b1911a02b697741df3dea43e01a5c4e08e409e8b3a0e3745d2b4d go1.17.7.src.tar.gz
|
||||
sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GO_VERSION = 1.17.6
|
||||
GO_VERSION = 1.17.7
|
||||
GO_SITE = https://storage.googleapis.com/golang
|
||||
GO_SOURCE = go$(GO_VERSION).src.tar.gz
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.5.tar.xz.sha256sum
|
||||
sha256 2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42 gst-omx-1.18.5.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.18.6.tar.xz.sha256sum
|
||||
sha256 b5281c938e959fd2418e989cfb6065fdd9fe5f6f87ee86236c9427166e708163 gst-omx-1.18.6.tar.xz
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST_OMX_VERSION = 1.18.5
|
||||
GST_OMX_VERSION = 1.18.6
|
||||
GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz
|
||||
GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.5.tar.xz.sha256sum
|
||||
sha256 fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079 gst-devtools-1.18.5.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.18.6.tar.xz.sha256sum
|
||||
sha256 3725622c740a635452e54b79d065f963ab7706ca2403de6c43072ae7610a0de4 gst-devtools-1.18.6.tar.xz
|
||||
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_DEVTOOLS_VERSION = 1.18.5
|
||||
GST1_DEVTOOLS_VERSION = 1.18.6
|
||||
GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz
|
||||
GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools
|
||||
GST1_DEVTOOLS_LICENSE = LGPL-2.1+
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.5.tar.xz.sha256sum
|
||||
sha256 822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548 gst-libav-1.18.5.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.18.6.tar.xz.sha256sum
|
||||
sha256 e4e50dcd5a29441ae34de60d2221057e8064ed824bb6ca4dc0fd9ee88fbe9b81 gst-libav-1.18.6.tar.xz
|
||||
sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_LIBAV_VERSION = 1.18.5
|
||||
GST1_LIBAV_VERSION = 1.18.6
|
||||
GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz
|
||||
GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav
|
||||
GST1_LIBAV_LICENSE = LGPL-2.0+
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz.sha256sum
|
||||
sha256 a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e gst-plugins-bad-1.18.5.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.6.tar.xz.sha256sum
|
||||
sha256 0b1b50ac6311f0c510248b6cd64d6d3c94369344828baa602db85ded5bc70ec9 gst-plugins-bad-1.18.6.tar.xz
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PLUGINS_BAD_VERSION = 1.18.5
|
||||
GST1_PLUGINS_BAD_VERSION = 1.18.6
|
||||
GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
|
||||
GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad
|
||||
GST1_PLUGINS_BAD_INSTALL_STAGING = YES
|
||||
|
||||
-45
@@ -1,45 +0,0 @@
|
||||
From 012ca1bcd234ee02f576dd58b1f09baba18b89b0 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 14 Dec 2020 07:42:55 +0100
|
||||
Subject: [PATCH] gst-libs/gst/video/gstvideoaggregator.c: fix build with gcc
|
||||
4.8
|
||||
|
||||
Fix the following build failure with gcc 4.8 which has been added with
|
||||
https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/d268c193ad39fb970351ed62898be806ebd0a71e:
|
||||
|
||||
../gst-libs/gst/video/gstvideoaggregator.c: In function 'gst_video_aggregator_init':
|
||||
../gst-libs/gst/video/gstvideoaggregator.c:2762:3: error: 'for' loop initial declarations are only allowed in C99 mode
|
||||
for (gint i = 0; i < gst_caps_get_size (src_template); i++) {
|
||||
^
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status:
|
||||
https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/974]
|
||||
---
|
||||
gst-libs/gst/video/gstvideoaggregator.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c
|
||||
index 2e3d813be..04dad6563 100644
|
||||
--- a/gst-libs/gst/video/gstvideoaggregator.c
|
||||
+++ b/gst-libs/gst/video/gstvideoaggregator.c
|
||||
@@ -2786,6 +2786,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg,
|
||||
{
|
||||
GstCaps *src_template;
|
||||
GstPadTemplate *pad_template;
|
||||
+ gint i;
|
||||
|
||||
vagg->priv = gst_video_aggregator_get_instance_private (vagg);
|
||||
vagg->priv->current_caps = NULL;
|
||||
@@ -2800,7 +2801,7 @@ gst_video_aggregator_init (GstVideoAggregator * vagg,
|
||||
pad_template =
|
||||
gst_element_class_get_pad_template (GST_ELEMENT_CLASS (klass), "src");
|
||||
src_template = gst_pad_template_get_caps (pad_template);
|
||||
- for (gint i = 0; i < gst_caps_get_size (src_template); i++) {
|
||||
+ for (i = 0; i < gst_caps_get_size (src_template); i++) {
|
||||
const GValue *v =
|
||||
gst_structure_get_value (gst_caps_get_structure (src_template, i),
|
||||
"format");
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.5.tar.xz.sha256sum
|
||||
sha256 960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3 gst-plugins-base-1.18.5.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.6.tar.xz.sha256sum
|
||||
sha256 56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b gst-plugins-base-1.18.6.tar.xz
|
||||
sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PLUGINS_BASE_VERSION = 1.18.5
|
||||
GST1_PLUGINS_BASE_VERSION = 1.18.6
|
||||
GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz
|
||||
GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base
|
||||
GST1_PLUGINS_BASE_INSTALL_STAGING = YES
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.5.tar.xz.sha256sum
|
||||
sha256 3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b gst-plugins-good-1.18.5.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.18.6.tar.xz.sha256sum
|
||||
sha256 26723ac01fcb360ade1f41d168c7c322d8af4ceb7e55c8c12ed2690d06a76eed gst-plugins-good-1.18.6.tar.xz
|
||||
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PLUGINS_GOOD_VERSION = 1.18.5
|
||||
GST1_PLUGINS_GOOD_VERSION = 1.18.6
|
||||
GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz
|
||||
GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good
|
||||
GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz.sha256sum
|
||||
sha256 df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9 gst-plugins-ugly-1.18.5.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.6.tar.xz.sha256sum
|
||||
sha256 4969c409cb6a88317d2108b8577108e18623b2333d7b587ae3f39459c70e3a7f gst-plugins-ugly-1.18.6.tar.xz
|
||||
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PLUGINS_UGLY_VERSION = 1.18.5
|
||||
GST1_PLUGINS_UGLY_VERSION = 1.18.6
|
||||
GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz
|
||||
GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly
|
||||
GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.5.tar.xz.sha256sum
|
||||
sha256 533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52 gst-python-1.18.5.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.6.tar.xz.sha256sum
|
||||
sha256 bdc0ea22fbd7335ad9decc151561aacc53c51206a9735b81eac700ce5b0bbd4a gst-python-1.18.6.tar.xz
|
||||
sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PYTHON_VERSION = 1.18.5
|
||||
GST1_PYTHON_VERSION = 1.18.6
|
||||
GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz
|
||||
GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python
|
||||
GST1_PYTHON_INSTALL_STAGING = YES
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.5.tar.xz.sha256sum
|
||||
sha256 04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f gst-rtsp-server-1.18.5.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.18.6.tar.xz.sha256sum
|
||||
sha256 826f32afbcf94b823541efcac4a0dacdb62f6145ef58f363095749f440262be9 gst-rtsp-server-1.18.6.tar.xz
|
||||
sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING
|
||||
sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING.LIB
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_RTSP_SERVER_VERSION = 1.18.5
|
||||
GST1_RTSP_SERVER_VERSION = 1.18.6
|
||||
GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz
|
||||
GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server
|
||||
GST1_RTSP_SERVER_LICENSE = LGPL-2.0+
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.5.tar.xz.sha256sum
|
||||
sha256 4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b gstreamer-vaapi-1.18.5.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.18.6.tar.xz.sha256sum
|
||||
sha256 ab6270f1e5e4546fbe6f5ea246d86ca3d196282eb863d46e6cdcc96f867449e0 gstreamer-vaapi-1.18.6.tar.xz
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_VAAPI_VERSION = 1.18.5
|
||||
GST1_VAAPI_VERSION = 1.18.6
|
||||
GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi
|
||||
GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz
|
||||
GST1_VAAPI_LICENSE = LGPL-2.1+
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.5.tar.xz.sha256sum
|
||||
sha256 8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5 gst-editing-services-1.18.5.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.6.tar.xz.sha256sum
|
||||
sha256 fe10d14ef896aa21038317f6f81e1158ccc6caaed9b0d5a29ae5bdd63074582c gst-editing-services-1.18.6.tar.xz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.5
|
||||
GSTREAMER1_EDITING_SERVICES_VERSION = 1.18.6
|
||||
GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz
|
||||
GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services
|
||||
GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.5.tar.xz.sha256sum
|
||||
sha256 55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a gstreamer-1.18.5.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.18.6.tar.xz.sha256sum
|
||||
sha256 4ec816010dd4d3a93cf470ad0a6f25315f52b204eb1d71dfa70ab8a1c3bd06e6 gstreamer-1.18.6.tar.xz
|
||||
sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GSTREAMER1_VERSION = 1.18.5
|
||||
GSTREAMER1_VERSION = 1.18.6
|
||||
GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz
|
||||
GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer
|
||||
GSTREAMER1_INSTALL_STAGING = YES
|
||||
|
||||
@@ -11,8 +11,6 @@ JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library)
|
||||
JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL
|
||||
JACK1_INSTALL_STAGING = YES
|
||||
|
||||
# Dependency to celt can't be met: jack1 requires celt >= 0.8.0 but we
|
||||
# only have 0.5.1.3 and we cannot upgrade.
|
||||
JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile
|
||||
|
||||
ifeq ($(BR2_PACKAGE_READLINE),y)
|
||||
|
||||
@@ -14,4 +14,9 @@ KF5_EXTRA_CMAKE_MODULES_DEPENDENCIES = host-pkgconf
|
||||
KF5_EXTRA_CMAKE_MODULES_INSTALL_STAGING = YES
|
||||
KF5_EXTRA_CMAKE_MODULES_INSTALL_TARGET = NO
|
||||
|
||||
KF5_EXTRA_CMAKE_MODULES_CONF_OPTS += \
|
||||
-DBUILD_HTML_DOCS=OFF \
|
||||
-DBUILD_MAN_DOCS=OFF \
|
||||
-DBUILD_QTHELP_DOCS=OFF
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
@@ -134,6 +134,10 @@ config BR2_PACKAGE_KODI_BLUEZ
|
||||
help
|
||||
Enable bluetooth support
|
||||
|
||||
comment "bluetooth support needs a toolchain w/ headers >= 3.4"
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
|
||||
|
||||
config BR2_PACKAGE_KODI_DBUS
|
||||
bool "dbus"
|
||||
select BR2_PACKAGE_DBUS
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From https://www.libarchive.de/downloads/sha256sums
|
||||
sha256 f0b19ff39c3c9a5898a219497ababbadab99d8178acc980155c7e1271089b5a0 libarchive-3.5.2.tar.xz
|
||||
sha256 5cac725dd4be31c4a10b65d30f29dc957ea29ef3d758df6e46e8ae90a996a19a libarchive-3.5.3.tar.xz
|
||||
# Locally computed:
|
||||
sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBARCHIVE_VERSION = 3.5.2
|
||||
LIBARCHIVE_VERSION = 3.5.3
|
||||
LIBARCHIVE_SOURCE = libarchive-$(LIBARCHIVE_VERSION).tar.xz
|
||||
LIBARCHIVE_SITE = https://www.libarchive.de/downloads
|
||||
LIBARCHIVE_INSTALL_STAGING = YES
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3-6-0.tar.gz
|
||||
sha256 0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197 lm-sensors-3.6.0.tar.gz
|
||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL
|
||||
|
||||
@@ -4,8 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LM_SENSORS_VERSION = 3-6-0
|
||||
LM_SENSORS_SITE = $(call github,lm-sensors,lm-sensors,V$(LM_SENSORS_VERSION))
|
||||
LM_SENSORS_VERSION = 3.6.0
|
||||
LM_SENSORS_SITE = \
|
||||
$(call github,lm-sensors,lm-sensors,V$(subst .,-,$(LM_SENSORS_VERSION)))
|
||||
LM_SENSORS_INSTALL_STAGING = YES
|
||||
LM_SENSORS_DEPENDENCIES = host-bison host-flex
|
||||
LM_SENSORS_LICENSE = LGPL-2.1+ (libsensors), GPL-2.0+ (programs)
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
# Locally calculated (fetched from Github)
|
||||
sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz
|
||||
sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz
|
||||
|
||||
# Hashes for license files
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
@@ -7,7 +7,7 @@
|
||||
# Use the same VERSION and SITE as target glibc
|
||||
# As in glibc.mk, generate version string using:
|
||||
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
|
||||
LOCALEDEF_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4
|
||||
LOCALEDEF_VERSION = 2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c
|
||||
LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz
|
||||
LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION))
|
||||
HOST_LOCALEDEF_DL_SUBDIR = glibc
|
||||
|
||||
@@ -1,189 +0,0 @@
|
||||
From 249dd85494a430d95fd69d89f42b02fd950cda51 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Middleton <rm5248@users.noreply.github.com>
|
||||
Date: Thu, 22 Jul 2021 15:27:50 -0700
|
||||
Subject: [PATCH] LOGCXX-528 (#66)
|
||||
|
||||
Fixes for checking that C++11 is available. Fix for older compilers.
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/apache/logging-log4cxx/commit/249dd85494a430d95fd69d89f42b02fd950cda51]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 10 +++++++++
|
||||
src/cmake/boost-fallback/boost-fallback.cmake | 21 ++++++++++---------
|
||||
src/main/cpp/hierarchy.cpp | 4 ++--
|
||||
src/main/include/CMakeLists.txt | 2 +-
|
||||
.../log4cxx/helpers/appenderattachableimpl.h | 1 +
|
||||
.../include/log4cxx/helpers/aprinitializer.h | 1 +
|
||||
src/main/include/log4cxx/helpers/loglog.h | 1 +
|
||||
.../include/log4cxx/helpers/serversocket.h | 1 +
|
||||
src/main/include/log4cxx/level.h | 1 +
|
||||
src/main/include/log4cxx/rolling/action.h | 1 +
|
||||
10 files changed, 30 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e5b44ef1a..9c6e63902 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -41,6 +41,9 @@ if( NOT "${CMAKE_CXX_STANDARD}")
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
endif()
|
||||
|
||||
+# Don't allow for compiler-specific extensions
|
||||
+set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
+
|
||||
# Building
|
||||
add_subdirectory(src)
|
||||
|
||||
@@ -185,6 +188,13 @@ if(APACHE_MAINTAINER)
|
||||
)
|
||||
endif()
|
||||
|
||||
+#
|
||||
+# Check for any fatal configuration errors
|
||||
+#
|
||||
+if( "${SHARED_MUTEX_IMPL}" STREQUAL "NONE" )
|
||||
+ message( FATAL_ERROR "No shared_mutex implementation found. Requires Boost or C++17" )
|
||||
+endif()
|
||||
+
|
||||
#
|
||||
# Output configuration information
|
||||
# Similar to APR CMake configuration
|
||||
diff --git a/src/cmake/boost-fallback/boost-fallback.cmake b/src/cmake/boost-fallback/boost-fallback.cmake
|
||||
index a8d7d441b..8285b0b99 100644
|
||||
--- a/src/cmake/boost-fallback/boost-fallback.cmake
|
||||
+++ b/src/cmake/boost-fallback/boost-fallback.cmake
|
||||
@@ -56,16 +56,17 @@ try_compile(STD_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests"
|
||||
"${CMAKE_CURRENT_LIST_DIR}/test-stdatomic.cpp")
|
||||
|
||||
find_package(Boost COMPONENTS thread)
|
||||
-try_compile(Boost_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests"
|
||||
- "${CMAKE_CURRENT_LIST_DIR}/test-boostsharedptr.cpp")
|
||||
-try_compile(Boost_MUTEX_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests"
|
||||
- "${CMAKE_CURRENT_LIST_DIR}/test-boostmutex.cpp")
|
||||
-try_compile(Boost_SHARED_MUTEX_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests"
|
||||
- "${CMAKE_CURRENT_LIST_DIR}/test-boostsharedmutex.cpp"
|
||||
- LINK_LIBRARIES Threads::Threads
|
||||
-)
|
||||
-try_compile(Boost_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests"
|
||||
- "${CMAKE_CURRENT_LIST_DIR}/test-boostatomic.cpp")
|
||||
+if( ${Boost_FOUND} )
|
||||
+ try_compile(Boost_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests"
|
||||
+ "${CMAKE_CURRENT_LIST_DIR}/test-boostsharedptr.cpp")
|
||||
+ try_compile(Boost_MUTEX_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests"
|
||||
+ "${CMAKE_CURRENT_LIST_DIR}/test-boostmutex.cpp")
|
||||
+ try_compile(Boost_SHARED_MUTEX_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests"
|
||||
+ "${CMAKE_CURRENT_LIST_DIR}/test-boostsharedmutex.cpp"
|
||||
+ LINK_LIBRARIES Threads::Threads Boost::thread)
|
||||
+ try_compile(Boost_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests"
|
||||
+ "${CMAKE_CURRENT_LIST_DIR}/test-boostatomic.cpp")
|
||||
+endif( ${Boost_FOUND} )
|
||||
|
||||
# Link the target with the appropriate boost libraries(if required)
|
||||
function(boostfallback_link target)
|
||||
diff --git a/src/main/cpp/hierarchy.cpp b/src/main/cpp/hierarchy.cpp
|
||||
index 4f5174448..c70d39dbb 100644
|
||||
--- a/src/main/cpp/hierarchy.cpp
|
||||
+++ b/src/main/cpp/hierarchy.cpp
|
||||
@@ -223,7 +223,7 @@ LoggerPtr Hierarchy::getLogger(const LogString& name,
|
||||
else
|
||||
{
|
||||
LoggerPtr logger(factory->makeNewLoggerInstance(pool, name));
|
||||
- logger->setHierarchy(weak_from_this());
|
||||
+ logger->setHierarchy(shared_from_this());
|
||||
loggers->insert(LoggerMap::value_type(name, logger));
|
||||
|
||||
ProvisionNodeMap::iterator it2 = provisionNodes->find(name);
|
||||
@@ -423,6 +423,6 @@ void Hierarchy::configureRoot(){
|
||||
// LOGCXX-322 we need to turn the repositroy into a weak_ptr, and we
|
||||
// can't use weak_from_this() in the constructor.
|
||||
if( !root->getLoggerRepository().lock() ){
|
||||
- root->setHierarchy(weak_from_this());
|
||||
+ root->setHierarchy(shared_from_this());
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/include/CMakeLists.txt b/src/main/include/CMakeLists.txt
|
||||
index 8183660a5..584941c97 100644
|
||||
--- a/src/main/include/CMakeLists.txt
|
||||
+++ b/src/main/include/CMakeLists.txt
|
||||
@@ -133,7 +133,7 @@ if( ${STD_SHARED_MUTEX_FOUND} )
|
||||
elseif( ${Boost_SHARED_MUTEX_FOUND} )
|
||||
set( SHARED_MUTEX_IMPL "boost::shared_mutex" )
|
||||
else()
|
||||
- set( SMART_PTR_IMPL "NONE" )
|
||||
+ set( SHARED_MUTEX_IMPL "NONE" )
|
||||
endif()
|
||||
|
||||
if( ${STD_ATOMIC_FOUND} )
|
||||
diff --git a/src/main/include/log4cxx/helpers/appenderattachableimpl.h b/src/main/include/log4cxx/helpers/appenderattachableimpl.h
|
||||
index 40e77d93c..b80b5aade 100644
|
||||
--- a/src/main/include/log4cxx/helpers/appenderattachableimpl.h
|
||||
+++ b/src/main/include/log4cxx/helpers/appenderattachableimpl.h
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <log4cxx/helpers/object.h>
|
||||
#include <log4cxx/helpers/pool.h>
|
||||
#include <log4cxx/log4cxx.h>
|
||||
+#include <mutex>
|
||||
|
||||
namespace log4cxx
|
||||
{
|
||||
diff --git a/src/main/include/log4cxx/helpers/aprinitializer.h b/src/main/include/log4cxx/helpers/aprinitializer.h
|
||||
index 6f3f55070..fccd18e0f 100644
|
||||
--- a/src/main/include/log4cxx/helpers/aprinitializer.h
|
||||
+++ b/src/main/include/log4cxx/helpers/aprinitializer.h
|
||||
@@ -30,6 +30,7 @@ extern "C" {
|
||||
}
|
||||
|
||||
#include <apr_time.h>
|
||||
+#include <mutex>
|
||||
|
||||
namespace log4cxx
|
||||
{
|
||||
diff --git a/src/main/include/log4cxx/helpers/loglog.h b/src/main/include/log4cxx/helpers/loglog.h
|
||||
index d54785ddc..a4c92416a 100644
|
||||
--- a/src/main/include/log4cxx/helpers/loglog.h
|
||||
+++ b/src/main/include/log4cxx/helpers/loglog.h
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include <log4cxx/logstring.h>
|
||||
#include <exception>
|
||||
+#include <mutex>
|
||||
|
||||
namespace log4cxx
|
||||
{
|
||||
diff --git a/src/main/include/log4cxx/helpers/serversocket.h b/src/main/include/log4cxx/helpers/serversocket.h
|
||||
index e6e6d475e..7da75b969 100644
|
||||
--- a/src/main/include/log4cxx/helpers/serversocket.h
|
||||
+++ b/src/main/include/log4cxx/helpers/serversocket.h
|
||||
@@ -19,6 +19,7 @@
|
||||
#define _LOG4CXX_HELPERS_SERVER_SOCKET_H
|
||||
|
||||
#include <log4cxx/helpers/socket.h>
|
||||
+#include <mutex>
|
||||
|
||||
namespace log4cxx
|
||||
{
|
||||
diff --git a/src/main/include/log4cxx/level.h b/src/main/include/log4cxx/level.h
|
||||
index 4ca4bf28c..7848c902a 100644
|
||||
--- a/src/main/include/log4cxx/level.h
|
||||
+++ b/src/main/include/log4cxx/level.h
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <log4cxx/logstring.h>
|
||||
#include <limits.h>
|
||||
#include <log4cxx/helpers/object.h>
|
||||
+#include <mutex>
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#pragma warning ( push )
|
||||
diff --git a/src/main/include/log4cxx/rolling/action.h b/src/main/include/log4cxx/rolling/action.h
|
||||
index 0e8d55f36..fc4497813 100644
|
||||
--- a/src/main/include/log4cxx/rolling/action.h
|
||||
+++ b/src/main/include/log4cxx/rolling/action.h
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <log4cxx/portability.h>
|
||||
#include <log4cxx/helpers/object.h>
|
||||
#include <log4cxx/helpers/pool.h>
|
||||
+#include <mutex>
|
||||
|
||||
namespace log4cxx
|
||||
{
|
||||
@@ -0,0 +1,36 @@
|
||||
From 24e7adc8d67b3c8f7d275b4f9a7e70a61b73fcd4 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Fri, 28 Jan 2022 13:11:01 +0100
|
||||
Subject: [PATCH] boost-fallback: only check for boost if really needed
|
||||
|
||||
- only check for boost if really needed (in case of legacy c++ standard < c++17)
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/cmake/boost-fallback/boost-fallback.cmake | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/cmake/boost-fallback/boost-fallback.cmake b/src/cmake/boost-fallback/boost-fallback.cmake
|
||||
index 8285b0b9..0ecf8c6c 100644
|
||||
--- a/src/cmake/boost-fallback/boost-fallback.cmake
|
||||
+++ b/src/cmake/boost-fallback/boost-fallback.cmake
|
||||
@@ -55,6 +55,8 @@ try_compile(STD_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tes
|
||||
try_compile(STD_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests"
|
||||
"${CMAKE_CURRENT_LIST_DIR}/test-stdatomic.cpp")
|
||||
|
||||
+# search for boost only in case needed for legacy c++ standard < c++17
|
||||
+if(NOT ${STD_THREAD_FOUND} OR NOT ${STD_MUTEX_FOUND} OR NOT ${STD_SHARED_MUTEX_FOUND} OR NOT ${STD_SHARED_PTR_FOUND} OR NOT ${STD_ATOMIC_FOUND})
|
||||
find_package(Boost COMPONENTS thread)
|
||||
if( ${Boost_FOUND} )
|
||||
try_compile(Boost_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests"
|
||||
@@ -67,6 +69,7 @@ if( ${Boost_FOUND} )
|
||||
try_compile(Boost_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests"
|
||||
"${CMAKE_CURRENT_LIST_DIR}/test-boostatomic.cpp")
|
||||
endif( ${Boost_FOUND} )
|
||||
+endif()
|
||||
|
||||
# Link the target with the appropriate boost libraries(if required)
|
||||
function(boostfallback_link target)
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From https://www.apache.org/dist/logging/log4cxx/0.12.0/apache-log4cxx-0.12.0.tar.gz.sha512
|
||||
sha512 00fe571f9c511bf93b17cac8269ce00f7e817e8d723acf62bddff1bbe0e7facd0ab2fd75c01a93870f7e5c66718b2b73fc22c5f193bfd204e34d052b1123e60d apache-log4cxx-0.12.0.tar.gz
|
||||
# From https://www.apache.org/dist/logging/log4cxx/0.12.1/apache-log4cxx-0.12.1.tar.gz.sha512
|
||||
sha512 807058734cebf7c92e99484313becbc6be63e48bd930889c733318bb78dfec498b66aaa12255ed30879abb005b32e2b965f9dd87ec50d0421ca067f3f66280d9 apache-log4cxx-0.12.1.tar.gz
|
||||
# Locally computed
|
||||
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LOG4CXX_VERSION = 0.12.0
|
||||
LOG4CXX_SITE = http://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION)
|
||||
LOG4CXX_VERSION = 0.12.1
|
||||
LOG4CXX_SITE = https://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION)
|
||||
LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz
|
||||
LOG4CXX_INSTALL_STAGING = YES
|
||||
LOG4CXX_LICENSE = Apache-2.0
|
||||
|
||||
@@ -11,6 +11,8 @@ MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR)
|
||||
MPD_DEPENDENCIES = host-pkgconf boost
|
||||
MPD_LICENSE = GPL-2.0+
|
||||
MPD_LICENSE_FILES = COPYING
|
||||
# these refer to the FreeBSD PPP daemon
|
||||
MPD_IGNORE_CVES = CVE-2020-7465 CVE-2020-7466
|
||||
MPD_SELINUX_MODULES = mpd
|
||||
MPD_CONF_OPTS = \
|
||||
-Daudiofile=disabled \
|
||||
|
||||
@@ -114,7 +114,7 @@ define NFS_UTILS_REMOVE_NFSIOSTAT
|
||||
endef
|
||||
|
||||
# nfsiostat is interpreted python, so remove it unless it's in the target
|
||||
NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT)
|
||||
NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON3),,NFS_UTILS_REMOVE_NFSIOSTAT)
|
||||
|
||||
define HOST_NFS_UTILS_BUILD_CMDS
|
||||
$(MAKE) -C $(@D)/tools/rpcgen
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://www.php.net/downloads.php
|
||||
sha256 fbde8247ac200e4de73449d9fefc8b495d323b5be9c10cdb645fb431c91156e3 php-8.0.14.tar.xz
|
||||
sha256 5f33544061d37d805a2a9ce791f081ef08a7155bd7ba2362e69bba2d06b0f8b2 php-8.0.15.tar.xz
|
||||
|
||||
# License file
|
||||
sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PHP_VERSION = 8.0.14
|
||||
PHP_VERSION = 8.0.15
|
||||
PHP_SITE = https://www.php.net/distributions
|
||||
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
|
||||
PHP_INSTALL_STAGING = YES
|
||||
|
||||
@@ -5,6 +5,7 @@ config BR2_PACKAGE_PISTACHE
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_TOOLCHAIN_USES_UCLIBC
|
||||
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597
|
||||
help
|
||||
Pistache is a modern and elegant HTTP and REST framework
|
||||
for C++. It is entirely written in pure C++14 and provides
|
||||
@@ -12,9 +13,10 @@ config BR2_PACKAGE_PISTACHE
|
||||
|
||||
https://github.com/oktal/pistache
|
||||
|
||||
comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar"
|
||||
comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar, not binutils bug 27597"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || \
|
||||
BR2_TOOLCHAIN_USES_UCLIBC || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_USE_WCHAR
|
||||
BR2_TOOLCHAIN_USES_UCLIBC || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_USE_WCHAR || \
|
||||
BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597
|
||||
|
||||
@@ -10,7 +10,6 @@ PKCS11_HELPER_SITE = https://github.com/OpenSC/pkcs11-helper/releases/download/p
|
||||
PKCS11_HELPER_LICENSE = GPL-2.0 or BSD-3-Clause
|
||||
PKCS11_HELPER_LICENSE_FILES = COPYING COPYING.BSD COPYING.GPL
|
||||
PKCS11_HELPER_DEPENDENCIES = host-pkgconf
|
||||
PKCS11_HELPER_AUTORECONF = YES
|
||||
PKCS11_HELPER_INSTALL_STAGING = YES
|
||||
|
||||
PKCS11_HELPER_CONF_OPTS = \
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
# Locally computed:
|
||||
md5 64a99571a5de84ace24d8142a1556d68 prosody-0.11.12.tar.gz
|
||||
sha1 64c918439c2df130204dcd86398832cb7a481eb3 prosody-0.11.12.tar.gz
|
||||
sha256 56cd52d820f5b3ed37e02d8a2577aa064bbc04db8e87fd18a6020eba0c10560d prosody-0.11.12.tar.gz
|
||||
sha512 cd03ee8b02ffaa478b5329d9942d833cfed2d8bf720bf580a2082d681e7d333bc34f45041cea7234bee75f1a0e7c07983a685fe2ac9b31d51a0dbb36e87ba5d2 prosody-0.11.12.tar.gz
|
||||
md5 7214ee57d4702585bd0d3428e69790b4 prosody-0.11.13.tar.gz
|
||||
sha1 1cc5a72d98738872d0c1a4c34b1fcb8878348c7d prosody-0.11.13.tar.gz
|
||||
sha256 39c61b346a09b5125b604cb969e14206cbbcb86c81156ffc6ba2d62527cf0432 prosody-0.11.13.tar.gz
|
||||
sha512 7616785536b7b51767a26963a80c961ef2403609e1e78dda3f88cf68c00d5bb899278c70a22b006b58c36c62cbb1bbd390a9298bad5b8d6524928a1cd5457813 prosody-0.11.13.tar.gz
|
||||
|
||||
# Hash for license file:
|
||||
sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PROSODY_VERSION = 0.11.12
|
||||
PROSODY_VERSION = 0.11.13
|
||||
PROSODY_SITE = https://prosody.im/downloads/source
|
||||
PROSODY_LICENSE = MIT
|
||||
PROSODY_LICENSE_FILES = COPYING
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# md5, sha256 from https://pypi.org/pypi/django/json
|
||||
md5 6c4a53d2ccb464bc3dd772c6f2f07df9 Django-3.2.11.tar.gz
|
||||
sha256 69c94abe5d6b1b088bf475e09b7b74403f943e34da107e798465d2045da27e75 Django-3.2.11.tar.gz
|
||||
md5 1847b2f286930a9d84e820a757e3a7ec Django-3.2.12.tar.gz
|
||||
sha256 9772e6935703e59e993960832d66a614cf0233a1c5123bc6224ecc6ad69e41e2 Django-3.2.12.tar.gz
|
||||
# Locally computed sha256 checksums
|
||||
sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_DJANGO_VERSION = 3.2.11
|
||||
PYTHON_DJANGO_VERSION = 3.2.12
|
||||
PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz
|
||||
# The official Django site has an unpractical URL
|
||||
PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/20/86/e4348aac45bc83fc8e9dda2cfd81004b007c65b68c1499a4233acabdaa3b
|
||||
PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/83/d9/7f28811ff78ce1903dc9a32ac439e4e6c98298cd2e99cb01f528e51dd796
|
||||
|
||||
PYTHON_DJANGO_LICENSE = BSD-3-Clause
|
||||
PYTHON_DJANGO_LICENSE_FILES = LICENSE
|
||||
|
||||
@@ -9,5 +9,4 @@ config BR2_PACKAGE_PYTHON_PYZMQ
|
||||
http://zeromq.org/bindings:python
|
||||
|
||||
comment "python-pyzmq needs a toolchain w/ C++, threads"
|
||||
depends on BR2_PACKAGE_PYTHON
|
||||
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
# md5, sha256 from https://pypi.org/pypi/regex/json
|
||||
md5 cd206281327b4c087bb20bf93cee4ab9 regex-2021.4.4.tar.gz
|
||||
sha256 52ba3d3f9b942c49d7e4bc105bb28551c44065f139a65062ab7912bef10c9afb regex-2021.4.4.tar.gz
|
||||
# Locally computed sha256 checksums
|
||||
sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt
|
||||
|
||||
@@ -9,6 +9,7 @@ PYTHON_REGEX_VERSION = 2021.4.4
|
||||
PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz
|
||||
PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f
|
||||
PYTHON_REGEX_SETUP_TYPE = setuptools
|
||||
PYTHON_REGEX_LICENSE = CNRI-Python
|
||||
PYTHON_REGEX_LICENSE = Apache-2.0
|
||||
PYTHON_REGEX_LICENSE_FILES = LICENSE.txt
|
||||
|
||||
$(eval $(python-package))
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
config BR2_PACKAGE_PYTHON_SQLITESCHEMA
|
||||
bool "python-sqliteschema"
|
||||
depends on BR2_PACKAGE_PYTHON3 # python-mbstrdecoder
|
||||
depends on BR2_PACKAGE_PYTHON3
|
||||
select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
|
||||
select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime
|
||||
select BR2_PACKAGE_PYTHON_SIX # runtime
|
||||
select BR2_PACKAGE_PYTHON_TABLEDATA # runtime
|
||||
select BR2_PACKAGE_PYTHON_TYPEPY # runtime
|
||||
help
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# md5, sha256 from https://pypi.org/pypi/sqliteschema/json
|
||||
md5 ca70006e289f1d506124de779ed73d64 sqliteschema-1.2.0.tar.gz
|
||||
sha256 4c18f141239c58b6dbdc69130be41ed9740d8209a7ab6d529ba982a8b79c071a sqliteschema-1.2.0.tar.gz
|
||||
md5 4fb0130e7cc60d92be468091fbfc3d51 sqliteschema-1.2.1.tar.gz
|
||||
sha256 dde195bd7bc70d5841bc01dff20ec23bd43be87d760d2dfc7c7f2e5fd3808ef3 sqliteschema-1.2.1.tar.gz
|
||||
# Locally computed sha256 checksums
|
||||
sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_SQLITESCHEMA_VERSION = 1.2.0
|
||||
PYTHON_SQLITESCHEMA_VERSION = 1.2.1
|
||||
PYTHON_SQLITESCHEMA_SOURCE = sqliteschema-$(PYTHON_SQLITESCHEMA_VERSION).tar.gz
|
||||
PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/5c/d3/0c2e4c989a8d45f9443e431d7cbf89af4aba719fb0647b5f722716ef3990
|
||||
PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/85/f8/be54d4bebf551cb533d1dea11c3bf165a1a408c2a1cceb1f9724aadd9967
|
||||
PYTHON_SQLITESCHEMA_SETUP_TYPE = setuptools
|
||||
PYTHON_SQLITESCHEMA_LICENSE = MIT
|
||||
PYTHON_SQLITESCHEMA_LICENSE_FILES = LICENSE
|
||||
|
||||
@@ -0,0 +1,95 @@
|
||||
From be76b10a50749e2e11dce8dcc38b414a7f9d8747 Mon Sep 17 00:00:00 2001
|
||||
From: Ben Walden <bwalden@redboxvoice.com>
|
||||
Date: Sat, 22 Aug 2020 23:14:11 +0100
|
||||
Subject: [PATCH] Fix some issue compiling with Visual Studio 16.7.0 and tidy
|
||||
up Visual Studio 16 project files
|
||||
|
||||
[Retrieved (and updated to keep only RendKa.cxx update) from:
|
||||
https://github.com/resiprocate/resiprocate/commit/be76b10a50749e2e11dce8dcc38b414a7f9d8747]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
VisualStudioReadme.htm | 65 +
|
||||
contrib/GeoIP/GeoIP_12_0.vcxproj | 550 -------
|
||||
contrib/GeoIP/GeoIP_16_0.vcxproj | 93 +-
|
||||
.../db/build_windows/db_static_12_0.vcxproj | 1260 -----------------
|
||||
.../db/build_windows/db_static_16_0.vcxproj | 696 +--------
|
||||
contrib/db/dbinc/atomic.h | 4 +-
|
||||
contrib/db/mp/mp_fget.c | 4 +-
|
||||
contrib/db/mp/mp_mvcc.c | 4 +-
|
||||
contrib/db/mp/mp_region.c | 4 +-
|
||||
contrib/db/mutex/mut_method.c | 2 +-
|
||||
contrib/pcre/pcre_12_0.vcxproj | 466 ------
|
||||
contrib/pcre/pcre_16_0.vcxproj | 159 +--
|
||||
contrib/popt/popt_12_0.vcxproj | 394 ------
|
||||
contrib/popt/popt_16_0.vcxproj | 120 +-
|
||||
reSIProcate_16_0.sln | 58 +-
|
||||
.../queuetostream_12_0.vcxproj | 582 --------
|
||||
.../queuetostream_16_0.vcxproj | 207 ++-
|
||||
repro/repro_12_0.vcxproj | 825 -----------
|
||||
repro/repro_12_0.vcxproj.filters | 47 -
|
||||
repro/repro_16_0.vcxproj | 159 ++-
|
||||
repro/reprocmd/reprocmd_12_0.vcxproj | 597 --------
|
||||
repro/reprocmd/reprocmd_16_0.vcxproj | 139 +-
|
||||
repro/reprolib_12_0.vcxproj | 596 --------
|
||||
repro/reprolib_12_0.vcxproj.filters | 136 --
|
||||
repro/reprolib_16_0.vcxproj | 132 +-
|
||||
resip/dum/dum_12_0.vcxproj | 615 --------
|
||||
resip/dum/dum_16_0.vcxproj | 124 +-
|
||||
resip/dum/test/basicCall_12_0.vcxproj | 621 --------
|
||||
resip/dum/test/basicCall_16_0.vcxproj | 145 +-
|
||||
resip/dum/test/basicClient_12_0.vcxproj | 653 ---------
|
||||
resip/dum/test/basicClient_16_0.vcxproj | 158 +--
|
||||
resip/dum/test/basicMessage_12_0.vcxproj | 615 --------
|
||||
resip/dum/test/basicMessage_16_0.vcxproj | 141 +-
|
||||
resip/dum/test/basicRegister_12_0.vcxproj | 615 --------
|
||||
resip/dum/test/basicRegister_16_0.vcxproj | 137 +-
|
||||
resip/rend/RendKa.cxx | 2 +-
|
||||
resip/rend/rend_12_0.vcxproj | 352 -----
|
||||
resip/rend/rend_16_0.vcxproj | 89 +-
|
||||
resip/stack/resiprocate_12_0.vcxproj | 873 ------------
|
||||
resip/stack/resiprocate_12_0.vcxproj.filters | 351 -----
|
||||
resip/stack/resiprocate_16_0.vcxproj | 165 ++-
|
||||
resip/stack/test/test_12_0.vcxproj | 627 --------
|
||||
resip/stack/test/test_16_0.vcxproj | 171 ++-
|
||||
rutil/dns/ares/ares_12_0.vcxproj | 488 -------
|
||||
rutil/dns/ares/ares_12_0.vcxproj.filters | 34 -
|
||||
rutil/dns/ares/ares_16_0.vcxproj | 159 +--
|
||||
rutil/rutil_12_0.vcxproj | 604 --------
|
||||
rutil/rutil_16_0.vcxproj | 153 +-
|
||||
48 files changed, 1409 insertions(+), 13782 deletions(-)
|
||||
delete mode 100644 contrib/GeoIP/GeoIP_12_0.vcxproj
|
||||
delete mode 100644 contrib/db/build_windows/db_static_12_0.vcxproj
|
||||
delete mode 100644 contrib/pcre/pcre_12_0.vcxproj
|
||||
delete mode 100644 contrib/popt/popt_12_0.vcxproj
|
||||
delete mode 100644 repro/accountingconsumers/queuetostream_12_0.vcxproj
|
||||
delete mode 100644 repro/repro_12_0.vcxproj
|
||||
delete mode 100644 repro/repro_12_0.vcxproj.filters
|
||||
delete mode 100644 repro/reprocmd/reprocmd_12_0.vcxproj
|
||||
delete mode 100644 repro/reprolib_12_0.vcxproj
|
||||
delete mode 100644 repro/reprolib_12_0.vcxproj.filters
|
||||
delete mode 100644 resip/dum/dum_12_0.vcxproj
|
||||
delete mode 100644 resip/dum/test/basicCall_12_0.vcxproj
|
||||
delete mode 100644 resip/dum/test/basicClient_12_0.vcxproj
|
||||
delete mode 100644 resip/dum/test/basicMessage_12_0.vcxproj
|
||||
delete mode 100644 resip/dum/test/basicRegister_12_0.vcxproj
|
||||
delete mode 100644 resip/rend/rend_12_0.vcxproj
|
||||
delete mode 100644 resip/stack/resiprocate_12_0.vcxproj
|
||||
delete mode 100644 resip/stack/resiprocate_12_0.vcxproj.filters
|
||||
delete mode 100644 resip/stack/test/test_12_0.vcxproj
|
||||
delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj
|
||||
delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj.filters
|
||||
delete mode 100644 rutil/rutil_12_0.vcxproj
|
||||
|
||||
diff --git a/resip/rend/RendKa.cxx b/resip/rend/RendKa.cxx
|
||||
index 8645f17636..8321ada1ee 100644
|
||||
--- a/resip/rend/RendKa.cxx
|
||||
+++ b/resip/rend/RendKa.cxx
|
||||
@@ -66,7 +66,7 @@ bool operator<(const RendKaAssoc& a, const RendKaAssoc& b)
|
||||
|
||||
struct RendKaConn
|
||||
{
|
||||
- bool operator() (const RendKaAssocPtr& a, const RendKaAssocPtr& b)
|
||||
+ bool operator()(const RendKaAssocPtr& a, const RendKaAssocPtr& b) const
|
||||
{
|
||||
return *a < *b;
|
||||
}
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally computed
|
||||
sha256 4c7314dccebda1e55ec8dcf0d5ca8915c2490d17a9f56923f25e6e0e945c10cc rtl8723bu-9ce1c38439f4f574bb7adaf33949835c25536a28.tar.gz
|
||||
sha256 1cd658742ce10b21c92877e09cecc98880680d5f150de3845553005abc542977 rtl8723bu-19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3.tar.gz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
RTL8723BU_VERSION = 9ce1c38439f4f574bb7adaf33949835c25536a28
|
||||
RTL8723BU_VERSION = 19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3
|
||||
RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION))
|
||||
RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs)
|
||||
|
||||
@@ -13,7 +13,7 @@ RTL8723BU_MODULE_MAKE_OPTS = \
|
||||
KSRC=$(LINUX_DIR)
|
||||
|
||||
define RTL8723BU_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -D -m 644 $(@D)/rtl8723b_fw.bin $(TARGET_DIR)/lib/firmware/rtlwifi/rtl8723b_fw.bin
|
||||
$(INSTALL) -D -m 644 $(@D)/rtl8723b_fw.bin $(TARGET_DIR)/lib/firmware/rtl_bt/rtl8723b_fw.bin
|
||||
endef
|
||||
|
||||
$(eval $(kernel-module))
|
||||
|
||||
@@ -14,7 +14,7 @@ config BR2_PACKAGE_THERMALD
|
||||
reaches a certain threshold, the Linux daemon activates
|
||||
various cooling methods to try to cool the system.
|
||||
|
||||
https://01.org/linux-thermal-daemon
|
||||
https://github.com/intel/thermal_daemon
|
||||
|
||||
comment "thermald needs a toolchain w/ C++, wchar, threads"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
From 03047a26952a82daaa0792957ce211e0aa51bc64 Mon Sep 17 00:00:00 2001
|
||||
From: 4ugustus <wangdw.augustus@qq.com>
|
||||
Date: Tue, 25 Jan 2022 16:25:28 +0000
|
||||
Subject: [PATCH] tiffset: fix global-buffer-overflow for ASCII tags where
|
||||
count is required (fixes #355)
|
||||
|
||||
[Retrieved from:
|
||||
https://gitlab.com/libtiff/libtiff/-/commit/03047a26952a82daaa0792957ce211e0aa51bc64]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
tools/tiffset.c | 16 +++++++++++++---
|
||||
1 file changed, 13 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/tools/tiffset.c b/tools/tiffset.c
|
||||
index 8c9e23c5..e7a88c09 100644
|
||||
--- a/tools/tiffset.c
|
||||
+++ b/tools/tiffset.c
|
||||
@@ -146,9 +146,19 @@ main(int argc, char* argv[])
|
||||
|
||||
arg_index++;
|
||||
if (TIFFFieldDataType(fip) == TIFF_ASCII) {
|
||||
- if (TIFFSetField(tiff, TIFFFieldTag(fip), argv[arg_index]) != 1)
|
||||
- fprintf( stderr, "Failed to set %s=%s\n",
|
||||
- TIFFFieldName(fip), argv[arg_index] );
|
||||
+ if(TIFFFieldPassCount( fip )) {
|
||||
+ size_t len;
|
||||
+ len = strlen(argv[arg_index]) + 1;
|
||||
+ if (len > UINT16_MAX || TIFFSetField(tiff, TIFFFieldTag(fip),
|
||||
+ (uint16_t)len, argv[arg_index]) != 1)
|
||||
+ fprintf( stderr, "Failed to set %s=%s\n",
|
||||
+ TIFFFieldName(fip), argv[arg_index] );
|
||||
+ } else {
|
||||
+ if (TIFFSetField(tiff, TIFFFieldTag(fip),
|
||||
+ argv[arg_index]) != 1)
|
||||
+ fprintf( stderr, "Failed to set %s=%s\n",
|
||||
+ TIFFFieldName(fip), argv[arg_index] );
|
||||
+ }
|
||||
} else if (TIFFFieldWriteCount(fip) > 0
|
||||
|| TIFFFieldWriteCount(fip) == TIFF_VARIABLE) {
|
||||
int ret = 1;
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -11,6 +11,10 @@ TIFF_LICENSE_FILES = COPYRIGHT
|
||||
TIFF_CPE_ID_VENDOR = libtiff
|
||||
TIFF_CPE_ID_PRODUCT = libtiff
|
||||
TIFF_INSTALL_STAGING = YES
|
||||
|
||||
# 0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch
|
||||
TIFF_IGNORE_CVES += CVE-2022-22844
|
||||
|
||||
TIFF_CONF_OPTS = \
|
||||
--disable-cxx \
|
||||
--without-x
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 c7e93380988ce20b82aa19c06cdb2f10302b72cfebec7c15b5b96bcfc94ca9a9 tor-0.4.6.9.tar.gz
|
||||
sha256 94ccd60e04e558f33be73032bc84ea241660f92f58cfb88789bda6893739e31c tor-0.4.6.10.tar.gz
|
||||
sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
TOR_VERSION = 0.4.6.9
|
||||
TOR_VERSION = 0.4.6.10
|
||||
TOR_SITE = https://dist.torproject.org
|
||||
TOR_LICENSE = BSD-3-Clause
|
||||
TOR_LICENSE_FILES = LICENSE
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc
|
||||
sha256 6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9 util-linux-2.37.2.tar.xz
|
||||
sha256 590c592e58cd6bf38519cb467af05ce6a1ab18040e3e3418f24bcfb2f55f9776 util-linux-2.37.3.tar.xz
|
||||
# License files, locally calculated
|
||||
sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing
|
||||
sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
# util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well.
|
||||
|
||||
UTIL_LINUX_VERSION_MAJOR = 2.37
|
||||
UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2
|
||||
UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3
|
||||
UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
|
||||
UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
|
||||
|
||||
@@ -35,6 +35,13 @@ UTIL_LINUX_CONF_OPTS += \
|
||||
|
||||
UTIL_LINUX_LINK_LIBS = $(TARGET_NLS_LIBS)
|
||||
|
||||
# workaround missing disk-utils/raw.8 file in util-linux-2.37.3
|
||||
# release download package
|
||||
define UTIL_LINUX_FIX_DISK_UTILS_COMPILE
|
||||
touch $(@D)/disk-utils/raw.8
|
||||
endef
|
||||
UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE
|
||||
|
||||
HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf
|
||||
|
||||
# We also don't want the host-python dependency
|
||||
@@ -194,6 +201,11 @@ HOST_UTIL_LINUX_CONF_OPTS += \
|
||||
--without-ncursesw \
|
||||
--without-tinfo
|
||||
|
||||
# Disable raw command since starting from version 2.37 needs a
|
||||
# work-around to build but in the end we don't need at all.
|
||||
HOST_UTIL_LINUX_CONF_OPTS += \
|
||||
--disable-raw
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y)
|
||||
HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown
|
||||
# disable commands that have ncurses dependency, as well as
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Locally computed
|
||||
sha256 8770c6308a6c0b0f8b93a4d7202451d195b4efad17787c0306f0be60947732c4 vim-8.2.4224.tar.gz
|
||||
sha256 b40b4e341de6b65cdeacd4c816dea8fe5e3b385ee5e17af73fc69c00bd7c440b vim-8.2.4301.tar.gz
|
||||
sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE
|
||||
sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
VIM_VERSION = 8.2.4224
|
||||
VIM_VERSION = 8.2.4301
|
||||
VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION))
|
||||
VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES)
|
||||
VIM_SUBDIR = src
|
||||
|
||||
+1
-10
@@ -1,12 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 a3dad76a772393a1875e8f44a6059a95fea4bde40f97b800966969ac6f3a498d xen-4.14.3.tar.gz
|
||||
sha256 e76d56dfcdabf5d80aa06819f44472de49526a518dbb483eb08e7ff9aec2c669 xen-4.14.4.tar.gz
|
||||
sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING
|
||||
# https://xenbits.xenproject.org/xsa/advisory-385.html
|
||||
sha256 831e86c3adfec532b1a48a0b967b7c58c37db3733aee8d78216eb9d535b34f12 xsa385-4.15.patch
|
||||
# https://xenbits.xenproject.org/xsa/advisory-386.html
|
||||
sha256 f2f83c825e249bba9454437b48bbd8307fe7a224f56484388a67af124dfd279b xsa386.patch
|
||||
# https://xenbits.xenproject.org/xsa/advisory-388.html
|
||||
sha256 6917267482101a3f8f1d13905e14994344a0af81370c7a2b92275fb176b321a0 xsa388-4.14-1.patch
|
||||
sha256 d5886e046c69f34f98f7e1fc6ffcc36d92f8fc79242b9dc88412c39aa79b4ac3 xsa388-4.14-2.patch
|
||||
# https://xenbits.xenproject.org/xsa/advisory-389.html
|
||||
sha256 b243284679b32ab8c817a2e41562d8694d9781fa8096c268bb41b0cd91684baa xsa389-4.14.patch
|
||||
|
||||
+1
-18
@@ -4,30 +4,13 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XEN_VERSION = 4.14.3
|
||||
XEN_VERSION = 4.14.4
|
||||
XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION)
|
||||
XEN_LICENSE = GPL-2.0
|
||||
XEN_LICENSE_FILES = COPYING
|
||||
XEN_CPE_ID_VENDOR = xen
|
||||
XEN_CPE_ID_PREFIX = cpe:2.3:o
|
||||
XEN_DEPENDENCIES = host-acpica host-python3
|
||||
XEN_PATCH = \
|
||||
https://xenbits.xenproject.org/xsa/xsa385-4.15.patch \
|
||||
https://xenbits.xenproject.org/xsa/xsa386.patch \
|
||||
https://xenbits.xenproject.org/xsa/xsa388-4.14-1.patch \
|
||||
https://xenbits.xenproject.org/xsa/xsa388-4.14-2.patch \
|
||||
https://xenbits.xenproject.org/xsa/xsa389-4.14.patch
|
||||
|
||||
# xsa385-4.15.patch
|
||||
XEN_IGNORE_CVES += CVE-2021-28706
|
||||
# xsa386.patch
|
||||
XEN_IGNORE_CVES += CVE-2021-28702
|
||||
# xsa388-4.14-1.patch
|
||||
XEN_IGNORE_CVES += CVE-2021-28704 CVE-2021-28707
|
||||
# xsa388-4.14-2.patch
|
||||
XEN_IGNORE_CVES += CVE-2021-28708
|
||||
# xsa389-4.14.patch
|
||||
XEN_IGNORE_CVES += CVE-2021-28705 CVE-2021-28709
|
||||
|
||||
# Calculate XEN_ARCH
|
||||
ifeq ($(ARCH),aarch64)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user