mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-07-24 13:36:31 +00:00
Update Buildroot to 2021.02 (#1274)
This commit is contained in:
parent
0a2fdf47b3
commit
37d2f13e49
@ -1,3 +1,23 @@
|
||||
2021.02, released March 6th, 2021
|
||||
|
||||
Various fixes.
|
||||
|
||||
Toolchain: Correct Bootlin xtensa-lx60 dependencies
|
||||
|
||||
Updated/fixed packages: asterisk, belle-sip, bustle, dhcpcd,
|
||||
dovecot, dovecot-pigeonhole, gnuchess, gnuradio,
|
||||
gst1-plugins-bad, haproxy, jasper, kismet, libebml,
|
||||
libeXosip2, libgeos, libhtp, libjpeg, libopenssl, libshout,
|
||||
libstrophe, mosquitto, openblas, openssh, perl, privoxy,
|
||||
prosody, python-pyyaml, python3-pyyaml, quagga, redis,
|
||||
rust-bin, sox, suricata, tpm2-pkcs11, uclibc-ng-test, ushare,
|
||||
util-linux, wolfssl, wpa_supplicant
|
||||
|
||||
Issues resolved (http://bugs.uclibc.org):
|
||||
|
||||
#13501: 2021.02.rc2: Unicode not work on qt 5.15.2
|
||||
#13581: jpegsrc.v9d.tar.gz has changed hash
|
||||
|
||||
2021.02-rc3, released February 27th, 2021
|
||||
|
||||
Fixes all over the tree.
|
||||
|
@ -492,8 +492,8 @@ F: board/friendlyarm/nanopi-m1
|
||||
F: board/friendlyarm/nanopi-m1-plus
|
||||
F: board/olimex/a13_olinuxino
|
||||
F: board/orangepi/orangepi-plus
|
||||
F: configs/nanopi_m1_defconfig
|
||||
F: configs/nanopi_m1_plus_defconfig
|
||||
F: configs/friendlyarm_nanopi_m1_defconfig
|
||||
F: configs/friendlyarm_nanopi_m1_plus_defconfig
|
||||
F: configs/olimex_a13_olinuxino_defconfig
|
||||
F: configs/orangepi_plus_defconfig
|
||||
|
||||
@ -662,7 +662,7 @@ F: package/ev3dev-linux-drivers/
|
||||
|
||||
N: Davide Viti <zinosat@gmail.com>
|
||||
F: board/friendlyarm/nanopi-r1/
|
||||
F: configs/nanopi_r1_defconfig
|
||||
F: configs/friendlyarm_nanopi_r1_defconfig
|
||||
F: package/flann/
|
||||
F: package/python-paho-mqtt/
|
||||
F: package/qhull/
|
||||
@ -1642,7 +1642,7 @@ F: utils/diffconfig
|
||||
|
||||
N: Marek Belisko <marek.belisko@open-nandra.com>
|
||||
F: board/friendlyarm/nanopi-neo4/
|
||||
F: configs/nanopi_neo4_defconfig
|
||||
F: configs/friendlyarm_nanopi_neo4_defconfig
|
||||
F: package/libatasmart/
|
||||
F: package/polkit/
|
||||
F: package/sg3_utils/
|
||||
@ -2483,8 +2483,8 @@ F: board/pine64/rockpro64
|
||||
F: board/radxa/rockpi-4
|
||||
F: board/radxa/rockpi-n8
|
||||
F: board/radxa/rockpi-n10
|
||||
F: configs/nanopc_t4_defconfig
|
||||
F: configs/nanopi_m4_defconfig
|
||||
F: configs/friendlyarm_nanopc_t4_defconfig
|
||||
F: configs/friendlyarm_nanopi_m4_defconfig
|
||||
F: configs/orangepi_rk3399_defconfig
|
||||
F: configs/roc_pc_rk3399_defconfig
|
||||
F: configs/rock_pi_4_defconfig
|
||||
@ -2722,7 +2722,7 @@ F: package/open62541/
|
||||
|
||||
N: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
F: board/friendlyarm/nanopi-neo/
|
||||
F: configs/nanopi_neo_defconfig
|
||||
F: configs/friendlyarm_nanopi_neo_defconfig
|
||||
F: fs/squashfs/
|
||||
F: package/asterisk/
|
||||
F: package/cegui/
|
||||
|
@ -92,9 +92,9 @@ all:
|
||||
.PHONY: all
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2021.02-rc3
|
||||
export BR2_VERSION := 2021.02
|
||||
# Actual time the release is cut (for reproducible builds)
|
||||
BR2_VERSION_EPOCH = 1614447000
|
||||
BR2_VERSION_EPOCH = 1615065000
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
|
@ -3,7 +3,7 @@ FriendlyARM NANOPC-T4
|
||||
|
||||
Build:
|
||||
|
||||
$ make nanopc_t4_defconfig
|
||||
$ make friendlyarm_nanopc_t4_defconfig
|
||||
$ make
|
||||
|
||||
Files created in output directory
|
||||
|
@ -12,7 +12,7 @@ How to build it
|
||||
|
||||
Configure Buildroot:
|
||||
|
||||
$ make nanopi_m1_plus_defconfig
|
||||
$ make friendlyarm_nanopi_m1_plus_defconfig
|
||||
|
||||
Compile everything and build the SD card image:
|
||||
|
||||
|
@ -12,7 +12,7 @@ How to build it
|
||||
|
||||
Configure Buildroot:
|
||||
|
||||
$ make nanopi_m1_defconfig
|
||||
$ make friendlyarm_nanopi_m1_defconfig
|
||||
|
||||
Compile everything and build the SD card image:
|
||||
|
||||
|
@ -3,7 +3,7 @@ FriendlyARM NANOPI-M4
|
||||
|
||||
Build:
|
||||
|
||||
$ make nanopi_m4_defconfig
|
||||
$ make friendlyarm_nanopi_m4_defconfig
|
||||
$ make
|
||||
|
||||
Files created in output directory
|
||||
|
@ -24,7 +24,7 @@ yet upstream, but are being actively worked on.
|
||||
How to build
|
||||
============
|
||||
|
||||
$ make nanopi_neo_defconfig
|
||||
$ make friendlyarm_nanopi_neo_defconfig
|
||||
$ make
|
||||
|
||||
Note: you will need access to the internet to download the required
|
||||
|
@ -12,7 +12,7 @@ Build
|
||||
|
||||
Run NanoPi Neo4 configuration
|
||||
|
||||
$ make nanopi_neo4_defconfig
|
||||
$ make friendlyarm_nanopi_neo4_defconfig
|
||||
|
||||
To build, run make comamnd.
|
||||
|
||||
|
@ -12,7 +12,7 @@ How to build it
|
||||
|
||||
Configure Buildroot:
|
||||
|
||||
$ make nanopi_r1_defconfig
|
||||
$ make friendlyarm_nanopi_r1_defconfig
|
||||
|
||||
Compile everything and build the SD card image:
|
||||
|
||||
|
@ -528,14 +528,8 @@ LIBFOO_IGNORE_CVES += CVE-2020-54321
|
||||
+
|
||||
If any of those variables is defined, then the generic package
|
||||
infrastructure assumes the package provides valid CPE information. In
|
||||
this case, +LIBFOO_CPE_ID_VALID = YES+ will be set, and the generic
|
||||
package infrastructure will define +LIBFOO_CPE_ID+.
|
||||
+
|
||||
Alternatively, a package can also explicitly set +LIBFOO_CPE_ID_VALID
|
||||
= YES+ if the default values for +LIBFOO_CPE_ID_PREFIX+,
|
||||
+LIBFOO_CPE_ID_VENDOR+, +LIBFOO_CPE_ID_PRODUCT+,
|
||||
+LIBFOO_CPE_ID_VERSION+, +LIBFOO_CPE_ID_UPDATE+ are all correct for
|
||||
this package and don't need to be explicitly overridden.
|
||||
this case, the generic package infrastructure will define
|
||||
+LIBFOO_CPE_ID+.
|
||||
+
|
||||
For a host package, if its +LIBFOO_CPE_ID_*+ variables are not
|
||||
defined, it inherits the value of those variables from the
|
||||
|
File diff suppressed because one or more lines are too long
Binary file not shown.
@ -174,13 +174,13 @@ List of Examples
|
||||
|
||||
---------------------------------------------------------------------
|
||||
|
||||
Buildroot 2021.02-rc3 manual generated on 2021-02-27 17:37:02 UTC
|
||||
from git revision 4c5b27fbef
|
||||
Buildroot 2021.02 manual generated on 2021-03-06 21:24:27 UTC from
|
||||
git revision e2fba6457b
|
||||
|
||||
The Buildroot manual is written by the Buildroot developers. It is
|
||||
licensed under the GNU General Public License, version 2. Refer to
|
||||
the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id=
|
||||
4c5b27fbef3db3a3dc3628e90d452493729f51aa] file in the Buildroot
|
||||
e2fba6457bd9d9c720540332eaf0c1f8c29eab00] file in the Buildroot
|
||||
sources for the full text of this license.
|
||||
|
||||
Copyright © 2004-2020 The Buildroot developers
|
||||
@ -4872,15 +4872,8 @@ LIBFOO_IGNORE_CVES += CVE-2020-54321
|
||||
|
||||
If any of those variables is defined, then the generic package
|
||||
infrastructure assumes the package provides valid CPE
|
||||
information. In this case, LIBFOO_CPE_ID_VALID = YES will be set,
|
||||
and the generic package infrastructure will define LIBFOO_CPE_ID.
|
||||
|
||||
Alternatively, a package can also explicitly set
|
||||
LIBFOO_CPE_ID_VALID = YES if the default values for
|
||||
LIBFOO_CPE_ID_PREFIX, LIBFOO_CPE_ID_VENDOR,
|
||||
LIBFOO_CPE_ID_PRODUCT, LIBFOO_CPE_ID_VERSION,
|
||||
LIBFOO_CPE_ID_UPDATE are all correct for this package and don’t
|
||||
need to be explicitly overridden.
|
||||
information. In this case, the generic package infrastructure
|
||||
will define LIBFOO_CPE_ID.
|
||||
|
||||
For a host package, if its LIBFOO_CPE_ID_* variables are not
|
||||
defined, it inherits the value of those variables from the
|
||||
|
@ -8,40 +8,40 @@
|
||||
<div class="panel-heading">Download</div>
|
||||
<div class="panel-body">
|
||||
|
||||
<h3 style="text-align: center;">Latest long term support release: <b>2020.02.11</b></h3>
|
||||
<h3 style="text-align: center;">Latest stable / long term support release: <b>2021.02</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-2020.02.11.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2020.02.11.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h3><a href="/downloads/buildroot-2020.02.11.tar.gz">buildroot-2020.02.11.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2020.02.11.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2021.02.tar.gz">buildroot-2021.02.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2021.02.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-2020.02.11.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2020.02.11.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2021.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2020.02.11.tar.bz2">buildroot-2020.02.11.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2020.02.11.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2021.02.tar.bz2">buildroot-2021.02.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2021.02.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2020.11.3</b></h3>
|
||||
|
||||
<div class="row mt centered">
|
||||
@ -109,7 +109,7 @@
|
||||
<p><a href="/downloads/buildroot-2021.02-rc3.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
-->
|
||||
This and earlier releases (and their PGP signatures) can always be downloaded from
|
||||
<a href="/downloads/">http://buildroot.net/downloads/</a>.
|
||||
</div>
|
||||
|
@ -9,6 +9,27 @@
|
||||
<h2>News</h2>
|
||||
<ul class="timeline">
|
||||
|
||||
<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">2021.02 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>6 March 2021</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The stable 2021.02 release is out - Thanks to everyone
|
||||
contributing and testing the release candidates. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2021.02">CHANGES</a>
|
||||
file for more details
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2021.02.tar.bz2">2021.02 release</a>.</p>
|
||||
|
||||
<p>Notice that this is a long term support release which will be
|
||||
supported with security and other important fixes until March 2022.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li class="timeline-inverted">
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
|
@ -125,7 +125,7 @@ endif
|
||||
|
||||
config BR2_LINUX_KERNEL_VERSION
|
||||
string
|
||||
default "5.10.13" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "5.10.19" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "4.19.152-cip37" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
default "4.19.152-cip37-rt16" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
|
||||
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
|
||||
|
@ -1,11 +1,11 @@
|
||||
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
|
||||
sha256 06698c0ce35ceefa9b79ceb108ec7fb86de05f51fe615f3ae5cc82e293dfe1f2 linux-5.10.13.tar.xz
|
||||
sha256 030ae544f346bfa2ce619dd9e17e93d10ec393632d3b6d6cf5d1fc84b914d449 linux-5.4.95.tar.xz
|
||||
sha256 27e7bbb0de7f0acc29c3c2e0a70c9a5fafc5fcf250993ce48713f809862ab4d6 linux-5.10.19.tar.xz
|
||||
sha256 4e118c072dbe3209ddeaff32ecc558f7e809d54e661550342079f1ee76d9349d linux-5.4.101.tar.xz
|
||||
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
|
||||
sha256 2f3830ed4767b27dc6ead9af5c802eed7258b28c527efe90ce188cc6bd668550 linux-4.4.255.tar.xz
|
||||
sha256 afdf2d03c920f6b12f4e207ab18e45fbe2d7f4a61c066eff0d9916fc5d00c118 linux-4.9.255.tar.xz
|
||||
sha256 75eecaa731c091fcf3bc2ec914b01d299a447d78041cb66a11a2ab169eb801dd linux-4.14.219.tar.xz
|
||||
sha256 d2fdd236e6f31aa8e939f4a686c95417d8571bde3d091fc6a2535937c144195f linux-4.19.173.tar.xz
|
||||
sha256 0c41611ae151b80723eb68c75f8a3366756f93e8748ab0892255344f38d76665 linux-4.4.258.tar.xz
|
||||
sha256 d478f8e069f6d8b86b0a69f99252ea9e7cd7070bf6bdd0e9b3773ee418e5c8cd linux-4.9.258.tar.xz
|
||||
sha256 734082b03d9f8e43b123b0061f08045b70c34e3a4b09f8a8da6a287686dac744 linux-4.14.222.tar.xz
|
||||
sha256 ac0eb3794e01eac66bea3ab39b8776dadf15c418ddc534ccfd95a0270302357d linux-4.19.177.tar.xz
|
||||
# Locally computed
|
||||
sha256 d2a06f52143deb929b8d513cf9afc9bd065951389a80fa70bc4d63025b5b3fb9 linux-cip-4.19.152-cip37.tar.gz
|
||||
sha256 bc1dacd3d0f526de3e8754a444e8e02a54521527af639ddb907cb35cda775a8c linux-cip-4.19.152-cip37-rt16.tar.gz
|
||||
|
@ -9,6 +9,8 @@ APR_UTIL_SOURCE = apr-util-$(APR_UTIL_VERSION).tar.bz2
|
||||
APR_UTIL_SITE = http://archive.apache.org/dist/apr
|
||||
APR_UTIL_LICENSE = Apache-2.0
|
||||
APR_UTIL_LICENSE_FILES = LICENSE
|
||||
APR_UTIL_CPE_ID_VENDOR = apache
|
||||
APR_UTIL_CPE_ID_PRODUCT = portable_runtime_utility
|
||||
APR_UTIL_INSTALL_STAGING = YES
|
||||
APR_UTIL_DEPENDENCIES = apr expat
|
||||
APR_UTIL_CONF_OPTS = \
|
||||
|
@ -8,6 +8,6 @@ ASN1C_VERSION = 0.9.28
|
||||
ASN1C_SITE = https://github.com/vlm/asn1c/releases/download/v$(ASN1C_VERSION)
|
||||
ASN1C_LICENSE = BSD-2-Clause
|
||||
ASN1C_LICENSE_FILES = LICENSE
|
||||
ASN1C_CPE_ID_VALID = YES
|
||||
ASN1C_CPE_ID_VENDOR = asn1c_project
|
||||
|
||||
$(eval $(host-autotools-package))
|
||||
|
@ -280,6 +280,17 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
ASTERISK_MAKE_OPTS += ASTLDFLAGS="-latomic"
|
||||
endif
|
||||
|
||||
# Remove default -O3 optimization flag
|
||||
ASTERISK_MAKE_OPTS += OPTIMIZE=""
|
||||
|
||||
ASTERISK_CFLAGS = $(TARGET_CFLAGS)
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_93847),y)
|
||||
ASTERISK_CFLAGS += -O0
|
||||
endif
|
||||
|
||||
ASTERISK_CONF_OPTS += CFLAGS="$(ASTERISK_CFLAGS)"
|
||||
|
||||
# We want to install sample configuration files, too.
|
||||
ASTERISK_INSTALL_TARGET_OPTS = \
|
||||
$(ASTERISK_DIRS) \
|
||||
|
@ -8,7 +8,7 @@ ATFTP_VERSION = 0.7.4
|
||||
ATFTP_SITE = http://sourceforge.net/projects/atftp/files
|
||||
ATFTP_LICENSE = GPL-2.0+
|
||||
ATFTP_LICENSE_FILES = LICENSE
|
||||
ATFTP_CPE_ID_VALID = YES
|
||||
ATFTP_CPE_ID_VENDOR = atftp_project
|
||||
ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp
|
||||
# For static we need to explicitly link against libpthread
|
||||
ATFTP_LIBS = -lpthread
|
||||
|
@ -8,7 +8,7 @@ ATOP_VERSION = 2.6.0
|
||||
ATOP_SITE = http://www.atoptool.nl/download
|
||||
ATOP_LICENSE = GPL-2.0+
|
||||
ATOP_LICENSE_FILES = COPYING
|
||||
ATOP_CPE_ID_VALID = YES
|
||||
ATOP_CPE_ID_VENDOR = atop_project
|
||||
ATOP_DEPENDENCIES = ncurses zlib
|
||||
|
||||
ATOP_CFLAGS = $(TARGET_CFLAGS)
|
||||
|
@ -8,7 +8,7 @@ ATTR_VERSION = 2.4.48
|
||||
ATTR_SITE = http://download.savannah.gnu.org/releases/attr
|
||||
ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
|
||||
ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
|
||||
ATTR_CPE_ID_VALID = YES
|
||||
ATTR_CPE_ID_VENDOR = attr_project
|
||||
|
||||
ATTR_INSTALL_STAGING = YES
|
||||
|
||||
|
@ -9,7 +9,7 @@ AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/
|
||||
AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz
|
||||
AXEL_LICENSE = GPL-2.0+
|
||||
AXEL_LICENSE_FILES = COPYING
|
||||
AXEL_CPE_ID_VALID = YES
|
||||
AXEL_CPE_ID_VENDOR = axel_project
|
||||
AXEL_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
|
||||
|
||||
# ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test
|
||||
|
@ -10,7 +10,7 @@ BDWGC_SITE = http://www.hboehm.info/gc/gc_source
|
||||
BDWGC_INSTALL_STAGING = YES
|
||||
BDWGC_LICENSE = bdwgc license
|
||||
BDWGC_LICENSE_FILES = README.QUICK
|
||||
BDWGC_CPE_ID_VALID = YES
|
||||
BDWGC_CPE_ID_VENDOR = bdwgc_project
|
||||
BDWGC_DEPENDENCIES = libatomic_ops host-pkgconf
|
||||
HOST_BDWGC_DEPENDENCIES = host-libatomic_ops host-pkgconf
|
||||
|
||||
|
@ -10,7 +10,7 @@ BEECRYPT_AUTORECONF = YES
|
||||
BEECRYPT_INSTALL_STAGING = YES
|
||||
BEECRYPT_LICENSE = LGPL-2.1+
|
||||
BEECRYPT_LICENSE_FILES = COPYING.LIB
|
||||
BEECRYPT_CPE_ID_VALID = YES
|
||||
BEECRYPT_CPE_ID_VENDOR = beecrypt_project
|
||||
|
||||
BEECRYPT_CONF_OPTS = \
|
||||
--disable-expert-mode \
|
||||
|
@ -32,4 +32,12 @@ else ifeq ($(BR2_SHARED_LIBS),y)
|
||||
BELLE_SIP_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF
|
||||
endif
|
||||
|
||||
BELLE_SIP_CFLAGS = $(TARGET_CFLAGS)
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_99140),y)
|
||||
BELLE_SIP_CFLAGS += -O0
|
||||
endif
|
||||
|
||||
BELLE_SIP_CONF_OPTS += -DCMAKE_C_FLAGS="$(BELLE_SIP_CFLAGS)"
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
@ -9,6 +9,7 @@ BOOTSTRAP_SITE = https://github.com/twbs/bootstrap/releases/download/v$(BOOTSTRA
|
||||
BOOTSTRAP_SOURCE = bootstrap-$(BOOTSTRAP_VERSION)-dist.zip
|
||||
BOOTSTRAP_LICENSE = MIT
|
||||
BOOTSTRAP_LICENSE_FILES = css/bootstrap.css
|
||||
BOOTSTRAP_CPE_ID_VENDOR = getbootstrap
|
||||
|
||||
define BOOTSTRAP_EXTRACT_CMDS
|
||||
$(UNZIP) $(BOOTSTRAP_DL_DIR)/$(BOOTSTRAP_SOURCE) -d $(@D)
|
||||
|
@ -9,7 +9,7 @@ BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz
|
||||
BOTAN_SITE = http://botan.randombit.net/releases
|
||||
BOTAN_LICENSE = BSD-2-Clause
|
||||
BOTAN_LICENSE_FILES = license.txt
|
||||
BOTAN_CPE_ID_VALID = YES
|
||||
BOTAN_CPE_ID_VENDOR = botan_project
|
||||
|
||||
BOTAN_INSTALL_STAGING = YES
|
||||
|
||||
|
@ -11,6 +11,7 @@ BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap
|
||||
|
||||
BUBBLEWRAP_LICENSE = LGPL-2.0+
|
||||
BUBBLEWRAP_LICENSE_FILES = COPYING
|
||||
BUBBLEWRAP_CPE_ID_VENDOR = projectatomic
|
||||
|
||||
BUBBLEWRAP_CONF_OPTS = \
|
||||
--enable-require-userns=no \
|
||||
|
@ -9,7 +9,12 @@ BUSTLE_SITE = https://hackage.haskell.org/package/bustle-$(BUSTLE_VERSION)
|
||||
BUSTLE_LICENSE = LGPL-2.1+
|
||||
BUSTLE_LICENSE_FILES = LICENSE
|
||||
BUSTLE_DEPENDENCIES = libglib2 libpcap host-pkgconf
|
||||
BUSTLE_MAKE_OPTS = PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
BUSTLE_MAKE_OPTS += PCAP_CONFIG="$(STAGING_DIR)/usr/bin/pcap-config --static"
|
||||
else
|
||||
BUSTLE_MAKE_OPTS += PCAP_CONFIG="$(STAGING_DIR)/usr/bin/pcap-config"
|
||||
endif
|
||||
|
||||
define BUSTLE_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
|
||||
|
@ -9,7 +9,7 @@ C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz
|
||||
C_ICAP_SITE = http://downloads.sourceforge.net/c-icap
|
||||
C_ICAP_LICENSE = LGPL-2.1+
|
||||
C_ICAP_LICENSE_FILES = COPYING
|
||||
C_ICAP_CPE_ID_VALID = YES
|
||||
C_ICAP_CPE_ID_VENDOR = c-icap_project
|
||||
C_ICAP_INSTALL_STAGING = YES
|
||||
C_ICAP_CONFIG_SCRIPTS = c-icap-config c-icap-libicapapi-config
|
||||
C_ICAP_CONF_OPTS = \
|
||||
|
@ -8,7 +8,7 @@ CIVETWEB_VERSION = 1.13
|
||||
CIVETWEB_SITE = $(call github,civetweb,civetweb,v$(CIVETWEB_VERSION))
|
||||
CIVETWEB_LICENSE = MIT
|
||||
CIVETWEB_LICENSE_FILES = LICENSE.md
|
||||
CIVETWEB_CPE_ID_VALID = YES
|
||||
CIVETWEB_CPE_ID_VENDOR = civetweb_project
|
||||
|
||||
CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 \
|
||||
$(if $(BR2_INSTALL_LIBSTDCPP),WITH_CPP=1)
|
||||
|
@ -9,7 +9,7 @@ CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION))
|
||||
CJSON_INSTALL_STAGING = YES
|
||||
CJSON_LICENSE = MIT
|
||||
CJSON_LICENSE_FILES = LICENSE
|
||||
CJSON_CPE_ID_VALID = YES
|
||||
CJSON_CPE_ID_VENDOR = cjson_project
|
||||
# Set ENABLE_CUSTOM_COMPILER_FLAGS to OFF in particular to disable
|
||||
# -fstack-protector-strong which depends on BR2_TOOLCHAIN_HAS_SSP
|
||||
CJSON_CONF_OPTS += \
|
||||
|
@ -15,7 +15,7 @@ CRYPTSETUP_DEPENDENCIES = \
|
||||
$(TARGET_NLS_DEPENDENCIES)
|
||||
CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library)
|
||||
CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL
|
||||
CRYPTSETUP_CPE_ID_VALID = YES
|
||||
CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project
|
||||
CRYPTSETUP_INSTALL_STAGING = YES
|
||||
CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)"
|
||||
CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2
|
||||
|
@ -1,7 +1,7 @@
|
||||
From bc59536c202ba134422a42fe4dfdfe0643806c8f Mon Sep 17 00:00:00 2001
|
||||
From 92dc3bd959681cf65d4a3466c89233cf0411b693 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 29 Jan 2021 22:21:00 +0100
|
||||
Subject: [PATCH] src/privsep-linux.c: add support for nds32
|
||||
Date: Sat, 30 Jan 2021 12:10:08 +0100
|
||||
Subject: [PATCH] src/privsep-linux.c: add support for nds32 (#21)
|
||||
|
||||
Fix the following build failure:
|
||||
|
||||
@ -13,17 +13,22 @@ privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a fu
|
||||
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
|
||||
^~~~~~~~~~~~~~~~~~
|
||||
|
||||
It should be noted that AUDIT_ARCH_NDS32 is only defined since kernel
|
||||
5.2 and
|
||||
https://github.com/torvalds/linux/commit/fa562447e154334523daa44c0b60625d71a345f5
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/af8ba07ea0c12ab8cd24d528ef98db05521f3d36
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/rsmarples/dhcpcd/pull/21]
|
||||
(cherry picked from commit 3848e7204f23bb78eb42dcde4898c70aca67d58d)
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
src/privsep-linux.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/privsep-linux.c b/src/privsep-linux.c
|
||||
index 2226659b..e81689bb 100644
|
||||
index d31d720d..8716032c 100644
|
||||
--- a/src/privsep-linux.c
|
||||
+++ b/src/privsep-linux.c
|
||||
@@ -182,6 +182,8 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
|
@ -0,0 +1,42 @@
|
||||
From 1a77d82b0020ff4c71ffe55262676c3403978bd5 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 31 Jan 2021 03:35:10 +0100
|
||||
Subject: [PATCH] src/privsep-linux.c: add support for xtensa (#22)
|
||||
|
||||
Fix the following build failure:
|
||||
|
||||
privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet"
|
||||
# error "Platform does not support seccomp filter yet"
|
||||
^~~~~
|
||||
In file included from privsep-linux.c:36:
|
||||
privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
|
||||
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
|
||||
^~~~~~~~~~~~~~~~~~
|
||||
|
||||
It should be noted that AUDIT_ARCH_XTENSA is only defined since kernel
|
||||
5.0 and
|
||||
https://github.com/torvalds/linux/commit/98c3115a4ec56f03056efd9295e0fcb4c5c57a85
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
(cherry picked from commit 19c3d9209a834e02918a17e011afd9da3e5be38d)
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
src/privsep-linux.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/privsep-linux.c b/src/privsep-linux.c
|
||||
index 8716032c..f1b33f91 100644
|
||||
--- a/src/privsep-linux.c
|
||||
+++ b/src/privsep-linux.c
|
||||
@@ -204,6 +204,8 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
|
||||
# else
|
||||
# define AUDIT_ARCH_SPARC
|
||||
# endif
|
||||
+#elif defined(__xtensa__)
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_XTENSA
|
||||
#else
|
||||
# error "Platform does not support seccomp filter yet"
|
||||
#endif
|
||||
--
|
||||
2.29.2
|
||||
|
@ -0,0 +1,31 @@
|
||||
From 4d2ef61b8b4abcb446699b9d3c29b422f2cf9826 Mon Sep 17 00:00:00 2001
|
||||
From: Roy Marples <roy@marples.name>
|
||||
Date: Sun, 31 Jan 2021 07:37:03 +0000
|
||||
Subject: [PATCH] Linux: Add support for NDS32BE SECCOMP
|
||||
|
||||
(cherry picked from commit 8253ef16e11db8b52af1ed8021cd2517046165d6)
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
src/privsep-linux.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/privsep-linux.c b/src/privsep-linux.c
|
||||
index f1b33f91..04950ed2 100644
|
||||
--- a/src/privsep-linux.c
|
||||
+++ b/src/privsep-linux.c
|
||||
@@ -183,7 +183,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_MIPS
|
||||
# endif
|
||||
#elif defined(__nds32__)
|
||||
-# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NDS32
|
||||
+# if (BYTE_ORDER == LITTLE_ENDIAN)
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NDS32
|
||||
+#ele
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NDS32BE
|
||||
+#endif
|
||||
#elif defined(__powerpc64__)
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
|
||||
#elif defined(__powerpc__)
|
||||
--
|
||||
2.29.2
|
||||
|
27
buildroot/package/dhcpcd/0004-Typo-with-prior.patch
Normal file
27
buildroot/package/dhcpcd/0004-Typo-with-prior.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From 59f67be640881eaf56cc30c304362af00523ff5d Mon Sep 17 00:00:00 2001
|
||||
From: Roy Marples <roy@marples.name>
|
||||
Date: Sun, 31 Jan 2021 10:08:11 +0000
|
||||
Subject: [PATCH] Typo with prior
|
||||
|
||||
(cherry picked from commit d8d7f68001db3f084dfbb6e5b8ea4491088b55ba)
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
src/privsep-linux.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/privsep-linux.c b/src/privsep-linux.c
|
||||
index 04950ed2..1660447c 100644
|
||||
--- a/src/privsep-linux.c
|
||||
+++ b/src/privsep-linux.c
|
||||
@@ -185,7 +185,7 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
|
||||
#elif defined(__nds32__)
|
||||
# if (BYTE_ORDER == LITTLE_ENDIAN)
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NDS32
|
||||
-#ele
|
||||
+#else
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NDS32BE
|
||||
#endif
|
||||
#elif defined(__powerpc64__)
|
||||
--
|
||||
2.29.2
|
||||
|
@ -0,0 +1,42 @@
|
||||
From 24ca5bdd409dd811a088bc702a2b6f99ea05ad19 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 31 Jan 2021 11:12:21 +0100
|
||||
Subject: [PATCH] src/privsep-linux.c: add support for nios2 (#23)
|
||||
|
||||
Fix the following build failure:
|
||||
|
||||
privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet"
|
||||
# error "Platform does not support seccomp filter yet"
|
||||
^~~~~
|
||||
In file included from privsep-linux.c:36:
|
||||
privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
|
||||
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
|
||||
^~~~~~~~~~~~~~~~~~
|
||||
|
||||
It should be noted that AUDIT_ARCH_NIOS2 is only defined since kernel
|
||||
5.2 and
|
||||
https://github.com/torvalds/linux/commit/1660aac45e5b49a5ace29fb5b73254617533fcbd
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
(cherry picked from commit d670866ce008c21cbf6d5b20c4d4af6460ec35d2)
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
src/privsep-linux.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/privsep-linux.c b/src/privsep-linux.c
|
||||
index 1660447c..e374c068 100644
|
||||
--- a/src/privsep-linux.c
|
||||
+++ b/src/privsep-linux.c
|
||||
@@ -188,6 +188,8 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
|
||||
#else
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NDS32BE
|
||||
#endif
|
||||
+#elif defined(__nios2__)
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NIOS2
|
||||
#elif defined(__powerpc64__)
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
|
||||
#elif defined(__powerpc__)
|
||||
--
|
||||
2.29.2
|
||||
|
@ -0,0 +1,42 @@
|
||||
From 89a2f250ed978950aecf4854d1cee16f57946759 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 31 Jan 2021 21:57:40 +0100
|
||||
Subject: [PATCH] src/privsep-linux.c: add support for microblaze (#24)
|
||||
|
||||
Fix the following build failure:
|
||||
|
||||
privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet"
|
||||
# error "Platform does not support seccomp filter yet"
|
||||
^~~~~
|
||||
In file included from privsep-linux.c:36:
|
||||
privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
|
||||
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
|
||||
^~~~~~~~~~~~~~~~~~
|
||||
|
||||
It should be noted that AUDIT_ARCH_MICROBLAZE is only defined since
|
||||
kernel 3.18 and
|
||||
https://github.com/torvalds/linux/commit/ce5d112827e5c2e9864323d0efd7ec2a62c6dce0
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
(cherry picked from commit e3a40586dbb584774d0a17bc277e69cb500cfa38)
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
src/privsep-linux.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/privsep-linux.c b/src/privsep-linux.c
|
||||
index e374c068..a861a836 100644
|
||||
--- a/src/privsep-linux.c
|
||||
+++ b/src/privsep-linux.c
|
||||
@@ -170,6 +170,8 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
|
||||
# endif
|
||||
#elif defined(__ia64__)
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_IA64
|
||||
+#elif defined(__microblaze__)
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_MICROBLAZE
|
||||
#elif defined(__mips__)
|
||||
# if defined(__MIPSEL__)
|
||||
# if defined(__LP64__)
|
||||
--
|
||||
2.29.2
|
||||
|
@ -0,0 +1,54 @@
|
||||
From 10acecc0583b7301cb539ba6875618956fa3d13b Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 5 Feb 2021 09:05:54 +0100
|
||||
Subject: [PATCH] src/privsep-linux.c: add support for sh (#25)
|
||||
|
||||
Fix the following build failure:
|
||||
|
||||
privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet"
|
||||
# error "Platform does not support seccomp filter yet"
|
||||
^~~~~
|
||||
In file included from privsep-linux.c:36:
|
||||
privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
|
||||
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
|
||||
^~~~~~~~~~~~~~~~~~
|
||||
|
||||
It should be noted that AUDIT_ARCH_{SH,SHEL,SH64,SHEL64} are defined at
|
||||
least since kernel 3.7 and
|
||||
https://github.com/torvalds/linux/commit/607ca46e97a1b6594b29647d98a32d545c24bdff
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
(cherry picked from commit 166491c2953546a677073694036f43a65fc25063)
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
src/privsep-linux.c | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
diff --git a/src/privsep-linux.c b/src/privsep-linux.c
|
||||
index a861a836..428ea4b0 100644
|
||||
--- a/src/privsep-linux.c
|
||||
+++ b/src/privsep-linux.c
|
||||
@@ -206,6 +206,20 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_S390X
|
||||
#elif defined(__s390__)
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_S390
|
||||
+#elif defined(__sh__)
|
||||
+# if defined(__LP64__)
|
||||
+# if (BYTE_ORDER == LITTLE_ENDIAN)
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SHEL64
|
||||
+# else
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SH64
|
||||
+# endif
|
||||
+# else
|
||||
+# if (BYTE_ORDER == LITTLE_ENDIAN)
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SHEL
|
||||
+# else
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SH
|
||||
+# endif
|
||||
+# endif
|
||||
#elif defined(__sparc__)
|
||||
# if defined(__arch64__)
|
||||
# define AUDIT_ARCH_SPARC64
|
||||
--
|
||||
2.29.2
|
||||
|
@ -0,0 +1,45 @@
|
||||
From be36eccb1ae53422f2aa9b42f257baeb21bd8be7 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 5 Feb 2021 09:25:12 +0100
|
||||
Subject: [PATCH] src/privsep-linux: fix build on sparc (#26)
|
||||
|
||||
Fix the following build failure:
|
||||
|
||||
privsep-linux.c:203: warning: "AUDIT_ARCH_SPARC64" redefined
|
||||
203 | # define AUDIT_ARCH_SPARC64
|
||||
|
|
||||
In file included from privsep-linux.c:35:
|
||||
/srv/storage/autobuild/run/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/linux/audit.h:392: note: this is the location of the previous definition
|
||||
392 | #define AUDIT_ARCH_SPARC64 (EM_SPARCV9|__AUDIT_ARCH_64BIT)
|
||||
|
|
||||
In file included from privsep-linux.c:36:
|
||||
privsep-linux.c:215:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
|
||||
215 | BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
|
||||
| ^~~~~~~~~~~~~~~~~~
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
(cherry picked from commit dcfd7a23f002793a855156255e81662ef84064d3)
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
src/privsep-linux.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/privsep-linux.c b/src/privsep-linux.c
|
||||
index 428ea4b0..8093740a 100644
|
||||
--- a/src/privsep-linux.c
|
||||
+++ b/src/privsep-linux.c
|
||||
@@ -222,9 +222,9 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
|
||||
# endif
|
||||
#elif defined(__sparc__)
|
||||
# if defined(__arch64__)
|
||||
-# define AUDIT_ARCH_SPARC64
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC64
|
||||
# else
|
||||
-# define AUDIT_ARCH_SPARC
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC
|
||||
# endif
|
||||
#elif defined(__xtensa__)
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_XTENSA
|
||||
--
|
||||
2.29.2
|
||||
|
@ -0,0 +1,41 @@
|
||||
From 617e3a44137cbba55afae24f6754580916bb770b Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 7 Feb 2021 09:43:14 +0100
|
||||
Subject: [PATCH] src/privsep-linux.c: add support for or1k (#27)
|
||||
|
||||
Fix the following build failure:
|
||||
|
||||
privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet"
|
||||
# error "Platform does not support seccomp filter yet"
|
||||
^~~~~
|
||||
In file included from privsep-linux.c:36:
|
||||
privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
|
||||
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
|
||||
^~~~~~~~~~~~~~~~~~
|
||||
|
||||
It should be noted that AUDIT_ARCH_OPENRISC is defined since kernel 3.7:
|
||||
https://github.com/torvalds/linux/commit/e2bebb4ae6d9ac4ffc524db67f7ecb205a173f77
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
(cherry picked from commit f3f7332001d5d5722239f6b7279f32923e4eedd0)
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
src/privsep-linux.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/privsep-linux.c b/src/privsep-linux.c
|
||||
index 8093740a..58df5c30 100644
|
||||
--- a/src/privsep-linux.c
|
||||
+++ b/src/privsep-linux.c
|
||||
@@ -192,6 +192,8 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
|
||||
#endif
|
||||
#elif defined(__nios2__)
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_NIOS2
|
||||
+#elif defined(__or1k__)
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC
|
||||
#elif defined(__powerpc64__)
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
|
||||
#elif defined(__powerpc__)
|
||||
--
|
||||
2.29.2
|
||||
|
@ -0,0 +1,62 @@
|
||||
From 1b6b6329daf70e29221f341ef1946717f158ec8a Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 8 Feb 2021 07:23:54 +0100
|
||||
Subject: [PATCH] src/privsep-linux.c: add support for arc (#28)
|
||||
|
||||
Fix the following build failure:
|
||||
|
||||
privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet"
|
||||
# error "Platform does not support seccomp filter yet"
|
||||
^~~~~
|
||||
In file included from privsep-linux.c:36:
|
||||
privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
|
||||
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
|
||||
^~~~~~~~~~~~~~~~~~
|
||||
|
||||
It should be noted that AUDIT_ARCH_{ARCOMPACT,ARCV2} is only defined
|
||||
since kernel 5.2 and
|
||||
https://github.com/torvalds/linux/commit/67f2a8a29311841ba6ab9b0e2d1b8f1e9978cd84
|
||||
|
||||
Detection of arc compact and arc v2 have been "copy/pasted" from
|
||||
https://github.com/wbx-github/uclibc-ng/commit/afab56958f1cbb47b831ee3ebff231dfbae74af2
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/d29083700a80dd647621eed06faeeae03f0587d3
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
(cherry picked from commit 82386110e67cf75c224e9817fce55e6b0f143266)
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
src/privsep-linux.c | 16 ++++++++++++++++
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
diff --git a/src/privsep-linux.c b/src/privsep-linux.c
|
||||
index 58df5c30..fc269a5c 100644
|
||||
--- a/src/privsep-linux.c
|
||||
+++ b/src/privsep-linux.c
|
||||
@@ -149,6 +149,22 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_I386
|
||||
#elif defined(__x86_64__)
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_X86_64
|
||||
+#elif defined(__arc__)
|
||||
+# if defined(__A7__)
|
||||
+# if (BYTE_ORDER == LITTLE_ENDIAN)
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACT
|
||||
+# else
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACTBE
|
||||
+# endif
|
||||
+# elif defined(__HS__)
|
||||
+# if (BYTE_ORDER == LITTLE_ENDIAN)
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2
|
||||
+# else
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2BE
|
||||
+# endif
|
||||
+# else
|
||||
+# error "Platform does not support seccomp filter yet"
|
||||
+# endif
|
||||
#elif defined(__arm__)
|
||||
# ifndef EM_ARM
|
||||
# define EM_ARM 40
|
||||
--
|
||||
2.29.2
|
||||
|
@ -0,0 +1,37 @@
|
||||
From f7721a6728bfd786604474df051f463a12dd0335 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Fri, 5 Mar 2021 12:22:13 +0100
|
||||
Subject: [PATCH] src/privsep-linux.c: add support for m68k
|
||||
|
||||
Fix the following build failure:
|
||||
|
||||
privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet"
|
||||
# error "Platform does not support seccomp filter yet"
|
||||
^~~~~
|
||||
In file included from privsep-linux.c:36:
|
||||
privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
|
||||
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
|
||||
^~~~~~~~~~~~~~~~~~
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/rsmarples/dhcpcd/pull/29]
|
||||
---
|
||||
src/privsep-linux.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/privsep-linux.c b/src/privsep-linux.c
|
||||
index 21d41a9a..7dc92083 100644
|
||||
--- a/src/privsep-linux.c
|
||||
+++ b/src/privsep-linux.c
|
||||
@@ -188,6 +188,8 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_IA64
|
||||
#elif defined(__microblaze__)
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_MICROBLAZE
|
||||
+#elif defined(__m68k__)
|
||||
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_M68K
|
||||
#elif defined(__mips__)
|
||||
# if defined(__MIPSEL__)
|
||||
# if defined(__LP64__)
|
||||
--
|
||||
2.30.0
|
||||
|
@ -16,8 +16,23 @@ DHCPCD_CONFIG_OPTS = \
|
||||
--os=linux \
|
||||
--privsepuser=dhcpcd
|
||||
|
||||
# AUDIT_ARCH_NDS32 is only available since kernel >= 5.2
|
||||
ifeq ($(BR2_nds32):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2),y:)
|
||||
# AUDIT_ARCH_{OPENRISC,SH,SHEL,SH64,SHEL64} are only available with kernel >= 3.7
|
||||
ifeq ($(BR2_or1k)$(BR2_sh):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7),y:)
|
||||
DHCPCD_CONFIG_OPTS += --disable-privsep
|
||||
endif
|
||||
|
||||
# AUDIT_ARCH_MICROBLAZE is only available with kernel >= 3.18
|
||||
ifeq ($(BR2_microblazeel)$(BR2_microblazebe):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18),y:)
|
||||
DHCPCD_CONFIG_OPTS += --disable-privsep
|
||||
endif
|
||||
|
||||
# AUDIT_ARCH_XTENSA is only available with kernel >= 5.0
|
||||
ifeq ($(BR2_xtensa):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0),y:)
|
||||
DHCPCD_CONFIG_OPTS += --disable-privsep
|
||||
endif
|
||||
|
||||
# AUDIT_ARCH_{ARCOMPACT,ARCV2,NDS32,NIOS2} are only available with kernel >= 5.2
|
||||
ifeq ($(BR2_arceb)$(BR2_arcle)$(BR2_nds32)$(BR2_nios2):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2),y:)
|
||||
DHCPCD_CONFIG_OPTS += --disable-privsep
|
||||
endif
|
||||
|
||||
|
@ -9,6 +9,7 @@ DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz
|
||||
DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION)
|
||||
DOSFSTOOLS_LICENSE = GPL-3.0+
|
||||
DOSFSTOOLS_LICENSE_FILES = COPYING
|
||||
DOSFSTOOLS_CPE_ID_VENDOR = dosfstools_project
|
||||
DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks --exec-prefix=/
|
||||
HOST_DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally computed after checking signature
|
||||
sha256 911fe566da5b638eab1b11105314300bc9049cc3832d4bd2aed44c265013bf17 dovecot-2.3-pigeonhole-0.5.13.tar.gz
|
||||
sha256 68ca0f78a3caa6b090a469f45c395c44cf16da8fcb3345755b1ca436c9ffb2d2 dovecot-2.3-pigeonhole-0.5.14.tar.gz
|
||||
sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING
|
||||
|
@ -4,11 +4,13 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DOVECOT_PIGEONHOLE_VERSION = 0.5.13
|
||||
DOVECOT_PIGEONHOLE_VERSION = 0.5.14
|
||||
DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz
|
||||
DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3
|
||||
DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1
|
||||
DOVECOT_PIGEONHOLE_LICENSE_FILES = COPYING
|
||||
DOVECOT_PIGEONHOLE_CPE_ID_VENDOR = dovecot
|
||||
DOVECOT_PIGEONHOLE_CPE_ID_PRODUCT = pigeonhole
|
||||
DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot
|
||||
|
||||
DOVECOT_PIGEONHOLE_CONF_OPTS = --with-dovecot=$(STAGING_DIR)/usr/lib
|
||||
|
@ -1,5 +1,5 @@
|
||||
# Locally computed after checking signature
|
||||
sha256 a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4 dovecot-2.3.13.tar.gz
|
||||
sha256 c8b3d7f3af1e558a3ff0f970309d4013a4d3ce136f8c02a53a3b05f345b9a34a dovecot-2.3.14.tar.gz
|
||||
sha256 319a9830aab406109cd67cb45496587566a8123203d66d037b209ca3e13de02a COPYING
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL
|
||||
sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT
|
||||
|
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
DOVECOT_VERSION_MAJOR = 2.3
|
||||
DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).13
|
||||
DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).14
|
||||
DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR)
|
||||
DOVECOT_INSTALL_STAGING = YES
|
||||
DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015
|
||||
|
@ -9,6 +9,7 @@ E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
|
||||
E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
|
||||
E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet)
|
||||
E2FSPROGS_LICENSE_FILES = NOTICE lib/ss/mit-sipb-copyright.h lib/et/internal.h
|
||||
E2FSPROGS_CPE_ID_VENDOR = e2fsprogs_project
|
||||
E2FSPROGS_INSTALL_STAGING = YES
|
||||
|
||||
# Use libblkid and libuuid from util-linux for host and target packages.
|
||||
|
@ -10,6 +10,7 @@ ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION)
|
||||
ELFUTILS_INSTALL_STAGING = YES
|
||||
ELFUTILS_LICENSE = GPL-2.0+ or LGPL-3.0+ (library)
|
||||
ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3
|
||||
ELFUTILS_CPE_ID_VENDOR = elfutils_project
|
||||
ELFUTILS_DEPENDENCIES = host-pkgconf zlib $(TARGET_NLS_DEPENDENCIES)
|
||||
HOST_ELFUTILS_DEPENDENCIES = host-pkgconf host-zlib host-bzip2 host-xz
|
||||
|
||||
|
2
buildroot/package/erlang/erlang.mk
vendored
2
buildroot/package/erlang/erlang.mk
vendored
@ -12,6 +12,8 @@ ERLANG_DEPENDENCIES = host-erlang
|
||||
|
||||
ERLANG_LICENSE = Apache-2.0
|
||||
ERLANG_LICENSE_FILES = LICENSE.txt
|
||||
ERLANG_CPE_ID_VENDOR = erlang
|
||||
ERLANG_CPE_ID_PRODUCT = erlang\/otp
|
||||
ERLANG_INSTALL_STAGING = YES
|
||||
|
||||
# Remove the leftover deps directory from the ssl app
|
||||
|
@ -12,7 +12,8 @@ EXPAT_DEPENDENCIES = host-pkgconf
|
||||
HOST_EXPAT_DEPENDENCIES = host-pkgconf
|
||||
EXPAT_LICENSE = MIT
|
||||
EXPAT_LICENSE_FILES = COPYING
|
||||
EXPAT_CPE_ID_VENDOR = libexpat
|
||||
EXPAT_CPE_ID_VENDOR = libexpat_project
|
||||
EXPAT_CPE_ID_PRODUCT = libexpat
|
||||
|
||||
EXPAT_CONF_OPTS = --without-docbook
|
||||
HOST_EXPAT_CONF_OPTS = --without-docbook
|
||||
|
@ -12,7 +12,7 @@ FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
|
||||
FILE_INSTALL_STAGING = YES
|
||||
FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file)
|
||||
FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c
|
||||
FILE_CPE_ID_VALID = YES
|
||||
FILE_CPE_ID_VENDOR = file_project
|
||||
# We're patching configure.ac
|
||||
FILE_AUTORECONF = YES
|
||||
HOST_FILE_CONF_OPTS = --disable-libseccomp
|
||||
|
@ -11,6 +11,7 @@ FLAC_INSTALL_STAGING = YES
|
||||
FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||
FLAC_LICENSE = Xiph BSD-like (libFLAC), GPL-2.0+ (tools), LGPL-2.1+ (other libraries)
|
||||
FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL
|
||||
FLAC_CPE_ID_VENDOR = flac_project
|
||||
|
||||
# patch touching configure.ac
|
||||
FLAC_AUTORECONF = YES
|
||||
|
@ -9,7 +9,7 @@ FLEX_SITE = https://github.com/westes/flex/files/981163
|
||||
FLEX_INSTALL_STAGING = YES
|
||||
FLEX_LICENSE = FLEX
|
||||
FLEX_LICENSE_FILES = COPYING
|
||||
FLEX_CPE_ID_VALID = YES
|
||||
FLEX_CPE_ID_VENDOR = flex_project
|
||||
FLEX_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-m4
|
||||
HOST_FLEX_DEPENDENCIES = host-m4
|
||||
|
||||
|
@ -15,6 +15,7 @@ HOST_FONTCONFIG_DEPENDENCIES = \
|
||||
host-freetype host-expat host-pkgconf host-gperf host-util-linux
|
||||
FONTCONFIG_LICENSE = fontconfig license
|
||||
FONTCONFIG_LICENSE_FILES = COPYING
|
||||
FONTCONFIG_CPE_ID_VENDOR = fontconfig_project
|
||||
|
||||
FONTCONFIG_CONF_OPTS = \
|
||||
--with-arch=$(GNU_TARGET_NAME) \
|
||||
|
@ -10,6 +10,8 @@ GD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(GD_VERSION)
|
||||
GD_INSTALL_STAGING = YES
|
||||
GD_LICENSE = GD license
|
||||
GD_LICENSE_FILES = COPYING
|
||||
GD_CPE_ID_VENDOR = libgd
|
||||
GD_CPE_ID_PRODUCT = libgd
|
||||
GD_CONF_OPTS = --without-x --disable-rpath --disable-werror
|
||||
GD_DEPENDENCIES = host-pkgconf
|
||||
|
||||
|
@ -9,6 +9,7 @@ GIFLIB_SITE = http://downloads.sourceforge.net/project/giflib
|
||||
GIFLIB_INSTALL_STAGING = YES
|
||||
GIFLIB_LICENSE = MIT
|
||||
GIFLIB_LICENSE_FILES = COPYING
|
||||
GIFLIB_CPE_ID_VENDOR = giflib_project
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
GIFLIB_BUILD_LIBS = static-lib
|
||||
|
@ -1,3 +1,3 @@
|
||||
# sha256 locally computed
|
||||
sha256 9a99e963355706cab32099d140b698eda9de164ebce40a5420b1b9772dd04802 gnuchess-6.2.5.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
sha256 e536675a61abe82e61b919f6b786755441d9fcd4c21e1c82fb9e5340dd229846 gnuchess-6.2.7.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
@ -4,10 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GNUCHESS_VERSION = 6.2.5
|
||||
GNUCHESS_VERSION = 6.2.7
|
||||
GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess
|
||||
GNUCHESS_LICENSE = GPL-3.0+
|
||||
GNUCHESS_LICENSE_FILES = COPYING
|
||||
GNUCHESS_CPE_ID_VENDOR = gnu
|
||||
GNUCHESS_CPE_ID_PRODUCT = chess
|
||||
|
||||
GNUCHESS_DEPENDENCIES = host-flex flex
|
||||
GNUCHESS_DEPENDENCIES += $(if $(BR2_PACKAGE_READLINE),readline) \
|
||||
|
@ -8,7 +8,7 @@ GNUPLOT_VERSION = 5.4.1
|
||||
GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION)
|
||||
GNUPLOT_LICENSE = gnuplot license (open source)
|
||||
GNUPLOT_LICENSE_FILES = Copyright
|
||||
GNUPLOT_CPE_ID_VALID = YES
|
||||
GNUPLOT_CPE_ID_VENDOR = gnuplot_project
|
||||
|
||||
GNUPLOT_AUTORECONF = YES
|
||||
|
||||
|
@ -0,0 +1,55 @@
|
||||
From 268b1a599304f58bd56c86ff09041b5912c24a0c Mon Sep 17 00:00:00 2001
|
||||
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
|
||||
Date: Sun, 1 Nov 2020 17:24:36 +0100
|
||||
Subject: [PATCH] gr-qtgui: dont't add examples/c++ subdirectory when gr-analog
|
||||
is disabled
|
||||
|
||||
gr-qtgui examples needs to have gr-analog enabled, without this dependency
|
||||
compile crash with:
|
||||
|
||||
In file included from
|
||||
/x/output/build/gnuradio-3.8.1.0/gr-qtgui/examples/c++/display_qt.cc:22:
|
||||
/x/output/build/gnuradio-3.8.1.0/gr-qtgui/examples/c++/display_qt.h:24:10:
|
||||
fatal error: gnuradio/analog/noise_source.h: No such file or directory
|
||||
24 | #include <gnuradio/analog/noise_source.h>
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
compilation terminated.
|
||||
make[3]: *** [gr-qtgui/examples/c++/CMakeFiles/display_qt.dir/build.make:67:
|
||||
gr-qtgui/examples/c++/CMakeFiles/display_qt.dir/display_qt.cc.o] Error 1
|
||||
make[3]: *** Waiting for unfinished jobs....
|
||||
In file included from
|
||||
/somewhere/gnuradio/build/gr-qtgui/examples/c++/moc_display_qt.cpp:10:
|
||||
/somewhere/gnuradio/build/gr-qtgui/examples/c++/../../../../gr-qtgui/examples/c++/display_qt.h:24:10:
|
||||
fatal error: gnuradio/analog/noise_source.h: No such file or directory
|
||||
24 | #include <gnuradio/analog/noise_source.h>
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
compilation terminated.
|
||||
|
||||
GR_ANALOG is not an explicit dependency of GR_QTGUI, so disable c++ examples if
|
||||
user has not selected this option.
|
||||
|
||||
[backported from 7470a7a3771dd90defb826b464dfe62977cb1eb6]
|
||||
|
||||
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
|
||||
---
|
||||
gr-qtgui/CMakeLists.txt | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt
|
||||
index 8831f3ad9..561186fbd 100644
|
||||
--- a/gr-qtgui/CMakeLists.txt
|
||||
+++ b/gr-qtgui/CMakeLists.txt
|
||||
@@ -68,7 +68,9 @@ if(ENABLE_GR_QTGUI)
|
||||
add_subdirectory(include/gnuradio/qtgui)
|
||||
add_subdirectory(lib)
|
||||
add_subdirectory(docs)
|
||||
-add_subdirectory(examples/c++)
|
||||
+if (ENABLE_GR_ANALOG)
|
||||
+ add_subdirectory(examples/c++)
|
||||
+endif(ENABLE_GR_ANALOG)
|
||||
if(ENABLE_PYTHON)
|
||||
add_subdirectory(swig)
|
||||
add_subdirectory(python/qtgui)
|
||||
--
|
||||
2.26.2
|
||||
|
@ -577,6 +577,10 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SBC
|
||||
bool "sbc"
|
||||
select BR2_PACKAGE_SBC
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SCTP
|
||||
bool "sctp"
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrinsics
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM
|
||||
bool "shm"
|
||||
help
|
||||
|
@ -691,6 +691,16 @@ else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dsbc=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SCTP),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += \
|
||||
-Dsctp=enabled \
|
||||
-Dsctp-internal-usrsctp=enabled
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += \
|
||||
-Dsctp=disabled \
|
||||
-Dsctp-internal-usrsctp=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dshm=enabled
|
||||
else
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.8.tar.gz.sha256
|
||||
sha256 61f90e3e2a36bd8800a5bee31cba7eef37c9aa8a353b6c741edaa411510b14be haproxy-2.2.8.tar.gz
|
||||
# From: http://www.haproxy.org/download/2.2/src/haproxy-2.2.9.tar.gz.sha256
|
||||
sha256 21680459b08b9ba21c8cc9f5dbd0ee6e1842f57a3a67f87179871e1c13ebd4e3 haproxy-2.2.9.tar.gz
|
||||
# Locally computed:
|
||||
sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE
|
||||
sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt
|
||||
|
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
HAPROXY_VERSION_MAJOR = 2.2
|
||||
HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).8
|
||||
HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).9
|
||||
HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src
|
||||
HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions
|
||||
HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt
|
||||
|
@ -9,6 +9,7 @@ HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZ
|
||||
HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz
|
||||
HARFBUZZ_LICENSE = MIT, ISC (ucdn library)
|
||||
HARFBUZZ_LICENSE_FILES = COPYING
|
||||
HARFBUZZ_CPE_ID_VENDOR = harfbuzz_project
|
||||
HARFBUZZ_INSTALL_STAGING = YES
|
||||
HARFBUZZ_CONF_OPTS = \
|
||||
-Dfontconfig=disabled \
|
||||
|
@ -31,6 +31,7 @@ HOST_HEIMDAL_CONF_OPTS = \
|
||||
HOST_HEIMDAL_CONF_ENV = MAKEINFO=true
|
||||
HEIMDAL_LICENSE = BSD-3-Clause
|
||||
HEIMDAL_LICENSE_FILES = LICENSE
|
||||
HEIMDAL_CPE_ID_VENDOR = heimdal_project
|
||||
|
||||
# We need asn1_compile in the PATH for samba4
|
||||
define HOST_HEIMDAL_MAKE_SYMLINK
|
||||
|
@ -76,6 +76,7 @@ config BR2_PACKAGE_HOSTAPD_WPS
|
||||
|
||||
config BR2_PACKAGE_HOSTAPD_WPA3
|
||||
bool "Enable WPA3 support"
|
||||
depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
|
||||
help
|
||||
|
@ -2,8 +2,8 @@ config BR2_PACKAGE_IBM_SW_TPM2
|
||||
bool "ibm-sw-tpm2"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS # ibm-sw-tpm2
|
||||
depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
# libressl is not supported
|
||||
select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
|
||||
help
|
||||
This project is an implementation of the TCG TPM 2.0
|
||||
@ -14,4 +14,5 @@ config BR2_PACKAGE_IBM_SW_TPM2
|
||||
https://sourceforge.net/projects/ibmswtpm2/
|
||||
|
||||
comment "ibm-sw-tpm2 needs a toolchain w/ threads, dynamic library"
|
||||
depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
|
@ -13,6 +13,9 @@ ICU_SITE = \
|
||||
https://github.com/unicode-org/icu/releases/download/release-$(ICU_VERSION)
|
||||
ICU_LICENSE = ICU License
|
||||
ICU_LICENSE_FILES = LICENSE
|
||||
ICU_CPE_ID_VENDOR = icu-project
|
||||
ICU_CPE_ID_PRODUCT = international_components_for_unicode
|
||||
ICU_CPE_ID_VERSION = $(subst -,.,$(ICU_VERSION))
|
||||
|
||||
ICU_DEPENDENCIES = host-icu
|
||||
ICU_INSTALL_STAGING = YES
|
||||
|
@ -1,6 +1,7 @@
|
||||
config BR2_PACKAGE_IMA_EVM_UTILS
|
||||
bool "ima-evm-utils"
|
||||
depends on BR2_USE_MMU # keyutils
|
||||
depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS # tpm2-tss
|
||||
depends on !BR2_STATIC_LIBS # keyutils, tpm2-tss
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
select BR2_PACKAGE_KEYUTILS
|
||||
@ -13,4 +14,5 @@ config BR2_PACKAGE_IMA_EVM_UTILS
|
||||
|
||||
comment "ima-evm-utils needs dynamic library support"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_PACKAGE_LIBOPENSSL_ARCH_SUPPORTS
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
@ -9,6 +9,7 @@ IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2
|
||||
IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)
|
||||
IMLIB2_LICENSE = Imlib2
|
||||
IMLIB2_LICENSE_FILES = COPYING COPYING-PLAIN
|
||||
IMLIB2_CPE_ID_VENDOR = enlightenment
|
||||
|
||||
IMLIB2_INSTALL_STAGING = YES
|
||||
IMLIB2_DEPENDENCIES = host-pkgconf freetype
|
||||
|
@ -9,7 +9,7 @@ IPMITOOL_SOURCE = ipmitool-$(IPMITOOL_VERSION).tar.bz2
|
||||
IPMITOOL_SITE = http://downloads.sourceforge.net/project/ipmitool/ipmitool/$(IPMITOOL_VERSION)
|
||||
IPMITOOL_LICENSE = BSD-3-Clause
|
||||
IPMITOOL_LICENSE_FILES = COPYING
|
||||
IPMITOOL_CPE_ID_VALID = YES
|
||||
IPMITOOL_CPE_ID_VENDOR = ipmitool_project
|
||||
|
||||
# 0008-fru-Fix-buffer-overflow-vulnerabilities.patch
|
||||
# 0009-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch
|
||||
|
@ -11,6 +11,7 @@ IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz
|
||||
IRSSI_SITE = https://github.com/irssi/irssi/releases/download/$(IRSSI_VERSION)
|
||||
IRSSI_LICENSE = GPL-2.0+
|
||||
IRSSI_LICENSE_FILES = COPYING
|
||||
IRSSI_CPE_ID_VENDOR = irssi
|
||||
IRSSI_DEPENDENCIES = host-pkgconf libglib2 ncurses openssl
|
||||
|
||||
IRSSI_CONF_OPTS = \
|
||||
|
@ -12,6 +12,7 @@ IUCODE_TOOL_DEPENDENCIES = argp-standalone
|
||||
endif
|
||||
IUCODE_TOOL_LICENSE = GPL-2.0+
|
||||
IUCODE_TOOL_LICENSE_FILES = COPYING
|
||||
IUCODE_TOOL_CPE_ID_VENDOR = iucode-tool_project
|
||||
|
||||
define IUCODE_TOOL_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -D -m 0755 package/iucode-tool/S00iucode-tool \
|
||||
|
@ -8,7 +8,7 @@ JANSSON_VERSION = 2.13.1
|
||||
JANSSON_SITE = http://www.digip.org/jansson/releases
|
||||
JANSSON_LICENSE = MIT
|
||||
JANSSON_LICENSE_FILES = LICENSE
|
||||
JANSSON_CPE_ID_VALID = YES
|
||||
JANSSON_CPE_ID_VENDOR = jansson_project
|
||||
JANSSON_INSTALL_STAGING = YES
|
||||
JANSSON_CONF_ENV = LIBS="-lm"
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 f5bc48e2884bcabd2aca1737baff4ca962ec665b6eb673966ced1f7adea07edb jasper-2.0.25.tar.gz
|
||||
sha256 a82a119e85b7d1f448e61309777fa5f79053a9adca4a2b5bfe44be5439fb8fea jasper-2.0.26.tar.gz
|
||||
sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE
|
||||
|
@ -4,12 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
JASPER_VERSION = 2.0.25
|
||||
JASPER_VERSION = 2.0.26
|
||||
JASPER_SITE = $(call github,jasper-software,jasper,version-$(JASPER_VERSION))
|
||||
JASPER_INSTALL_STAGING = YES
|
||||
JASPER_LICENSE = JasPer-2.0
|
||||
JASPER_LICENSE_FILES = LICENSE
|
||||
JASPER_CPE_ID_VALID = YES
|
||||
JASPER_CPE_ID_VENDOR = jasper_project
|
||||
JASPER_SUPPORTS_IN_SOURCE_BUILD = NO
|
||||
JASPER_CONF_OPTS = \
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_DOXYGEN=TRUE \
|
||||
|
@ -9,6 +9,7 @@ JBIG2DEC_SITE = \
|
||||
https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9530
|
||||
JBIG2DEC_LICENSE = AGPL-3.0+
|
||||
JBIG2DEC_LICENSE_FILES = LICENSE
|
||||
JBIG2DEC_CPE_ID_VENDOR = artifex
|
||||
JBIG2DEC_INSTALL_STAGING = YES
|
||||
# tarball is missing install-sh, install.sh, or shtool
|
||||
JBIG2DEC_AUTORECONF = YES
|
||||
|
@ -8,7 +8,7 @@ JHEAD_VERSION = 3.04
|
||||
JHEAD_SITE = http://www.sentex.net/~mwandel/jhead
|
||||
JHEAD_LICENSE = Public Domain
|
||||
JHEAD_LICENSE_FILES = readme.txt
|
||||
JHEAD_CPE_ID_VALID = YES
|
||||
JHEAD_CPE_ID_VENDOR = jhead_project
|
||||
|
||||
define JHEAD_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
|
||||
|
@ -9,6 +9,8 @@ JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz
|
||||
JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION)
|
||||
JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD)
|
||||
JPEG_TURBO_LICENSE_FILES = LICENSE.md README.ijg
|
||||
JPEG_TURBO_CPE_ID_VENDOR = libjpeg-turbo
|
||||
JPEG_TURBO_CPE_ID_PRODUCT = libjpeg-turbo
|
||||
JPEG_TURBO_INSTALL_STAGING = YES
|
||||
JPEG_TURBO_PROVIDES = jpeg
|
||||
JPEG_TURBO_DEPENDENCIES = host-pkgconf
|
||||
|
@ -8,6 +8,7 @@ JQ_VERSION = a17dd3248a666d01be75f6b16be37e80e20b0954
|
||||
JQ_SITE = $(call github,stedolan,jq,$(JQ_VERSION))
|
||||
JQ_LICENSE = MIT (code), ICU (decNumber), CC-BY-3.0 (documentation)
|
||||
JQ_LICENSE_FILES = COPYING
|
||||
JQ_CPE_ID_VENDOR = jq_project
|
||||
JQ_INSTALL_STAGING = YES
|
||||
|
||||
# currently using git version directly
|
||||
|
@ -9,7 +9,7 @@ JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases
|
||||
JSON_C_INSTALL_STAGING = YES
|
||||
JSON_C_LICENSE = MIT
|
||||
JSON_C_LICENSE_FILES = COPYING
|
||||
JSON_C_CPE_ID_VALID = YES
|
||||
JSON_C_CPE_ID_VENDOR = json-c_project
|
||||
|
||||
$(eval $(cmake-package))
|
||||
$(eval $(host-cmake-package))
|
||||
|
@ -8,7 +8,7 @@ JSONCPP_VERSION = 1.9.4
|
||||
JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION))
|
||||
JSONCPP_LICENSE = Public Domain or MIT
|
||||
JSONCPP_LICENSE_FILES = LICENSE
|
||||
JSONCPP_CPE_ID_VALID = YES
|
||||
JSONCPP_CPE_ID_VENDOR = jsoncpp_project
|
||||
JSONCPP_INSTALL_STAGING = YES
|
||||
JSONCPP_CONF_OPTS = -Dtests=false
|
||||
|
||||
|
@ -0,0 +1,28 @@
|
||||
From 1d36faad18e34b43ac8ea3e7f6a44315f827a2db Mon Sep 17 00:00:00 2001
|
||||
From: George Hopkins <george-hopkins@null.net>
|
||||
Date: Mon, 4 Jan 2021 13:59:41 +0100
|
||||
Subject: [PATCH] Add getter to read database values as long long
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/kismetwireless/kismet/commit/1d36faad18e34b43ac8ea3e7f6a44315f827a2db]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
sqlite3_cpp11.cc | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/sqlite3_cpp11.cc b/sqlite3_cpp11.cc
|
||||
index 7974bde8c..5c92dfa87 100644
|
||||
--- a/sqlite3_cpp11.cc
|
||||
+++ b/sqlite3_cpp11.cc
|
||||
@@ -411,6 +411,11 @@ namespace kissqlite3 {
|
||||
return (unsigned long) sqlite3_column_int64(stmt.get(), column);
|
||||
}
|
||||
|
||||
+ template<>
|
||||
+ long long sqlite3_column_as(std::shared_ptr<sqlite3_stmt> stmt, unsigned int column) {
|
||||
+ return (long long) sqlite3_column_int64(stmt.get(), column);
|
||||
+ }
|
||||
+
|
||||
template<>
|
||||
unsigned long long sqlite3_column_as(std::shared_ptr<sqlite3_stmt> stmt, unsigned int column) {
|
||||
return (unsigned long long) sqlite3_column_int64(stmt.get(), column);
|
@ -0,0 +1,66 @@
|
||||
From 9330d34ced1d7d0e56d579bb55a9ed1286d324f0 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 4 Mar 2021 13:36:52 +0100
|
||||
Subject: [PATCH] boost/asio: Use eventfd() function with uClibc
|
||||
|
||||
Fix build with uclibc thanks to
|
||||
https://github.com/boostorg/asio/commit/b2ee39aee0b186c5bcabb051b7a536ab1517616a
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/1c2885d75219aabadbb66ab66fe0dc4b4346ff1e
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/kismetwireless/kismet/commit/9330d34ced1d7d0e56d579bb55a9ed1286d324f0]
|
||||
---
|
||||
.../asio/detail/impl/eventfd_select_interrupter.ipp | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/boost/asio/detail/impl/eventfd_select_interrupter.ipp b/boost/asio/detail/impl/eventfd_select_interrupter.ipp
|
||||
index 38d4b2a6..8bdb3c20 100644
|
||||
--- a/boost/asio/detail/impl/eventfd_select_interrupter.ipp
|
||||
+++ b/boost/asio/detail/impl/eventfd_select_interrupter.ipp
|
||||
@@ -23,11 +23,11 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
-#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8
|
||||
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__)
|
||||
# include <asm/unistd.h>
|
||||
-#else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8
|
||||
+#else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__)
|
||||
# include <sys/eventfd.h>
|
||||
-#endif // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8
|
||||
+#endif // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__)
|
||||
#include <boost/asio/detail/cstdint.hpp>
|
||||
#include <boost/asio/detail/eventfd_select_interrupter.hpp>
|
||||
#include <boost/asio/detail/throw_error.hpp>
|
||||
@@ -46,14 +46,14 @@ eventfd_select_interrupter::eventfd_select_interrupter()
|
||||
|
||||
void eventfd_select_interrupter::open_descriptors()
|
||||
{
|
||||
-#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8
|
||||
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__)
|
||||
write_descriptor_ = read_descriptor_ = syscall(__NR_eventfd, 0);
|
||||
if (read_descriptor_ != -1)
|
||||
{
|
||||
::fcntl(read_descriptor_, F_SETFL, O_NONBLOCK);
|
||||
::fcntl(read_descriptor_, F_SETFD, FD_CLOEXEC);
|
||||
}
|
||||
-#else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8
|
||||
+#else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__)
|
||||
# if defined(EFD_CLOEXEC) && defined(EFD_NONBLOCK)
|
||||
write_descriptor_ = read_descriptor_ =
|
||||
::eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK);
|
||||
@@ -70,7 +70,7 @@ void eventfd_select_interrupter::open_descriptors()
|
||||
::fcntl(read_descriptor_, F_SETFD, FD_CLOEXEC);
|
||||
}
|
||||
}
|
||||
-#endif // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8
|
||||
+#endif // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__)
|
||||
|
||||
if (read_descriptor_ == -1)
|
||||
{
|
||||
--
|
||||
2.30.0
|
||||
|
@ -59,14 +59,16 @@ config BR2_PACKAGE_KISMET_SERVER
|
||||
default y
|
||||
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf
|
||||
depends on !BR2_STATIC_LIBS # dlfcn.h
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future
|
||||
select BR2_PACKAGE_PROTOBUF
|
||||
|
||||
comment "server needs a toolchain w/ dynamic library, gcc >= 4.8"
|
||||
comment "server needs a toolchain w/ dynamic library, wchar, gcc >= 4.8"
|
||||
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
|
||||
comment "server needs a toolchain not affected by GCC bug 64735"
|
||||
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user