Compare commits
35
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bdfea8428f | ||
|
|
f13b843e71 | ||
|
|
a21212fb7c | ||
|
|
7b2dd942d0 | ||
|
|
c110e48cec | ||
|
|
d69d9db3ce | ||
|
|
2eb31511f5 | ||
|
|
3e15083f18 | ||
|
|
cbf1d861fa | ||
|
|
905e976a6a | ||
|
|
c12b32ba46 | ||
|
|
759c9623aa | ||
|
|
55f45e6833 | ||
|
|
4b2fff01c0 | ||
|
|
d8605e4bb0 | ||
|
|
b5c1639a83 | ||
|
|
a669c0f2f5 | ||
|
|
3e4b82b996 | ||
|
|
da6bcf9e86 | ||
|
|
d7c92f7e12 | ||
|
|
82c67d3050 | ||
|
|
ae7ba64501 | ||
|
|
cd70bde797 | ||
|
|
f88bf61b29 | ||
|
|
dd6e3c8f1a | ||
|
|
50610dccfa | ||
|
|
a7bcd202d7 | ||
|
|
292c5a0ecd | ||
|
|
ff50cc8b05 | ||
|
|
a6c9317243 | ||
|
|
234525e782 | ||
|
|
d42220921c | ||
|
|
ea5cf87d56 | ||
|
|
fc9f9cd76f | ||
|
|
98cb0faa4c |
@@ -1,3 +1,31 @@
|
||||
2019.02-rc3, released March 1st, 2019
|
||||
|
||||
Fixes all over the tree.
|
||||
|
||||
Openssl support dropped from Qt 5.6, as it isn't compatible
|
||||
with openssl 1.1.x.
|
||||
|
||||
Toolchain: GCC 8.x updated to 8.3.0, fixing a number of
|
||||
issues.
|
||||
|
||||
Dependencies: Require CMake 3.8 or newer to fix compilation
|
||||
issue with certain packages. If not available, host-cmake will
|
||||
instead be built.
|
||||
|
||||
Printvars: Fix performance regression since 2018.02
|
||||
|
||||
Scanypi: Correctly handle underscores in python package names.
|
||||
|
||||
Updated/fixed packages: botan, clamav, cryptopp, i2pd,
|
||||
ibrcommon, iproute2, libcpprestsdk, libssh, lua-curl,
|
||||
luaexpat, qt5base, runc, stress-ng, syslinux, systemd,
|
||||
upmpdcli, zbar
|
||||
|
||||
Issues resolved (http://bugs.uclibc.org):
|
||||
|
||||
#9966: util-linux-2.30/.stamp_built' failed
|
||||
#11696: possible typo in board/pc/post-build.sh
|
||||
|
||||
2019.02-rc2, released February 23th, 2019
|
||||
|
||||
Fixes all over the tree.
|
||||
@@ -172,6 +200,36 @@
|
||||
#11656: Custom device tree and u-boot boot.scr not integrated..
|
||||
#11666: Touchscreen with (Py)Qt5 should use tslib instead of evdev
|
||||
|
||||
2018.11.3, Released February 23th, 2019
|
||||
|
||||
Important / security related fixes.
|
||||
|
||||
Ensure the PLATFORM and OS environment variables are not set,
|
||||
as they cause build issues for some packages.
|
||||
|
||||
The package list infrastructure now correctly handles packages
|
||||
installing files with old mtime.
|
||||
|
||||
Linux: Skip hash checks for user supplied downloadable
|
||||
patches, as no hash checksums are available for those.
|
||||
|
||||
scanpypi: protect against zip-slip vulnerability in zip/tar
|
||||
handling
|
||||
|
||||
Download: fixes for SSH/SCP support
|
||||
|
||||
SDK: Fix handling of relative symlinks (targets starting with
|
||||
'.' or '..')
|
||||
|
||||
Updated/fixed packages: bind, dhcpcd, docker-compose,
|
||||
docker-containerd, docker-engine, dovecot, dovecot-pigeonhole,
|
||||
dtc, efivar, ghostscript, gnuradio, imagemagick, jpeg-turbo,
|
||||
libarchive, libb64, libcurl, libgeotiff, libgpiod, libid3tag,
|
||||
libupnp18, log4cplus, madplay, meson, mosquitto, openssh, php,
|
||||
poco, postgresql, proftpd, pulseaudio, python, python-django,
|
||||
python3, qt5base, reaver, runc, sg3_utils, sqlcipher,
|
||||
swupdate, systemd, unzip, webkitgtk, xenomai
|
||||
|
||||
2018.11.2, Released January 30th, 2019
|
||||
|
||||
Important / security related fixes.
|
||||
@@ -953,6 +1011,28 @@
|
||||
#10961: Grub2 fails to build for x86_64 when BR2_SSP_ALL is
|
||||
enabled
|
||||
|
||||
2018.02.11, Released February 23th, 2019
|
||||
|
||||
Important / security related fixes.
|
||||
|
||||
Ensure the PLATFORM and OS environment variables are not set,
|
||||
as they cause build issues for some packages.
|
||||
|
||||
The package list infrastructure now correctly handles packages
|
||||
installing files with old mtime.
|
||||
|
||||
Linux: Skip hash checks for user supplied downloadable
|
||||
patches, as no hash checksums are available for those.
|
||||
|
||||
scanpypi: protect against zip-slip vulnerability in zip/tar
|
||||
handling
|
||||
|
||||
Updated/fixed packages: bind, dhcpcd, dovecot, ghostscript,
|
||||
gnuradio, imagemagick, jpeg-turbo, libarchive, libb64,
|
||||
libcurl, libid3tag, madplay, mosquitto, openssh, php,
|
||||
postgresql, proftpd, python, python-django, python3, qt5base,
|
||||
sqlcipher, swupdate, systemd, unzip, webkitgtk
|
||||
|
||||
2018.02.10, Released January 31th, 2019
|
||||
|
||||
Important / security related fixes.
|
||||
|
||||
@@ -49,8 +49,11 @@ F: package/libressl/
|
||||
F: package/libselinux/
|
||||
F: package/libsemanage/
|
||||
F: package/libsepol/
|
||||
F: package/libwebsockets/
|
||||
F: package/nginx-naxsi/
|
||||
F: package/php/
|
||||
F: package/policycoreutils/
|
||||
F: package/python3/
|
||||
F: package/python-flask-sqlalchemy/
|
||||
F: package/python-mutagen/
|
||||
F: package/python-pip/
|
||||
@@ -63,6 +66,7 @@ F: package/selinux-python/
|
||||
F: package/semodule-utils/
|
||||
F: package/setools/
|
||||
F: package/sngrep/
|
||||
F: package/systemd/
|
||||
|
||||
N: Adrian Perez de Castro <aperez@igalia.com>
|
||||
F: package/brotli/
|
||||
|
||||
@@ -92,9 +92,9 @@ all:
|
||||
.PHONY: all
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2019.02-rc2
|
||||
export BR2_VERSION := 2019.02-rc3
|
||||
# Actual time the release is cut (for reproducible builds)
|
||||
BR2_VERSION_EPOCH = 1550930600
|
||||
BR2_VERSION_EPOCH = 1551440000
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
From 44a1b42e561b9a257209300e2860b901b100cc17 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Santos <casantos@datacom.com.br>
|
||||
Date: Tue, 26 Feb 2019 08:07:22 -0300
|
||||
Subject: [PATCH] Fix build with gnu-efi version 3.0.9
|
||||
|
||||
Adapt a patch already applied upstream to prevent multiple definitions
|
||||
of 'memset' and 'memcpy'.
|
||||
|
||||
Signed-off-by: Carlos Santos <casantos@datacom.com.br>
|
||||
(adapted from commit 363d61c4f112b972649b19d67e96b9321f738f00)
|
||||
---
|
||||
mk/lib.mk | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mk/lib.mk b/mk/lib.mk
|
||||
index ceb95bd0..c9b6eaf3 100644
|
||||
--- a/mk/lib.mk
|
||||
+++ b/mk/lib.mk
|
||||
@@ -186,9 +186,9 @@ MINLIBOBJS = \
|
||||
# $(LIBVESA_OBJS)
|
||||
|
||||
CORELIBOBJS = \
|
||||
- memcpy.o memset.o memcmp.o printf.o strncmp.o vfprintf.o \
|
||||
+ memcmp.o printf.o strncmp.o vfprintf.o \
|
||||
strlen.o vsnprintf.o snprintf.o stpcpy.o strcmp.o strdup.o \
|
||||
- strcpy.o strncpy.o setjmp.o fopen.o fread.o fread2.o puts.o \
|
||||
+ strcpy.o strncpy.o fopen.o fread.o fread2.o puts.o \
|
||||
strtoul.o strntoumax.o strcasecmp.o \
|
||||
sprintf.o strlcat.o strchr.o strlcpy.o strncasecmp.o ctypes.o \
|
||||
fputs.o fwrite2.o fwrite.o fgetc.o fclose.o lmalloc.o \
|
||||
@@ -203,6 +203,11 @@ CORELIBOBJS = \
|
||||
$(LIBENTRY_OBJS) \
|
||||
$(LIBMODULE_OBJS)
|
||||
|
||||
+ifndef EFI_BUILD
|
||||
+# For EFI, these are part of gnu-efi
|
||||
+CORELIBOBJS += setjmp.o memcpy.o memset.o
|
||||
+endif
|
||||
+
|
||||
LDFLAGS = -m elf_$(ARCH) --hash-style=gnu -T $(com32)/lib/$(ARCH)/elf.ld
|
||||
|
||||
.SUFFIXES: .c .o .a .so .lo .i .S .s .ls .ss .lss
|
||||
--
|
||||
2.14.5
|
||||
|
||||
+27
-27
@@ -8,105 +8,105 @@
|
||||
<div class="panel-heading">Download</div>
|
||||
<div class="panel-body">
|
||||
|
||||
<h3 style="text-align: center;">Latest long term support release: <b>2018.02.10</b></h3>
|
||||
<h3 style="text-align: center;">Latest long term support release: <b>2018.02.11</b></h3>
|
||||
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2018.02.10.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2018.02.11.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2018.02.10.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2018.02.11.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h3><a href="/downloads/buildroot-2018.02.10.tar.gz">buildroot-2018.02.10.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2018.02.10.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2018.02.11.tar.gz">buildroot-2018.02.11.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2018.02.11.tar.gz.sign">PGP signature</a></p>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2018.02.10.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2018.02.11.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2018.02.10.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2018.02.11.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2018.02.10.tar.bz2">buildroot-2018.02.10.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2018.02.10.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2018.02.11.tar.bz2">buildroot-2018.02.11.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2018.02.11.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2018.11.2</b></h3>
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2018.11.3</b></h3>
|
||||
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2018.11.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2018.11.3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2018.11.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2018.11.3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h3><a href="/downloads/buildroot-2018.11.2.tar.gz">buildroot-2018.11.2.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2018.11.2.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2018.11.3.tar.gz">buildroot-2018.11.3.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2018.11.3.tar.gz.sign">PGP signature</a></p>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2018.11.2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2018.11.3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2018.11.2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2018.11.3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2018.11.2.tar.bz2">buildroot-2018.11.2.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2018.11.2.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2018.11.3.tar.bz2">buildroot-2018.11.3.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2018.11.3.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2019.02-rc2</b></h3>
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2019.02-rc3</b></h3>
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2019.02-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2019.02-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2019.02-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2019.02-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2019.02-rc2.tar.gz">buildroot-2019.02-rc2.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2019.02-rc2.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2019.02-rc3.tar.gz">buildroot-2019.02-rc3.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2019.02-rc3.tar.gz.sign">PGP signature</a></p>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2019.02-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2019.02-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2019.02-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2019.02-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2019.02-rc2.tar.bz2">buildroot-2019.02-rc2.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2019.02-rc2.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2019.02-rc3.tar.bz2">buildroot-2019.02-rc3.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2019.02-rc3.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -9,6 +9,66 @@
|
||||
<h2>News</h2>
|
||||
<ul class="timeline">
|
||||
|
||||
<li class="timeline-inverted">
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2019.02-rc3 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>1 March 2019</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>Another week, another release candidate with more cleanups
|
||||
and build fixes. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2019.02-rc3">CHANGES</a>
|
||||
file for details.</p>
|
||||
|
||||
<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2019.02-rc3.tar.bz2">2019.02-rc3
|
||||
release candidate</a>, and report any problems found to the
|
||||
<a href="support.html">mailing list</a> or
|
||||
<a href="https://bugs.buildroot.org">bug tracker</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2018.11.3 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>23 February 2019</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The 2018.11.3 bugfix release is out, fixing a number of important /
|
||||
security related issues discovered since the 2018.11.2 release. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2018.11.3">CHANGES</a>
|
||||
file for more details, read the
|
||||
<a href="http://lists.busybox.net/pipermail/buildroot/2019-February/243960.html">announcement</a>
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2018.11.3.tar.bz2">2018.11.3 release</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li class="timeline-inverted">
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2018.02.11 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>23 February 2019</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The 2018.02.11 bugfix release is out, fixing a number of important /
|
||||
security related issues discovered since the 2018.02.10 release. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2018.02.11">CHANGES</a>
|
||||
file for more details, read the
|
||||
<a href="http://lists.busybox.net/pipermail/buildroot/2019-February/243944.html">announcement</a>
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2018.02.11.tar.bz2">2018.02.11 release</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
|
||||
+1
-1
@@ -122,7 +122,7 @@ endif
|
||||
|
||||
config BR2_LINUX_KERNEL_VERSION
|
||||
string
|
||||
default "4.19.21" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "4.19.25" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "v4.4.171-cip30" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
|
||||
if BR2_LINUX_KERNEL_CUSTOM_VERSION
|
||||
|
||||
+5
-5
@@ -1,6 +1,6 @@
|
||||
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
|
||||
sha256 b60ca6c44aa3bc98384944d73ed94229e6359dc61a88fa589027dac30e04d062 linux-4.20.8.tar.xz
|
||||
sha256 db08ede726fe410da274e1e98f0de2aed9ff4b0e0b63a89e5928bef46998bbc1 linux-4.19.21.tar.xz
|
||||
sha256 8ff98caed5b20b733dedcbe99559d71a0e09e239c0c2488b3fd799c96489eb0a linux-4.14.99.tar.xz
|
||||
sha256 5eb1b9ba43370512ab637452089bb93f8c0fdd7d5399e99561d382f74517a816 linux-4.9.156.tar.xz
|
||||
sha256 be5211dd90142568199cd546c0893e1eb71c78774a11660a8bb8070bb9ebba39 linux-4.4.174.tar.xz
|
||||
sha256 1cf544308195250805e0731c716691bea4c1ed29e03e6f9ae5be6dc16785a504 linux-4.20.12.tar.xz
|
||||
sha256 7ec71d90d6e96e6f741676d157ac06f30c75be4eaf1649143a3c8b7d4f919731 linux-4.19.25.tar.xz
|
||||
sha256 7aa43e34e4c9e5965da29cef5ae196e06006f8c0d1d65fd755a2f197f0796a11 linux-4.14.103.tar.xz
|
||||
sha256 c09af067af62d299f5e33c279968de58c88fb7c59bd05e8f3bb460f611f60515 linux-4.9.160.tar.xz
|
||||
sha256 27da5401aa691762f3361c143f453877f499c02ea6c9c743b09538cb1af1c75d linux-4.4.176.tar.xz
|
||||
|
||||
@@ -17,9 +17,16 @@ BOTAN_CONF_OPTS = \
|
||||
--os=linux \
|
||||
--cc=gcc \
|
||||
--cc-bin="$(TARGET_CXX)" \
|
||||
--ldflags="$(BOTAN_LDFLAGS)" \
|
||||
--prefix=/usr \
|
||||
--without-documentation
|
||||
|
||||
BOTAN_LDFLAGS = $(TARGET_LDFLAGS)
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
BOTAN_LDFLAGS += -latomic
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_SHARED_LIBS),y)
|
||||
BOTAN_CONF_OPTS += \
|
||||
--disable-static-library \
|
||||
|
||||
@@ -22,6 +22,10 @@ CLAMAV_CONF_ENV = \
|
||||
ac_cv_c_mmap_private=yes \
|
||||
have_cv_ipv6=yes
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
CLAMAV_CONF_ENV += LIBS=-latomic
|
||||
endif
|
||||
|
||||
# UCLIBC_HAS_FTS is disabled, therefore disable fanotify (missing fts.h)
|
||||
CLAMAV_CONF_OPTS = \
|
||||
--with-dbdir=/var/lib/clamav \
|
||||
|
||||
@@ -27,14 +27,14 @@ index eccba009..4516d2b3 100644
|
||||
--- a/config.h
|
||||
+++ b/config.h
|
||||
@@ -591,7 +591,7 @@ NAMESPACE_END
|
||||
// Requires Binutils 2.24
|
||||
#if !defined(CRYPTOPP_DISABLE_AVX2) && defined(CRYPTOPP_AVX_AVAILABLE) && \
|
||||
(defined(__AVX2__) || (CRYPTOPP_MSC_VERSION >= 1800) || (__SUNPRO_CC >= 0x5130) || \
|
||||
- (CRYPTOPP_GCC_VERSION >= 40700) || (__INTEL_COMPILER >= 1400) || \
|
||||
+ (CRYPTOPP_GCC_VERSION >= 40900) || (__INTEL_COMPILER >= 1400) || \
|
||||
(CRYPTOPP_LLVM_CLANG_VERSION >= 30100) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40600))
|
||||
#define CRYPTOPP_AVX2_AVAILABLE 1
|
||||
#endif
|
||||
// Requires Binutils 2.24
|
||||
#if !defined(CRYPTOPP_DISABLE_AVX2) && defined(CRYPTOPP_AVX_AVAILABLE) && \
|
||||
(defined(__AVX2__) || (CRYPTOPP_MSC_VERSION >= 1800) || (__SUNPRO_CC >= 0x5130) || \
|
||||
- (CRYPTOPP_GCC_VERSION >= 40700) || (__INTEL_COMPILER >= 1400) || \
|
||||
+ (CRYPTOPP_GCC_VERSION >= 40900) || (__INTEL_COMPILER >= 1400) || \
|
||||
(CRYPTOPP_LLVM_CLANG_VERSION >= 30100) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40600))
|
||||
#define CRYPTOPP_AVX2_AVAILABLE 1
|
||||
#endif
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ config BR2_PACKAGE_DOCKER_CONTAINERD
|
||||
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # runc
|
||||
depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc
|
||||
depends on BR2_USE_MMU # util-linux
|
||||
select BR2_PACKAGE_RUNC # runtime dependency
|
||||
@@ -32,4 +33,5 @@ comment "docker-containerd needs a glibc or musl toolchain w/ threads"
|
||||
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAIN_USES_UCLIBC
|
||||
|
||||
@@ -3,6 +3,7 @@ config BR2_PACKAGE_DOCKER_ENGINE
|
||||
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # docker-containerd -> runc
|
||||
depends on !BR2_TOOLCHAIN_USES_UCLIBC # docker-containerd -> runc
|
||||
depends on BR2_USE_MMU # docker-containerd
|
||||
select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
|
||||
@@ -50,8 +51,9 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS
|
||||
|
||||
endif
|
||||
|
||||
comment "docker-engine needs a glibc or musl toolchain w/ threads"
|
||||
comment "docker-engine needs a glibc or musl toolchain w/ threads, headers >= 3.11"
|
||||
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAIN_USES_UCLIBC
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
From 6765eecde2ed8d4be0fc217408b9e9b92a840aff Mon Sep 17 00:00:00 2001
|
||||
From: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Date: Tue, 4 Sep 2018 00:39:32 -0700
|
||||
Subject: [PATCH] gcc: xtensa: fix NAND code in xtensa_expand_atomic
|
||||
|
||||
NAND is ~(a1 & a2), but xtensa_expand_atomic does ~a1 & a2.
|
||||
That fixes libatomic tests atomic-op-{1,2}.
|
||||
|
||||
gcc/
|
||||
2018-09-04 Max Filippov <jcmvbkbc@gmail.com>
|
||||
|
||||
* config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and
|
||||
XOR operations in NAND case.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Backported from: r264087
|
||||
---
|
||||
gcc/config/xtensa/xtensa.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
|
||||
index 7cfe64d42895..080bb4ad765d 100644
|
||||
--- a/gcc/config/xtensa/xtensa.c
|
||||
+++ b/gcc/config/xtensa/xtensa.c
|
||||
@@ -1614,9 +1614,9 @@ xtensa_expand_atomic (enum rtx_code code, rtx target, rtx mem, rtx val,
|
||||
break;
|
||||
|
||||
case MULT: /* NAND */
|
||||
- tmp = expand_simple_binop (SImode, XOR, old, ac.modemask,
|
||||
+ tmp = expand_simple_binop (SImode, AND, old, val,
|
||||
NULL_RTX, 1, OPTAB_DIRECT);
|
||||
- tmp = expand_simple_binop (SImode, AND, tmp, val,
|
||||
+ tmp = expand_simple_binop (SImode, XOR, tmp, ac.modemask,
|
||||
new_rtx, 1, OPTAB_DIRECT);
|
||||
break;
|
||||
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
From 960a2552f7b418134cdf7a31e96023a3811b98dd Mon Sep 17 00:00:00 2001
|
||||
From: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Date: Sun, 4 Nov 2018 23:55:59 -0800
|
||||
Subject: [PATCH] gcc: xtensa: don't force PIC for uclinux target
|
||||
|
||||
xtensa-uclinux uses bFLT executable file format that cannot relocate
|
||||
fields representing offsets from data to code. C++ objects built as PIC
|
||||
use offsets to encode FDE structures. As a result C++ exception handling
|
||||
doesn't work correctly on xtensa-uclinux. Don't use PIC by default on
|
||||
xtensa-uclinux.
|
||||
|
||||
gcc/
|
||||
2018-11-05 Max Filippov <jcmvbkbc@gmail.com>
|
||||
|
||||
* config/xtensa/uclinux.h (XTENSA_ALWAYS_PIC): Change to 0.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
Backported from: r265823
|
||||
|
||||
gcc/config/xtensa/uclinux.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h
|
||||
index ba26187c8f7a..c7743df9d97c 100644
|
||||
--- a/gcc/config/xtensa/uclinux.h
|
||||
+++ b/gcc/config/xtensa/uclinux.h
|
||||
@@ -59,8 +59,8 @@ along with GCC; see the file COPYING3. If not see
|
||||
#undef LOCAL_LABEL_PREFIX
|
||||
#define LOCAL_LABEL_PREFIX "."
|
||||
|
||||
-/* Always enable "-fpic" for Xtensa Linux. */
|
||||
-#define XTENSA_ALWAYS_PIC 1
|
||||
+/* Don't enable "-fpic" for Xtensa uclinux. */
|
||||
+#define XTENSA_ALWAYS_PIC 0
|
||||
|
||||
#undef TARGET_LIBC_HAS_FUNCTION
|
||||
#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -84,7 +84,7 @@ config BR2_GCC_VERSION
|
||||
default "5.5.0" if BR2_GCC_VERSION_5_X
|
||||
default "6.5.0" if BR2_GCC_VERSION_6_X
|
||||
default "7.4.0" if BR2_GCC_VERSION_7_X
|
||||
default "8.2.0" if BR2_GCC_VERSION_8_X
|
||||
default "8.3.0" if BR2_GCC_VERSION_8_X
|
||||
default "arc-2018.09-release" if BR2_GCC_VERSION_ARC
|
||||
default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ sha512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe7
|
||||
sha512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac gcc-6.5.0.tar.xz
|
||||
# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-7.4.0/sha512.sum
|
||||
sha512 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e gcc-7.4.0.tar.xz
|
||||
# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-8.2.0/sha512.sum
|
||||
sha512 64898a165f67e136d802a92e7633bf1b06c85266027e52127ea025bf5fc2291b5e858288aac0bdba246e6cdf7c6ec88bc8e0e7f3f6f1985f4297710cafde56ed gcc-8.2.0.tar.xz
|
||||
# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-8.3.0/sha512.sum
|
||||
sha512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802 gcc-8.3.0.tar.xz
|
||||
|
||||
# Locally calculated (fetched from Github)
|
||||
sha512 4d12c3ac27b9de9c533be3b8964cf23d21bf6933b5073183e1affe714b0ff33f9d6169e3b55a5c505d7dae33c9bb4f8b0d110461e3a124182d8c8d51b66b8e45 gcc-arc-2018.09-release.tar.gz
|
||||
|
||||
@@ -21,6 +21,10 @@ I2PD_CONF_OPTS += -DWITH_GUI=OFF
|
||||
# build failure when cross-compiling.
|
||||
I2PD_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
I2PD_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
I2PD_CONF_OPTS += -DWITH_STATIC=ON
|
||||
else
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
From 8118c43a53271ba2dd31ce3913a3cd21bc7dcca7 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 16 Feb 2019 11:58:34 +0100
|
||||
Subject: [PATCH] ibrcommon/ssl/gcm: fix static build with openssl
|
||||
|
||||
gf_mul is already defined in libcrypto (openssl) so rename it into
|
||||
ibrdtn_gf_mul to fix following build failure:
|
||||
|
||||
/home/buildroot/autobuild/instance-3/output/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libcrypto.a(f_impl.o): In function `gf_mul':
|
||||
f_impl.c:(.text+0x0): multiple definition of `gf_mul'
|
||||
/home/buildroot/autobuild/instance-3/output/host/arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libibrcommon.a(gf128mul.o):gf128mul.cpp:(.text+0x30): first defined here
|
||||
collect2: error: ld returned 1 exit status
|
||||
Makefile:560: recipe for target 'dtnd' failed
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/1d3b4b6cf043a3e185ce758b617a0a18c3d36cdb
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/ibrdtn/ibrdtn/pull/269]
|
||||
---
|
||||
ibrcommon/ibrcommon/ssl/gcm/gcm.cpp | 10 +++++-----
|
||||
ibrcommon/ibrcommon/ssl/gcm/gf128mul.cpp | 2 +-
|
||||
ibrcommon/ibrcommon/ssl/gcm/gf128mul.h | 2 +-
|
||||
3 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/ibrcommon/ssl/gcm/gcm.cpp b/ibrcommon/ssl/gcm/gcm.cpp
|
||||
index 8a5745b4..6097b43e 100644
|
||||
--- a/ibrcommon/ssl/gcm/gcm.cpp
|
||||
+++ b/ibrcommon/ssl/gcm/gcm.cpp
|
||||
@@ -89,7 +89,7 @@ ret_type gcm_init_and_key( /* initialise mode and set key
|
||||
#elif defined( TABLES_256 )
|
||||
#define gf_mul_hh(a, ctx, scr) gf_mul_256(a, ctx->gf_t256, scr)
|
||||
#else
|
||||
-#define gf_mul_hh(a, ctx, scr) gf_mul(a, ui8_ptr(ctx->ghash_h))
|
||||
+#define gf_mul_hh(a, ctx, scr) ibrdtn_gf_mul(a, ui8_ptr(ctx->ghash_h))
|
||||
#endif
|
||||
|
||||
ret_type gcm_init_message( /* initialise a new message */
|
||||
@@ -334,9 +334,9 @@ ret_type gcm_compute_tag( /* compute authentication tag
|
||||
memcpy(tbuf, ctx->ghash_h, BLOCK_SIZE);
|
||||
for( ; ; )
|
||||
{
|
||||
- if(ln & 1) gf_mul(ui8_ptr(ctx->hdr_ghv), tbuf);
|
||||
+ if(ln & 1) ibrdtn_gf_mul(ui8_ptr(ctx->hdr_ghv), tbuf);
|
||||
if(!(ln >>= 1)) break;
|
||||
- gf_mul(tbuf, tbuf);
|
||||
+ ibrdtn_gf_mul(tbuf, tbuf);
|
||||
}
|
||||
}
|
||||
#else /* this one seems slower on x86 and x86_64 :-( */
|
||||
@@ -348,12 +348,12 @@ ret_type gcm_compute_tag( /* compute authentication tag
|
||||
tbuf[0] = 0x80;
|
||||
while(i)
|
||||
{
|
||||
- gf_mul(tbuf, tbuf);
|
||||
+ ibrdtn_gf_mul(tbuf, tbuf);
|
||||
if(i & ln)
|
||||
gf_mul_hh(tbuf, ctx, scratch);
|
||||
i >>= 1;
|
||||
}
|
||||
- gf_mul(ui8_ptr(ctx->hdr_ghv), tbuf);
|
||||
+ ibrdtn_gf_mul(ui8_ptr(ctx->hdr_ghv), tbuf);
|
||||
}
|
||||
#endif
|
||||
i = BLOCK_SIZE; ln = (uint_32t)(ctx->txt_acnt << 3);
|
||||
diff --git a/ibrcommon/ssl/gcm/gf128mul.cpp b/ibrcommon/ssl/gcm/gf128mul.cpp
|
||||
index a553a044..d0c460c3 100644
|
||||
--- a/ibrcommon/ssl/gcm/gf128mul.cpp
|
||||
+++ b/ibrcommon/ssl/gcm/gf128mul.cpp
|
||||
@@ -103,7 +103,7 @@
|
||||
|
||||
const unsigned short gf_tab[256] = gf_dat(xda);
|
||||
|
||||
-void gf_mul(void *a, const void* b)
|
||||
+void ibrdtn_gf_mul(void *a, const void* b)
|
||||
{ uint_32t r[GF_BYTE_LEN >> 2], p[8][GF_BYTE_LEN >> 2];
|
||||
int i;
|
||||
|
||||
diff --git a/ibrcommon/ssl/gcm/gf128mul.h b/ibrcommon/ssl/gcm/gf128mul.h
|
||||
index 4645c7fe..65fba54b 100644
|
||||
--- a/ibrcommon/ssl/gcm/gf128mul.h
|
||||
+++ b/ibrcommon/ssl/gcm/gf128mul.h
|
||||
@@ -619,7 +619,7 @@ gf_inline void mul_x(void *r, const void *x)
|
||||
|
||||
/* A slow generic version of gf_mul (a = a * b) */
|
||||
|
||||
-void gf_mul(void *a, const void* b);
|
||||
+void ibrdtn_gf_mul(void *a, const void* b);
|
||||
|
||||
/* This version uses 64k bytes of table space on the stack.
|
||||
A 16 byte buffer has to be multiplied by a 16 byte key
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 9700927a008a803ac119bdf816bdc1baa69d705c Mon Sep 17 00:00:00 2001
|
||||
From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
|
||||
Date: Wed, 20 Feb 2019 15:41:51 +0100
|
||||
Subject: [PATCH] ss: fix compilation under glibc < 2.18
|
||||
|
||||
Commit c759116a0b2b6da8df9687b0a40ac69050132c77 introduced support for
|
||||
AF_VSOCK. This define is only provided since glibc version 2.18, so
|
||||
compilation fails when using older toolchains.
|
||||
|
||||
Provide the necessary definitions if needed.
|
||||
|
||||
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
|
||||
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
||||
---
|
||||
misc/ss.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/misc/ss.c b/misc/ss.c
|
||||
index 9e821faf..766fdc5f 100644
|
||||
--- a/misc/ss.c
|
||||
+++ b/misc/ss.c
|
||||
@@ -51,6 +51,14 @@
|
||||
#include <linux/tipc_netlink.h>
|
||||
#include <linux/tipc_sockets_diag.h>
|
||||
|
||||
+/* AF_VSOCK/PF_VSOCK is only provided since glibc 2.18 */
|
||||
+#ifndef PF_VSOCK
|
||||
+#define PF_VSOCK 40
|
||||
+#endif
|
||||
+#ifndef AF_VSOCK
|
||||
+#define AF_VSOCK PF_VSOCK
|
||||
+#endif
|
||||
+
|
||||
#define MAGIC_SEQ 123456
|
||||
#define BUF_CHUNK (1024 * 1024)
|
||||
#define LEN_ALIGN(x) (((x) + 1) & ~1)
|
||||
--
|
||||
2.19.2
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
From e8b6b7adc138a66f8d47396a2e707366d3771028 Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Mon, 31 Dec 2018 18:42:09 +0100
|
||||
Subject: [PATCH] buildsystem: relax requirement on cmake version
|
||||
|
||||
Commit 73cc5089 (Using target_compile_features to specify C++ 11
|
||||
standard) bumped the required cmake version, from 3.0 to 3.8, so
|
||||
as to get the definition of target_compile_features().
|
||||
|
||||
However, target_compile_features() was introduced in cmake-3.1:
|
||||
https://cmake.org/cmake/help/v3.1/command/target_compile_features.html
|
||||
|
||||
And using cmake-3.1 is indeed sufficient to properly build.
|
||||
|
||||
As such, relax the minimum required version down to cmake-3.1,
|
||||
so we can build on oldish, entreprise-grade distributions that
|
||||
only have cmake-3.1 (or at least, don't have up to cmake-3.8).
|
||||
|
||||
Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
---
|
||||
Upstream status: MR pending
|
||||
https://github.com/nlohmann/json/pull/1409
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
benchmarks/CMakeLists.txt | 2 +-
|
||||
test/cmake_add_subdirectory/project/CMakeLists.txt | 2 +-
|
||||
test/cmake_import/project/CMakeLists.txt | 2 +-
|
||||
test/cmake_import_minver/project/CMakeLists.txt | 2 +-
|
||||
5 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 409f5bff..da6f08e7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.8)
|
||||
+cmake_minimum_required(VERSION 3.1)
|
||||
|
||||
##
|
||||
## PROJECT
|
||||
diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
|
||||
index a53812c1..dd3f3027 100644
|
||||
--- a/benchmarks/CMakeLists.txt
|
||||
+++ b/benchmarks/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.8)
|
||||
+cmake_minimum_required(VERSION 3.1)
|
||||
project(JSON_Benchmarks LANGUAGES CXX)
|
||||
|
||||
# set compiler flags
|
||||
diff --git a/test/cmake_add_subdirectory/project/CMakeLists.txt b/test/cmake_add_subdirectory/project/CMakeLists.txt
|
||||
index 2c5be183..21357b68 100644
|
||||
--- a/test/cmake_add_subdirectory/project/CMakeLists.txt
|
||||
+++ b/test/cmake_add_subdirectory/project/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.8)
|
||||
+cmake_minimum_required(VERSION 3.1)
|
||||
|
||||
project(DummyImport CXX)
|
||||
|
||||
diff --git a/test/cmake_import/project/CMakeLists.txt b/test/cmake_import/project/CMakeLists.txt
|
||||
index d268d72c..fe892fc1 100644
|
||||
--- a/test/cmake_import/project/CMakeLists.txt
|
||||
+++ b/test/cmake_import/project/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.8)
|
||||
+cmake_minimum_required(VERSION 3.1)
|
||||
|
||||
project(DummyImport CXX)
|
||||
|
||||
diff --git a/test/cmake_import_minver/project/CMakeLists.txt b/test/cmake_import_minver/project/CMakeLists.txt
|
||||
index eeef3296..29056bdc 100644
|
||||
--- a/test/cmake_import_minver/project/CMakeLists.txt
|
||||
+++ b/test/cmake_import_minver/project/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.8)
|
||||
+cmake_minimum_required(VERSION 3.1)
|
||||
|
||||
project(DummyImportMinVer CXX)
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -12,4 +12,8 @@ LIBCPPRESTSDK_SUBDIR = Release
|
||||
LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl zlib
|
||||
LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DCPPREST_EXCLUDE_WEBSOCKETS=ON -DBUILD_SAMPLES=OFF
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
LIBCPPRESTSDK_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From c95bf48d0ef26ccf2135e09f0b2f8d0e54bd88e9 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schneider <asn@cryptomilk.org>
|
||||
Date: Fri, 7 Dec 2018 12:07:13 +0100
|
||||
Subject: [PATCH] connect: Fix size type for i an j in ssh_select()
|
||||
|
||||
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: commit 58113d489eecf
|
||||
|
||||
src/connect.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/connect.c b/src/connect.c
|
||||
index 6c09c3f638ba..7ff7513fb3e8 100644
|
||||
--- a/src/connect.c
|
||||
+++ b/src/connect.c
|
||||
@@ -476,7 +476,7 @@ int ssh_select(ssh_channel *channels, ssh_channel *outchannels, socket_t maxfd,
|
||||
fd_set *readfds, struct timeval *timeout) {
|
||||
fd_set origfds;
|
||||
socket_t fd;
|
||||
- int i,j;
|
||||
+ size_t i, j;
|
||||
int rc;
|
||||
int base_tm, tm;
|
||||
struct ssh_timestamp ts;
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
# https://www.libssh.org/files/0.8/libssh-0.8.6.tar.xz.asc
|
||||
# https://www.libssh.org/files/0.8/libssh-0.8.7.tar.xz.asc
|
||||
# with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D
|
||||
sha256 1046b95632a07fc00b1ea70ee683072d0c8a23f544f4535440b727812002fd01 libssh-0.8.6.tar.xz
|
||||
sha256 43304ca22f0ba0b654e14b574a39816bc70212fdea5858a6637cc26cade3d592 libssh-0.8.7.tar.xz
|
||||
sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
LIBSSH_VERSION_MAJOR = 0.8
|
||||
LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).6
|
||||
LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).7
|
||||
LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
|
||||
LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR)
|
||||
LIBSSH_LICENSE = LGPL-2.1
|
||||
|
||||
@@ -287,11 +287,11 @@ endchoice
|
||||
|
||||
config BR2_DEFAULT_KERNEL_HEADERS
|
||||
string
|
||||
default "4.4.174" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.9.156" if BR2_KERNEL_HEADERS_4_9
|
||||
default "4.14.99" if BR2_KERNEL_HEADERS_4_14
|
||||
default "4.19.21" if BR2_KERNEL_HEADERS_4_19
|
||||
default "4.20.8" if BR2_KERNEL_HEADERS_4_20
|
||||
default "4.4.176" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.9.160" if BR2_KERNEL_HEADERS_4_9
|
||||
default "4.14.103" if BR2_KERNEL_HEADERS_4_14
|
||||
default "4.19.25" if BR2_KERNEL_HEADERS_4_19
|
||||
default "4.20.12" if BR2_KERNEL_HEADERS_4_20
|
||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
|
||||
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 28ac0c5e642c9f7e3091a60268745f7cab4cc92b Mon Sep 17 00:00:00 2001
|
||||
From: Francois Perrad <francois.perrad@gadz.org>
|
||||
Date: Sat, 23 Feb 2019 15:23:26 +0100
|
||||
Subject: [PATCH] add variant definition of lcurl_url_t
|
||||
|
||||
like in lceasy.h
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
---
|
||||
src/lcurlapi.h | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/Lua-cURLv3-0.3.9/src/lcurlapi.h b/Lua-cURLv3-0.3.9/src/lcurlapi.h
|
||||
index 4dd4672..862c94f 100644
|
||||
--- a/Lua-cURLv3-0.3.9/src/lcurlapi.h
|
||||
+++ b/Lua-cURLv3-0.3.9/src/lcurlapi.h
|
||||
@@ -19,11 +19,20 @@
|
||||
|
||||
#if LCURL_CURL_VER_GE(7,62,0)
|
||||
|
||||
+#if LCURL_CC_SUPPORT_FORWARD_TYPEDEF
|
||||
typedef struct lcurl_url_tag {
|
||||
CURLU *url;
|
||||
|
||||
int err_mode;
|
||||
}lcurl_url_t;
|
||||
+#else
|
||||
+struct lcurl_url_tag {
|
||||
+ CURLU *url;
|
||||
+
|
||||
+ int err_mode;
|
||||
+};
|
||||
+#define lcurl_url_t struct lcurl_url_tag
|
||||
+#endif
|
||||
|
||||
int lcurl_url_create(lua_State *L, int error_mode);
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 77cb691f781918908dfe34785f00a5ff75d5cc20 Mon Sep 17 00:00:00 2001
|
||||
From: Francois Perrad <francois.perrad@gadz.org>
|
||||
Date: Sat, 16 Feb 2019 15:56:00 +0100
|
||||
Subject: [PATCH] restore getcurrentbytecount
|
||||
|
||||
see https://github.com/tomasguisasola/luaexpat/issues/3
|
||||
|
||||
Fetch from: https://github.com/tomasguisasola/luaexpat/commit/0926f2d705109b7d35b721344264b39c1169e0de
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
---
|
||||
src/lxplib.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/luaexpat-1.3.3/src/lxplib.c b/luaexpat-1.3.3/src/lxplib.c
|
||||
index 7726913..35bec3c 100644
|
||||
--- a/luaexpat-1.3.3/src/lxplib.c
|
||||
+++ b/luaexpat-1.3.3/src/lxplib.c
|
||||
@@ -538,11 +538,18 @@ static int lxp_stop (lua_State *L) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
+static int lxp_getcurrentbytecount (lua_State* L) {
|
||||
+ lxp_userdata *xpu = checkparser(L, 1);
|
||||
+ lua_pushinteger(L, XML_GetCurrentByteCount(xpu->parser));
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
static const luaL_Reg lxp_meths[] = {
|
||||
{"parse", lxp_parse},
|
||||
{"close", lxp_close},
|
||||
{"__gc", parser_gc},
|
||||
{"pos", lxp_pos},
|
||||
+ {"getcurrentbytecount", lxp_getcurrentbytecount},
|
||||
{"setencoding", lxp_setencoding},
|
||||
{"getcallbacks", getcallbacks},
|
||||
{"getbase", getbase},
|
||||
--
|
||||
2.17.1
|
||||
|
||||
+11
-8
@@ -637,14 +637,17 @@ $(2)_FINAL_ALL_DEPENDENCIES = \
|
||||
$$($(2)_FINAL_DOWNLOAD_DEPENDENCIES) \
|
||||
$$($(2)_FINAL_EXTRACT_DEPENDENCIES) \
|
||||
$$($(2)_FINAL_PATCH_DEPENDENCIES))
|
||||
$(2)_FINAL_RECURSIVE_DEPENDENCIES = \
|
||||
$$(sort \
|
||||
$$(foreach p,\
|
||||
$$($(2)_FINAL_ALL_DEPENDENCIES),\
|
||||
$$(p)\
|
||||
$$($$(call UPPERCASE,$$(p))_FINAL_RECURSIVE_DEPENDENCIES)\
|
||||
)\
|
||||
)
|
||||
$(2)_FINAL_RECURSIVE_DEPENDENCIES = $$(sort \
|
||||
$$(if $$(filter undefined,$$(origin $(2)_FINAL_RECURSIVE_DEPENDENCIES__X)), \
|
||||
$$(eval $(2)_FINAL_RECURSIVE_DEPENDENCIES__X := \
|
||||
$$(foreach p, \
|
||||
$$($(2)_FINAL_ALL_DEPENDENCIES), \
|
||||
$$(p) \
|
||||
$$($$(call UPPERCASE,$$(p))_FINAL_RECURSIVE_DEPENDENCIES) \
|
||||
) \
|
||||
) \
|
||||
) \
|
||||
$$($(2)_FINAL_RECURSIVE_DEPENDENCIES__X))
|
||||
|
||||
$(2)_INSTALL_STAGING ?= NO
|
||||
$(2)_INSTALL_IMAGES ?= NO
|
||||
|
||||
@@ -64,7 +64,7 @@ define $(2)_CONFIGURE_CMDS
|
||||
rm -rf $$($$(PKG)_SRCDIR)/build
|
||||
mkdir -p $$($$(PKG)_SRCDIR)/build
|
||||
sed -e "s%@TARGET_CROSS@%$$(TARGET_CROSS)%g" \
|
||||
-e "s%@TARGET_ARCH@%$$(ARCH)%g" \
|
||||
-e "s%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g" \
|
||||
-e "s%@TARGET_CPU@%$$(GCC_TARGET_CPU)%g" \
|
||||
-e "s%@TARGET_ENDIAN@%$$(call LOWERCASE,$$(BR2_ENDIAN))%g" \
|
||||
-e "s%@TARGET_CFLAGS@%$$(HOST_MESON_SED_CFLAGS)%g" \
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 982801a21c3abad7025a7110275a49e200bc460f Mon Sep 17 00:00:00 2001
|
||||
From: Stefan O'Rear <stefanor@cox.net>
|
||||
Date: Thu, 17 Nov 2016 09:54:33 -0800
|
||||
Subject: [PATCH] double-conversion: enable for riscv
|
||||
|
||||
Original double conversion patch [1] 'Add support for RISC-V' ported
|
||||
to qtbase-5.11.3.
|
||||
|
||||
[1] Upstream: https://github.com/google/double-conversion/commit/8316ed5bf405835558a476e528d8e1d0adf69dd9
|
||||
|
||||
Change-Id: Id88a356940f4d61dbcec3741a74db695e47af3f0
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/3rdparty/double-conversion/include/double-conversion/utils.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h
|
||||
index 485f680180..a736b14d1e 100644
|
||||
--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h
|
||||
+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h
|
||||
@@ -66,6 +66,7 @@
|
||||
defined(__SH4__) || defined(__alpha__) || \
|
||||
defined(_MIPS_ARCH_MIPS32R2) || \
|
||||
defined(__AARCH64EL__) || defined(__AARCH64EB__) || \
|
||||
+ defined(__riscv) || \
|
||||
defined(__or1k__) || \
|
||||
defined(__microblaze__)
|
||||
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -52,8 +52,6 @@ else
|
||||
# option '-no-avx512' (available for latest only)
|
||||
endif
|
||||
|
||||
QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM),y)
|
||||
QT5BASE_CONFIGURE_OPTS += -kms
|
||||
QT5BASE_DEPENDENCIES += libdrm
|
||||
@@ -190,8 +188,13 @@ else
|
||||
QT5BASE_CONFIGURE_OPTS += -no-eglfs
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
# No OpenSSL 1.1.x support in Qt 5.6.x
|
||||
QT5BASE_CONFIGURE_OPTS += -no-openssl
|
||||
else
|
||||
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
|
||||
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl)
|
||||
endif
|
||||
|
||||
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig)
|
||||
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
|
||||
@@ -296,6 +299,9 @@ define QT5BASE_CONFIGURE_HOSTCC
|
||||
$(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf
|
||||
endef
|
||||
|
||||
# Must be last so can override all options set by Buildroot
|
||||
QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
|
||||
|
||||
define QT5BASE_CONFIGURE_CMDS
|
||||
mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/
|
||||
sed 's/@EGLFS_DEVICE@/$(QT5BASE_EGLFS_DEVICE)/g' \
|
||||
|
||||
@@ -3,6 +3,7 @@ config BR2_PACKAGE_RUNC
|
||||
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # O_TMPFILE
|
||||
depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve
|
||||
help
|
||||
runC is a CLI tool for spawning and running containers
|
||||
@@ -10,7 +11,8 @@ config BR2_PACKAGE_RUNC
|
||||
|
||||
https://github.com/opencontainers/runc
|
||||
|
||||
comment "runc needs a glibc or musl toolchain toolchain w/ threads"
|
||||
comment "runc needs a glibc or musl toolchain w/ threads, headers >= 3.11"
|
||||
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS && \
|
||||
BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAN_USES_UCLIBC
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAN_USES_UCLIBC
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
From 291070801245da26e4841c321910b55016ca23c0 Mon Sep 17 00:00:00 2001
|
||||
From: Vadim Kochan <vadim.kochan@petcube.com>
|
||||
From: Vadim Kochan <vadim4j@gmail.com>
|
||||
Date: Tue, 1 Jan 2019 17:24:54 +0200
|
||||
Subject: [PATCH] test/test-bsd-wchar: Explicitly include stdio.h
|
||||
|
||||
|
||||
@@ -12,6 +12,10 @@ STRESS_NG_LICENSE_FILES = COPYING
|
||||
|
||||
STRESS_NG_DEPENDENCIES = attr keyutils
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBBSD),y)
|
||||
STRESS_NG_DEPENDENCIES += libbsd
|
||||
endif
|
||||
|
||||
define STRESS_NG_BUILD_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From 7bd188b1e628d11011cc6c98456e2e4ed72c645b Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 3 Feb 2019 17:32:46 +0100
|
||||
Subject: [PATCH] networkd-brvlan.c: fix build without
|
||||
BRIDGE_VLAN_INFO_RANGE_END
|
||||
|
||||
systemd fails to build on kernel without BRIDGE_VLAN_INFO_RANGE_END
|
||||
since 9714c02
|
||||
|
||||
So put include missing_if_bridge.h
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/network/networkd-brvlan.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
|
||||
index 8f9103f14..8377623da 100644
|
||||
--- a/src/network/networkd-brvlan.c
|
||||
+++ b/src/network/networkd-brvlan.c
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
#include "alloc-util.h"
|
||||
#include "conf-parser.h"
|
||||
+#include "missing_if_bridge.h"
|
||||
#include "netlink-util.h"
|
||||
#include "networkd-brvlan.h"
|
||||
#include "networkd-link.h"
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From d909e4af6ac61f6777d429a0c84ab5b3d1907c6d Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 3 Feb 2019 18:28:16 +0100
|
||||
Subject: [PATCH] networkd-ndisc.c: fix build without IFA_F_NOPREFIXROUTE
|
||||
|
||||
systemd fails to build on kernel without IFA_F_NOPREFIXROUTE
|
||||
since 9714c02
|
||||
|
||||
So put include missing_network.h
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/network/networkd-ndisc.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
|
||||
index 80bfd2cba..e5b8d1155 100644
|
||||
--- a/src/network/networkd-ndisc.c
|
||||
+++ b/src/network/networkd-ndisc.c
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
#include "sd-ndisc.h"
|
||||
|
||||
+#include "missing_network.h"
|
||||
#include "networkd-ndisc.h"
|
||||
#include "networkd-route.h"
|
||||
#include "strv.h"
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From 081aea25022a987d349394ada2d6a959bf3ce4cd Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 3 Feb 2019 18:33:39 +0100
|
||||
Subject: [PATCH] networkd-address.c: fix build without IFA_F_NOPREFIXROUTE
|
||||
|
||||
systemd fails to build on kernel without IFA_F_NOPREFIXROUTE
|
||||
since 9714c02
|
||||
|
||||
So put include missing_network.h
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/network/networkd-address.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
|
||||
index fa7f9b8d7..3cdbd9e37 100644
|
||||
--- a/src/network/networkd-address.c
|
||||
+++ b/src/network/networkd-address.c
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "alloc-util.h"
|
||||
#include "conf-parser.h"
|
||||
#include "firewall-util.h"
|
||||
+#include "missing_network.h"
|
||||
#include "netlink-util.h"
|
||||
#include "networkd-address.h"
|
||||
#include "networkd-manager.h"
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From aeed8332afa88728ed914b2917ce758d9c2218a4 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 3 Feb 2019 18:38:10 +0100
|
||||
Subject: [PATCH] networkd-dhcp6.c: fix build without IFA_F_NOPREFIXROUTE
|
||||
|
||||
systemd fails to build on kernel without IFA_F_NOPREFIXROUTE
|
||||
since 9714c02
|
||||
|
||||
So put include missing_network.h
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/network/networkd-dhcp6.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
|
||||
index f9df26d75..c1fba03f9 100644
|
||||
--- a/src/network/networkd-dhcp6.c
|
||||
+++ b/src/network/networkd-dhcp6.c
|
||||
@@ -11,6 +11,7 @@
|
||||
|
||||
#include "hashmap.h"
|
||||
#include "hostname-util.h"
|
||||
+#include "missing_network.h"
|
||||
#include "network-internal.h"
|
||||
#include "networkd-link.h"
|
||||
#include "networkd-manager.h"
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
From febef5e18558c114f4fb7c94f6c8ed3520c50cdf Mon Sep 17 00:00:00 2001
|
||||
From: Riccardo Schirone <rschiron@redhat.com>
|
||||
Date: Mon, 4 Feb 2019 14:29:09 +0100
|
||||
Subject: [PATCH] Refuse dbus message paths longer than BUS_PATH_SIZE_MAX
|
||||
limit.
|
||||
|
||||
Even though the dbus specification does not enforce any length limit on the
|
||||
path of a dbus message, having to analyze too long strings in PID1 may be
|
||||
time-consuming and it may have security impacts.
|
||||
|
||||
In any case, the limit is set so high that real-life applications should not
|
||||
have a problem with it.
|
||||
|
||||
(cherry picked from commit 61397a60d98e368a5720b37e83f3169e3eb511c4)
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: commit 61397a60d98
|
||||
|
||||
src/libsystemd/sd-bus/bus-internal.c | 2 +-
|
||||
src/libsystemd/sd-bus/bus-internal.h | 4 ++++
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libsystemd/sd-bus/bus-internal.c b/src/libsystemd/sd-bus/bus-internal.c
|
||||
index 40acae213381..598b7f110c73 100644
|
||||
--- a/src/libsystemd/sd-bus/bus-internal.c
|
||||
+++ b/src/libsystemd/sd-bus/bus-internal.c
|
||||
@@ -43,7 +43,7 @@ bool object_path_is_valid(const char *p) {
|
||||
if (slash)
|
||||
return false;
|
||||
|
||||
- return true;
|
||||
+ return (q - p) <= BUS_PATH_SIZE_MAX;
|
||||
}
|
||||
|
||||
char* object_path_startswith(const char *a, const char *b) {
|
||||
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
|
||||
index f208b294d8f1..a8d61bf72a4e 100644
|
||||
--- a/src/libsystemd/sd-bus/bus-internal.h
|
||||
+++ b/src/libsystemd/sd-bus/bus-internal.h
|
||||
@@ -332,6 +332,10 @@ struct sd_bus {
|
||||
|
||||
#define BUS_MESSAGE_SIZE_MAX (128*1024*1024)
|
||||
#define BUS_AUTH_SIZE_MAX (64*1024)
|
||||
+/* Note that the D-Bus specification states that bus paths shall have no size limit. We enforce here one
|
||||
+ * anyway, since truly unbounded strings are a security problem. The limit we pick is relatively large however,
|
||||
+ * to not clash unnecessarily with real-life applications. */
|
||||
+#define BUS_PATH_SIZE_MAX (64*1024)
|
||||
|
||||
#define BUS_CONTAINER_DEPTH 128
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -0,0 +1,194 @@
|
||||
From 9e3f5a77226d5320270c92df001f6c79be735af3 Mon Sep 17 00:00:00 2001
|
||||
From: Riccardo Schirone <rschiron@redhat.com>
|
||||
Date: Mon, 4 Feb 2019 14:29:28 +0100
|
||||
Subject: [PATCH] Allocate temporary strings to hold dbus paths on the heap
|
||||
|
||||
Paths are limited to BUS_PATH_SIZE_MAX but the maximum size is anyway too big
|
||||
to be allocated on the stack, so let's switch to the heap where there is a
|
||||
clear way to understand if the allocation fails.
|
||||
|
||||
(cherry picked from commit f519a19bcd5afe674a9b8fc462cd77d8bad403c1)
|
||||
[baruch: backport to v240]
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: commit f519a19bcd5
|
||||
|
||||
src/libsystemd/sd-bus/bus-objects.c | 68 +++++++++++++++++++++++------
|
||||
1 file changed, 54 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
|
||||
index d0538104ae25..54b977418e03 100644
|
||||
--- a/src/libsystemd/sd-bus/bus-objects.c
|
||||
+++ b/src/libsystemd/sd-bus/bus-objects.c
|
||||
@@ -1133,7 +1133,8 @@ static int object_manager_serialize_path_and_fallbacks(
|
||||
const char *path,
|
||||
sd_bus_error *error) {
|
||||
|
||||
- char *prefix;
|
||||
+ _cleanup_free_ char *prefix = NULL;
|
||||
+ size_t pl;
|
||||
int r;
|
||||
|
||||
assert(bus);
|
||||
@@ -1149,7 +1150,12 @@ static int object_manager_serialize_path_and_fallbacks(
|
||||
return 0;
|
||||
|
||||
/* Second, add fallback vtables registered for any of the prefixes */
|
||||
- prefix = alloca(strlen(path) + 1);
|
||||
+ pl = strlen(path);
|
||||
+ assert(pl <= BUS_PATH_SIZE_MAX);
|
||||
+ prefix = new(char, pl + 1);
|
||||
+ if (!prefix)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
|
||||
r = object_manager_serialize_path(bus, reply, prefix, path, true, error);
|
||||
if (r < 0)
|
||||
@@ -1345,6 +1351,7 @@ static int object_find_and_run(
|
||||
}
|
||||
|
||||
int bus_process_object(sd_bus *bus, sd_bus_message *m) {
|
||||
+ _cleanup_free_ char *prefix = NULL;
|
||||
int r;
|
||||
size_t pl;
|
||||
bool found_object = false;
|
||||
@@ -1369,9 +1376,12 @@ int bus_process_object(sd_bus *bus, sd_bus_message *m) {
|
||||
assert(m->member);
|
||||
|
||||
pl = strlen(m->path);
|
||||
- do {
|
||||
- char prefix[pl+1];
|
||||
+ assert(pl <= BUS_PATH_SIZE_MAX);
|
||||
+ prefix = new(char, pl + 1);
|
||||
+ if (!prefix)
|
||||
+ return -ENOMEM;
|
||||
|
||||
+ do {
|
||||
bus->nodes_modified = false;
|
||||
|
||||
r = object_find_and_run(bus, m, m->path, false, &found_object);
|
||||
@@ -1498,9 +1508,15 @@ static int bus_find_parent_object_manager(sd_bus *bus, struct node **out, const
|
||||
|
||||
n = hashmap_get(bus->nodes, path);
|
||||
if (!n) {
|
||||
- char *prefix;
|
||||
+ _cleanup_free_ char *prefix = NULL;
|
||||
+ size_t pl;
|
||||
+
|
||||
+ pl = strlen(path);
|
||||
+ assert(pl <= BUS_PATH_SIZE_MAX);
|
||||
+ prefix = new(char, pl + 1);
|
||||
+ if (!prefix)
|
||||
+ return -ENOMEM;
|
||||
|
||||
- prefix = alloca(strlen(path) + 1);
|
||||
OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
|
||||
n = hashmap_get(bus->nodes, prefix);
|
||||
if (n)
|
||||
@@ -2083,8 +2099,9 @@ _public_ int sd_bus_emit_properties_changed_strv(
|
||||
const char *interface,
|
||||
char **names) {
|
||||
|
||||
+ _cleanup_free_ char *prefix = NULL;
|
||||
bool found_interface = false;
|
||||
- char *prefix;
|
||||
+ size_t pl;
|
||||
int r;
|
||||
|
||||
assert_return(bus, -EINVAL);
|
||||
@@ -2105,6 +2122,12 @@ _public_ int sd_bus_emit_properties_changed_strv(
|
||||
|
||||
BUS_DONT_DESTROY(bus);
|
||||
|
||||
+ pl = strlen(path);
|
||||
+ assert(pl <= BUS_PATH_SIZE_MAX);
|
||||
+ prefix = new(char, pl + 1);
|
||||
+ if (!prefix)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
do {
|
||||
bus->nodes_modified = false;
|
||||
|
||||
@@ -2114,7 +2137,6 @@ _public_ int sd_bus_emit_properties_changed_strv(
|
||||
if (bus->nodes_modified)
|
||||
continue;
|
||||
|
||||
- prefix = alloca(strlen(path) + 1);
|
||||
OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
|
||||
r = emit_properties_changed_on_interface(bus, prefix, path, interface, true, &found_interface, names);
|
||||
if (r != 0)
|
||||
@@ -2246,7 +2268,8 @@ static int object_added_append_all_prefix(
|
||||
|
||||
static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *path) {
|
||||
_cleanup_set_free_ Set *s = NULL;
|
||||
- char *prefix;
|
||||
+ _cleanup_free_ char *prefix = NULL;
|
||||
+ size_t pl;
|
||||
int r;
|
||||
|
||||
assert(bus);
|
||||
@@ -2291,7 +2314,12 @@ static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *p
|
||||
if (bus->nodes_modified)
|
||||
return 0;
|
||||
|
||||
- prefix = alloca(strlen(path) + 1);
|
||||
+ pl = strlen(path);
|
||||
+ assert(pl <= BUS_PATH_SIZE_MAX);
|
||||
+ prefix = new(char, pl + 1);
|
||||
+ if (!prefix)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
|
||||
r = object_added_append_all_prefix(bus, m, s, prefix, path, true);
|
||||
if (r < 0)
|
||||
@@ -2430,7 +2458,8 @@ static int object_removed_append_all_prefix(
|
||||
|
||||
static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char *path) {
|
||||
_cleanup_set_free_ Set *s = NULL;
|
||||
- char *prefix;
|
||||
+ _cleanup_free_ char *prefix = NULL;
|
||||
+ size_t pl;
|
||||
int r;
|
||||
|
||||
assert(bus);
|
||||
@@ -2462,7 +2491,12 @@ static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char
|
||||
if (bus->nodes_modified)
|
||||
return 0;
|
||||
|
||||
- prefix = alloca(strlen(path) + 1);
|
||||
+ pl = strlen(path);
|
||||
+ assert(pl <= BUS_PATH_SIZE_MAX);
|
||||
+ prefix = new(char, pl + 1);
|
||||
+ if (!prefix)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
|
||||
r = object_removed_append_all_prefix(bus, m, s, prefix, path, true);
|
||||
if (r < 0)
|
||||
@@ -2612,7 +2646,8 @@ static int interfaces_added_append_one(
|
||||
const char *path,
|
||||
const char *interface) {
|
||||
|
||||
- char *prefix;
|
||||
+ _cleanup_free_ char *prefix = NULL;
|
||||
+ size_t pl;
|
||||
int r;
|
||||
|
||||
assert(bus);
|
||||
@@ -2626,7 +2661,12 @@ static int interfaces_added_append_one(
|
||||
if (bus->nodes_modified)
|
||||
return 0;
|
||||
|
||||
- prefix = alloca(strlen(path) + 1);
|
||||
+ pl = strlen(path);
|
||||
+ assert(pl <= BUS_PATH_SIZE_MAX);
|
||||
+ prefix = new(char, pl + 1);
|
||||
+ if (!prefix)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
OBJECT_PATH_FOREACH_PREFIX(prefix, path) {
|
||||
r = interfaces_added_append_one_prefix(bus, m, prefix, path, interface, true);
|
||||
if (r != 0)
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -2,7 +2,7 @@ config BR2_PACKAGE_UPMPDCLI
|
||||
bool "upmpdcli"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libupnpp, libmicrohttpd
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11, libupnpp
|
||||
select BR2_PACKAGE_JSONCPP
|
||||
select BR2_PACKAGE_LIBMICROHTTPD
|
||||
@@ -15,6 +15,8 @@ config BR2_PACKAGE_UPMPDCLI
|
||||
|
||||
http://www.lesbonscomptes.com/upmpdcli/
|
||||
|
||||
comment "upmpdcli needs a toolchain w/ C++, threads, gcc >= 4.9"
|
||||
comment "upmpdcli needs a toolchain w/ C++, NPTL, gcc >= 4.9"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
|
||||
@@ -13,6 +13,8 @@ ZBAR_AUTORECONF = YES
|
||||
ZBAR_DEPENDENCIES = libv4l jpeg
|
||||
# add host-gettext for AM_ICONV macro
|
||||
ZBAR_DEPENDENCIES += host-gettext
|
||||
# uses C99 features
|
||||
ZBAR_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
|
||||
ZBAR_CONF_OPTS = \
|
||||
--disable-doc \
|
||||
--without-imagemagick \
|
||||
|
||||
@@ -1,14 +1,9 @@
|
||||
# Versions before 3.0 are affected by the bug described in
|
||||
# https://git.busybox.net/buildroot/commit/?id=ef2c1970e4bff3be3992014070392b0e6bc28bd2
|
||||
# and fixed in upstream CMake in version 3.0:
|
||||
# https://cmake.org/gitweb?p=cmake.git;h=e8b8b37ef6fef094940d3384df5a1d421b9fa568
|
||||
#
|
||||
# Set this to either 3.0 or higher, depending on the highest minimum
|
||||
# Set this to either 3.8 or higher, depending on the highest minimum
|
||||
# version required by any of the packages bundled in Buildroot. If a
|
||||
# package is bumped or a new one added, and it requires a higher
|
||||
# version, our cmake infra will catch it and whine.
|
||||
# version, our cmake infra will catch it and build its own.
|
||||
#
|
||||
BR2_CMAKE_VERSION_MIN = 3.1
|
||||
BR2_CMAKE_VERSION_MIN = 3.8
|
||||
|
||||
BR2_CMAKE_CANDIDATES ?= cmake cmake3
|
||||
BR2_CMAKE ?= $(call suitable-host-package,cmake,\
|
||||
|
||||
-2
@@ -1,2 +0,0 @@
|
||||
sha256 e78abd24049c6acac81a02fb8fa6dfa60db74a19772d41e28ad9d6b9b77c8054 git-special-ref-b72ff6078f62522a87f5cae5e9f34dedf5ec3885.tar.gz
|
||||
sha256 b252b594be4679764e2e06cfea77a3e50638dd445af9b472b0f298c43b134518 file
|
||||
-11
@@ -1,11 +0,0 @@
|
||||
################################################################################
|
||||
#
|
||||
# git-special-ref
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GIT_SPECIAL_REF_VERSION = b72ff6078f62522a87f5cae5e9f34dedf5ec3885
|
||||
GIT_SPECIAL_REF_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
|
||||
GIT_SPECIAL_REF_LICENSE_FILES = file
|
||||
|
||||
$(eval $(generic-package))
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
-3
@@ -1,3 +0,0 @@
|
||||
xÎAN!@Qל‚ô¤
|
||||
h Œ1^À�ž€¦Š‘ÌÐL\x{;qáÞ¸}‹ŸŸ{kujkèa�!; •ùÈ<@)Dh„|av·- NÝÒ�}êdlÜ�KæhVv�£u©Ø¼cÝ‹‘ X¥Ïùч~«9
îú5�Y÷Üï—ªŸÆžÚ/¾œ[ª×SîíYã
|
||||
�<‚z =¦§üSNÝo’kº)J½×ó.¼ôR–íëñ/¿êâm¾
|
||||
@@ -1 +0,0 @@
|
||||
b72ff6078f62522a87f5cae5e9f34dedf5ec3885
|
||||
@@ -76,7 +76,6 @@ class TestGitRefs(GitTestBase):
|
||||
self.check_download("git-sha1-reachable-by-tag")
|
||||
self.check_download("git-sha1-tag-itself")
|
||||
self.check_download("git-sha1-tag-points-to")
|
||||
self.check_download("git-special-ref")
|
||||
self.check_download("git-submodule-disabled")
|
||||
self.check_download("git-submodule-enabled")
|
||||
self.check_download("git-tag")
|
||||
|
||||
@@ -97,6 +97,7 @@ def pkg_buildroot_name(pkg_name):
|
||||
pkg_name -- String to rename
|
||||
"""
|
||||
name = re.sub('[^\w-]', '', pkg_name.lower())
|
||||
name = name.replace('_', '-')
|
||||
prefix = 'python-'
|
||||
pattern = re.compile('^(?!' + prefix + ')(.+?)$')
|
||||
name = pattern.sub(r'python-\1', name)
|
||||
@@ -299,6 +300,12 @@ class BuildrootPackage():
|
||||
sys.path.append(self.tmp_extract)
|
||||
s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract])
|
||||
setup = imp.load_module('setup', s_file, s_path, s_desc)
|
||||
if self.metadata_name in self.setup_args:
|
||||
pass
|
||||
elif self.metadata_name.replace('_', '-') in self.setup_args:
|
||||
self.metadata_name = self.metadata_name.replace('_', '-')
|
||||
elif self.metadata_name.replace('-', '_') in self.setup_args:
|
||||
self.metadata_name = self.metadata_name.replace('-', '_')
|
||||
try:
|
||||
self.setup_metadata = self.setup_args[self.metadata_name]
|
||||
except KeyError:
|
||||
|
||||
Reference in New Issue
Block a user