Compare commits
29 Commits
2016.05-rc3
...
2016.05
| Author | SHA1 | Date | |
|---|---|---|---|
| aa6fd11fee | |||
| 509ce3a6ec | |||
| 102c4a4bad | |||
| e032a29604 | |||
| 019b22f8fa | |||
| 515b276973 | |||
| ebb15bbd41 | |||
| 38bfd129c6 | |||
| 5c913c17b2 | |||
| 306878fa02 | |||
| a229c52aa4 | |||
| 49648d4b01 | |||
| 15b6f3ba63 | |||
| 89eeadfcfd | |||
| ef18eedce6 | |||
| 0a2d57596e | |||
| b385d13f1f | |||
| e4d55d3373 | |||
| 02302d2153 | |||
| 2ef21bc8d4 | |||
| 115e5ae9c9 | |||
| 33499484e4 | |||
| eb384c24fd | |||
| 2277395172 | |||
| 5468ce85d5 | |||
| 4d185e5ec5 | |||
| 03fef14fb8 | |||
| c12bd83a34 | |||
| ddc0df10ab |
@@ -1,3 +1,16 @@
|
||||
2016.05, Released May 31st, 2016
|
||||
|
||||
Minor fixes.
|
||||
|
||||
External toolchain: Fix for symlink handling when copying
|
||||
links to target.
|
||||
|
||||
Updated/fixed packages: gcc, grantlee, gst-ffmpeg,
|
||||
ipsec-tools, iptraf-ng, libcurl, libdrm, libsigsegv, ltris,
|
||||
lttng-babeltrace, mbedtls, mesa3d, moarvm, mplayer, mtools,
|
||||
net-tools, openpowerlink, pulseview, rpm, tinyalsa,
|
||||
xdriver_xf86-video-fbturbo, xserver_xorg-server
|
||||
|
||||
2016.05-rc3, Released May 26th, 2016
|
||||
|
||||
Fixes all over the tree.
|
||||
|
||||
@@ -41,7 +41,7 @@ else # umask
|
||||
all:
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2016.05-rc3
|
||||
export BR2_VERSION := 2016.05
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
|
||||
@@ -29,7 +29,7 @@ Update uboot
|
||||
=> env default -f -a
|
||||
=> saveenv
|
||||
|
||||
- Run the DFU toocommand in U-Boot:
|
||||
- Run the DFU command in U-Boot:
|
||||
=> dfu 0 mmc 0
|
||||
|
||||
- Transfer U-Boot into flash by running this command in host side:
|
||||
@@ -42,7 +42,7 @@ Update uboot
|
||||
Update linux & rootfs
|
||||
=====================
|
||||
|
||||
Run the 'ums' command from the u6Boot prompt to mount the eMMC as mass
|
||||
Run the 'ums' command from the U-Boot prompt to mount the eMMC as mass
|
||||
storage and update zImage, device tree (imx6sl-warp.dtb) and rootfs
|
||||
file (rootfs.tar) :
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2015.1"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
|
||||
BR2_LINUX_KERNEL_UIMAGE=y
|
||||
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-zed"
|
||||
|
||||
@@ -10,6 +10,7 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2014.2.01"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
|
||||
BR2_LINUX_KERNEL_UIMAGE=y
|
||||
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-zc706"
|
||||
|
||||
@@ -9,6 +9,7 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2015.1"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
|
||||
BR2_LINUX_KERNEL_UIMAGE=y
|
||||
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-zed"
|
||||
|
||||
+11
-11
@@ -8,40 +8,40 @@
|
||||
<div class="panel-heading">Download</div>
|
||||
<div class="panel-body">
|
||||
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2016.02</b></h3>
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2016.05</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-2016.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.05.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2016.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.05.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h3><a href="/downloads/buildroot-2016.02.tar.gz">buildroot-2016.02.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.02.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2016.05.tar.gz">buildroot-2016.05.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.05.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-2016.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.05.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2016.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.05.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2016.02.tar.bz2">buildroot-2016.02.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.02.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2016.05.tar.bz2">buildroot-2016.05.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.05.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2016.05-rc3</b></h3>
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
@@ -75,7 +75,7 @@
|
||||
<p><a href="/downloads/buildroot-2016.05-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,24 @@
|
||||
<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">2016.05 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>1 March 2016</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The stable 2016.05 release is out - Thanks to everyone
|
||||
contributing and testing the release candidates. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2016.05">CHANGES</a>
|
||||
file for more details
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2016.05.tar.bz2">2016.05 release</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
|
||||
@@ -153,6 +153,7 @@ config BR2_GCC_ENABLE_LIBMUDFLAP
|
||||
depends on !BR2_ARM_INSTRUCTIONS_THUMB && !BR2_powerpc_SPE
|
||||
depends on !BR2_GCC_VERSION_4_9_X
|
||||
depends on !BR2_GCC_VERSION_5_X
|
||||
depends on !BR2_GCC_VERSION_6_X
|
||||
help
|
||||
libmudflap is a gcc library used for the mudflap pointer
|
||||
debugging functionality. It is only needed if you intend to
|
||||
|
||||
@@ -4,6 +4,8 @@ config BR2_PACKAGE_GRANTLEE
|
||||
depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \
|
||||
(BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5)
|
||||
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
|
||||
# https://sourceware.org/bugzilla/show_bug.cgi?id=20173
|
||||
depends on !BR2_microblaze && !BR2_nios2
|
||||
select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT
|
||||
select BR2_PACKAGE_QT_SCRIPT if BR2_PACKAGE_QT
|
||||
select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
|
||||
@@ -16,6 +18,7 @@ config BR2_PACKAGE_GRANTLEE
|
||||
|
||||
comment "grantlee needs a toolchain with NPTL not affected by Binutils bug 19405"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
depends on !BR2_microblaze && !BR2_nios2
|
||||
depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \
|
||||
(BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) || \
|
||||
BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
|
||||
|
||||
@@ -3,6 +3,8 @@ config BR2_PACKAGE_GST_FFMPEG
|
||||
# Unsupported for MIPS R6. It bundles a version of libav which
|
||||
# doesn't have support for MIPS R6.
|
||||
depends on !BR2_mips_32r6 && !BR2_mips_64r6
|
||||
# triggers https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65151 on sh
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_sh
|
||||
select BR2_PACKAGE_GST_PLUGINS_BASE
|
||||
help
|
||||
GStreamer plugin containing one plugin with a set of elements using
|
||||
@@ -23,3 +25,6 @@ config BR2_PACKAGE_GST_FFMPEG_GPL
|
||||
be under GPL.
|
||||
|
||||
endif
|
||||
|
||||
comment "gst-ffmpeg needs a toolchain w/ gcc >= 5"
|
||||
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 && BR2_sh
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
config BR2_PACKAGE_IPSEC_TOOLS
|
||||
bool "ipsec-tools"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # Use __P() macro all over the tree
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
select BR2_PACKAGE_FLEX
|
||||
depends on BR2_USE_MMU # fork()
|
||||
help
|
||||
This package is required to support IPSec for Linux 2.6+
|
||||
|
||||
|
||||
@@ -11,7 +11,9 @@ IPTRAF_NG_LICENSE_FILES = LICENSE
|
||||
IPTRAF_NG_DEPENDENCIES = ncurses
|
||||
|
||||
IPTRAF_NG_MAKE_ENV = \
|
||||
NCURSES_LDFLAGS="-lpanel -lncurses" \
|
||||
NCURSES_LDFLAGS="-lpanel -lncurses"
|
||||
|
||||
IPTRAF_NG_CONF_ENV = \
|
||||
CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 14f44ed7b5207fea769ddb2c31bd9e720d37312e1c02315def67923a4a636078 curl-7.49.0.tar.bz2
|
||||
sha256 eb63cec4bef692eab9db459033f409533e6d10e20942f4b060b32819e81885f1 curl-7.49.1.tar.bz2
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBCURL_VERSION = 7.49.0
|
||||
LIBCURL_VERSION = 7.49.1
|
||||
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
|
||||
LIBCURL_SITE = http://curl.haxx.se/download
|
||||
LIBCURL_DEPENDENCIES = host-pkgconf \
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From 7384f79f69fdb7b691cc5b0c28c301b3fe8b633e Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Thu, 26 May 2016 10:46:57 +0200
|
||||
Subject: [PATCH] xf86atomic: require CAS support in libatomic_ops
|
||||
|
||||
Since AO_compare_and_swap_full() is used by libdrm, AO_REQUIRE_CAS
|
||||
must be defined before including <atomic_ops.h> so that we are sure
|
||||
that CAS support will be provided. This is necessary to make sure that
|
||||
the AO_compare_and_swap_full() function will be provided on all
|
||||
architectures, including the ones that don't have built-in CAS support
|
||||
such as SPARCv8.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
xf86atomic.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/xf86atomic.h b/xf86atomic.h
|
||||
index 922b37d..d7017a5 100644
|
||||
--- a/xf86atomic.h
|
||||
+++ b/xf86atomic.h
|
||||
@@ -58,6 +58,7 @@ typedef struct {
|
||||
#endif
|
||||
|
||||
#if HAVE_LIB_ATOMIC_OPS
|
||||
+#define AO_REQUIRE_CAS
|
||||
#include <atomic_ops.h>
|
||||
|
||||
#define HAS_ATOMIC_OPS 1
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -9,6 +9,15 @@ config BR2_PACKAGE_LIBDRM
|
||||
|
||||
if BR2_PACKAGE_LIBDRM
|
||||
|
||||
config BR2_PACKAGE_LIBDRM_HAS_ATOMIC
|
||||
bool
|
||||
default y if BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS || \
|
||||
BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
|
||||
config BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC
|
||||
bool
|
||||
select BR2_PACKAGE_LIBATOMIC_OPS if !BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
|
||||
config BR2_PACKAGE_LIBDRM_INSTALL_TESTS
|
||||
bool "Install test programs"
|
||||
help
|
||||
@@ -18,24 +27,31 @@ menu "DRM Drivers"
|
||||
|
||||
config BR2_PACKAGE_LIBDRM_INTEL
|
||||
bool "intel"
|
||||
select BR2_PACKAGE_LIBATOMIC_OPS
|
||||
select BR2_PACKAGE_LIBPCIACCESS
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC
|
||||
select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC
|
||||
help
|
||||
Install intel graphics driver.
|
||||
|
||||
config BR2_PACKAGE_LIBDRM_RADEON
|
||||
bool "radeon"
|
||||
depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC
|
||||
select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC
|
||||
help
|
||||
Install AMD/ATI graphics driver.
|
||||
|
||||
config BR2_PACKAGE_LIBDRM_AMDGPU
|
||||
bool "amdgpu"
|
||||
depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC
|
||||
select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC
|
||||
help
|
||||
Install AMD GPU driver.
|
||||
|
||||
config BR2_PACKAGE_LIBDRM_NOUVEAU
|
||||
bool "nouveau"
|
||||
depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC
|
||||
select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC
|
||||
help
|
||||
Install NVIDIA graphics driver.
|
||||
|
||||
@@ -48,6 +64,8 @@ config BR2_PACKAGE_LIBDRM_VMWGFX
|
||||
config BR2_PACKAGE_LIBDRM_OMAP
|
||||
bool "omap (experimental)"
|
||||
depends on BR2_arm
|
||||
depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC
|
||||
select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC
|
||||
help
|
||||
Install the TI OMAP driver using an experimental API.
|
||||
|
||||
@@ -60,12 +78,16 @@ config BR2_PACKAGE_LIBDRM_EXYNOS
|
||||
config BR2_PACKAGE_LIBDRM_FREEDRENO
|
||||
bool "freedreno"
|
||||
depends on BR2_arm || BR2_aarch64 || BR2_aarch64_be
|
||||
depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC
|
||||
select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC
|
||||
help
|
||||
Install Qualcomm Snapdragon driver.
|
||||
|
||||
config BR2_PACKAGE_LIBDRM_TEGRA
|
||||
bool "tegra (experimental)"
|
||||
depends on BR2_arm
|
||||
depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC
|
||||
select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC
|
||||
help
|
||||
Install NVIDIA Tegra driver using an experimental API.
|
||||
|
||||
|
||||
@@ -21,9 +21,16 @@ LIBDRM_CONF_OPTS = \
|
||||
|
||||
LIBDRM_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y)
|
||||
LIBDRM_DEPENDENCIES += libatomic_ops
|
||||
ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y)
|
||||
LIBDRM_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -DAO_NO_SPARC_V9"
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM_INTEL),y)
|
||||
LIBDRM_CONF_OPTS += --enable-intel
|
||||
LIBDRM_DEPENDENCIES += libatomic_ops libpciaccess
|
||||
LIBDRM_DEPENDENCIES += libpciaccess
|
||||
else
|
||||
LIBDRM_CONF_OPTS += --disable-intel
|
||||
endif
|
||||
|
||||
@@ -3,12 +3,12 @@ config BR2_PACKAGE_LIBSIGSEGV
|
||||
depends on !BR2_xtensa
|
||||
depends on !BR2_arc # no ucontext_i.sym file
|
||||
depends on !BR2_microblaze
|
||||
# No ucontext support in uclibc for powerpc and superh
|
||||
depends on !((BR2_powerpc || BR2_sh) && BR2_TOOLCHAIN_USES_UCLIBC)
|
||||
# No ucontext support in uclibc for powerpc, sparc and superh
|
||||
depends on !((BR2_powerpc || BR2_sh || BR2_sparc ) && BR2_TOOLCHAIN_USES_UCLIBC)
|
||||
help
|
||||
Library for handling page faults in user mode.
|
||||
|
||||
http://libsigsegv.sourceforge.net/
|
||||
|
||||
comment "libsigsegv needs an (e)glibc toolchain"
|
||||
depends on (BR2_powerpc || BR2_sh) && BR2_TOOLCHAIN_USES_UCLIBC
|
||||
depends on (BR2_powerpc || BR2_sh || BR2_sparc) && BR2_TOOLCHAIN_USES_UCLIBC
|
||||
|
||||
@@ -17,12 +17,12 @@ LTRIS_CONF_ENV = \
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LTRIS_AUDIO),y)
|
||||
LTRIS_DEPENDENCIES += sdl_mixer host-pkgconf
|
||||
LTRIS_CONF_OPTS += --enable-audio=yes
|
||||
LTRIS_CONF_OPTS += --enable-sound
|
||||
# configure script does NOT use pkg-config to figure out how to link
|
||||
# with sdl_mixer, breaking static linking as sdl_mixer can use libmad
|
||||
LTRIS_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs SDL_mixer`
|
||||
else
|
||||
LTRIS_CONF_OPTS += --disable-audio
|
||||
LTRIS_CONF_OPTS += --disable-sound
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
|
||||
|
||||
+63
@@ -0,0 +1,63 @@
|
||||
From 670d0961a823df0db28f39a354430f3dc2519418 Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Martin <s.martin49@gmail.com>
|
||||
Date: Sat, 28 May 2016 12:53:33 +0200
|
||||
Subject: [PATCH] configure: fix uuid support detection on static build
|
||||
|
||||
This change adds uuid support detection using pkg-config, before falling
|
||||
back on default AC_CHECK_LIB calls.
|
||||
|
||||
Using flags from pkg-config is useful for static build, because they
|
||||
also include dependency flags; whereas
|
||||
|
||||
AC_CHECK_LIB function achieves its test by trying to link against the
|
||||
requested library, without taking care of its dependency
|
||||
requirements/flags. Therefore, in case of static build, it can fail on
|
||||
the uuid detection like [1], because the uuid's dependency flags
|
||||
(regarding gettext) are missing.
|
||||
Instead, using pkg-config to do the check will take care of getting and
|
||||
setting all required flags.
|
||||
|
||||
This change adds uuid detection using pkg-config helper before falling
|
||||
back on the standard AC_CHECK_LIB detection for platforms missing
|
||||
pkg-config.
|
||||
|
||||
This issue [1] has been triggered on Buildroot farms.
|
||||
|
||||
[1] http://autobuild.buildroot.net/results/43b/43b98ddf9eb44152ed9ac4a98d887af14831d8da/build-end.log
|
||||
|
||||
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
||||
---
|
||||
configure.ac | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 632fe39..b344fa8 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -65,6 +65,15 @@ esac
|
||||
AM_CONDITIONAL([BABELTRACE_BUILD_WITH_MINGW], [test "x$MINGW32" = "xyes"])
|
||||
|
||||
# Check for libuuid
|
||||
+PKG_CHECK_MODULES([UUID], [uuid],
|
||||
+[
|
||||
+ LIBS="${UUID_LIBS} ${LIBS}"
|
||||
+ CFLAGS="${CFLAGS} ${UUID_CFLAGS}"
|
||||
+ AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.])
|
||||
+ have_libuuid=yes
|
||||
+],
|
||||
+[
|
||||
+# try detecting libuuid without pkg-config
|
||||
AC_CHECK_LIB([uuid], [uuid_generate],
|
||||
[
|
||||
AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.])
|
||||
@@ -83,6 +92,7 @@ AC_CHECK_LIB([uuid], [uuid_generate],
|
||||
AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
|
||||
fi
|
||||
])
|
||||
+])
|
||||
]
|
||||
)
|
||||
AM_CONDITIONAL([BABELTRACE_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"])
|
||||
--
|
||||
2.8.3
|
||||
|
||||
@@ -10,7 +10,9 @@ LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
|
||||
LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPLv2 (test code)
|
||||
LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE
|
||||
|
||||
LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2
|
||||
LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf
|
||||
# for 0002-configure-fix-uuid-support-detection-on-static-build.patch
|
||||
LTTNG_BABELTRACE_AUTORECONF = YES
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
@@ -23,6 +23,9 @@ define MBEDTLS_ENABLE_THREADING
|
||||
$(@D)/include/mbedtls/config.h
|
||||
endef
|
||||
MBEDTLS_POST_PATCH_HOOKS += MBEDTLS_ENABLE_THREADING
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
MBEDTLS_CONF_OPTS += -DLINK_WITH_PTHREAD=ON
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
|
||||
@@ -22,6 +22,14 @@ MESA3D_DEPENDENCIES = \
|
||||
expat \
|
||||
libdrm
|
||||
|
||||
# The Sourcery MIPS toolchain has a special (non-upstream) feature to
|
||||
# have "compact exception handling", which unfortunately breaks with
|
||||
# mesa3d, so we disable it here by passing -mno-compact-eh.
|
||||
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS),y)
|
||||
MESA3D_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh"
|
||||
MESA3D_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -mno-compact-eh"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
MESA3D_DEPENDENCIES += openssl
|
||||
MESA3D_CONF_OPTS += --with-sha1=libcrypto
|
||||
|
||||
@@ -4,8 +4,8 @@ config BR2_PACKAGE_MOARVM
|
||||
depends on !BR2_STATIC_LIBS # libuv
|
||||
depends on BR2_USE_MMU # libuv
|
||||
depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # libatomic_ops
|
||||
# needs AO_fetch_compare_and_swap, not implemented for sparcv9
|
||||
depends on !BR2_sparc64
|
||||
# needs AO_fetch_compare_and_swap, not implemented for sparcv8/sparcv9
|
||||
depends on !BR2_sparc64 && !BR2_sparc
|
||||
select BR2_PACKAGE_LIBUV
|
||||
select BR2_PACKAGE_LIBTOMMATH
|
||||
select BR2_PACKAGE_LIBATOMIC_OPS
|
||||
@@ -19,5 +19,5 @@ comment "moarvm needs a toolchain w/ threads, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS
|
||||
depends on !BR2_sparc64
|
||||
depends on !BR2_sparc64 && !BR2_sparc
|
||||
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
Fix aarch64 compile by adding HAVE_ARMV8 define
|
||||
|
||||
Fixes build errors seen on the buildroot autobuilders:
|
||||
http://autobuild.buildroot.net/results/5f8/5f85c32eb89aac48ae8da892d9800bd13274cd3e/build-end.log
|
||||
|
||||
libavutil/aarch64/cpu.c: In function 'ff_get_cpu_flags_aarch64':
|
||||
libavutil/aarch64/cpu.c:25:32: error: 'HAVE_ARMV8' undeclared (first use in this function)
|
||||
return AV_CPU_FLAG_ARMV8 * HAVE_ARMV8 |
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
(patch sent upstream:
|
||||
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2016-May/073496.html)
|
||||
|
||||
Index: configure
|
||||
===================================================================
|
||||
--- a/configure (revision 37871)
|
||||
+++ b/configure (working copy)
|
||||
@@ -1445,6 +1445,8 @@
|
||||
--disable-armv6) _armv6=no ;;
|
||||
--enable-armv6t2) _armv6t2=yes ;;
|
||||
--disable-armv6t2) _armv6t2=no ;;
|
||||
+ --enable-armv8) _armv8=yes ;;
|
||||
+ --disable-armv8) _armv8=no ;;
|
||||
--enable-armvfp) _armvfp=yes ;;
|
||||
--disable-armvfp) _armvfp=no ;;
|
||||
--enable-vfpv3) vfpv3=yes ;;
|
||||
@@ -3261,7 +3263,7 @@
|
||||
echores "$_iwmmxt"
|
||||
fi
|
||||
|
||||
-cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI'
|
||||
+cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 ARMV8 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI'
|
||||
test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts"
|
||||
test "$_mmx" = yes && cpuexts="MMX $cpuexts"
|
||||
test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts"
|
||||
@@ -3285,6 +3287,7 @@
|
||||
test "$_armv5te" = yes && cpuexts="ARMV5TE $cpuexts"
|
||||
test "$_armv6" = yes && cpuexts="ARMV6 $cpuexts"
|
||||
test "$_armv6t2" = yes && cpuexts="ARMV6T2 $cpuexts"
|
||||
+test "$_armv8" = yes && cpuexts="ARMV8 $cpuexts"
|
||||
test "$_armvfp" = yes && cpuexts="VFP $cpuexts"
|
||||
test "$vfpv3" = yes && cpuexts="VFPV3 $cpuexts"
|
||||
test "$setend" = yes && cpuexts="SETEND $cpuexts"
|
||||
@@ -254,6 +254,10 @@ ifeq ($(BR2_ARM_CPU_ARMV6)$(BR2_ARM_CPU_ARMV7A),y)
|
||||
MPLAYER_CONF_OPTS += --enable-armv6
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_aarch64),y)
|
||||
MPLAYER_CONF_OPTS += --enable-armv8
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_ARM_SOFT_FLOAT),)
|
||||
ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
|
||||
MPLAYER_CONF_OPTS += --enable-neon
|
||||
@@ -268,10 +272,62 @@ MPLAYER_CFLAGS += -fomit-frame-pointer
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_MMX),y)
|
||||
MPLAYER_CONF_OPTS += --yasm=$(HOST_DIR)/usr/bin/yasm
|
||||
MPLAYER_CONF_OPTS += \
|
||||
--enable-mmx \
|
||||
--yasm=$(HOST_DIR)/usr/bin/yasm
|
||||
MPLAYER_DEPENDENCIES += host-yasm
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --yasm=''
|
||||
MPLAYER_CONF_OPTS += \
|
||||
--disable-mmx \
|
||||
--yasm=''
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSE),y)
|
||||
MPLAYER_CONF_OPTS += --enable-sse
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-sse
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
|
||||
MPLAYER_CONF_OPTS += --enable-sse2
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-sse2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSE3),y)
|
||||
MPLAYER_CONF_OPTS += --enable-sse3
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-sse3
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
|
||||
MPLAYER_CONF_OPTS += --enable-ssse3
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-ssse3
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSE4),y)
|
||||
MPLAYER_CONF_OPTS += --enable-sse4
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-sse4
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSE42),y)
|
||||
MPLAYER_CONF_OPTS += --enable-sse42
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-sse42
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_AVX),y)
|
||||
MPLAYER_CONF_OPTS += --enable-avx
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-avx
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_AVX2),y)
|
||||
MPLAYER_CONF_OPTS += --enable-avx2
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-avx2
|
||||
endif
|
||||
|
||||
define MPLAYER_CONFIGURE_CMDS
|
||||
|
||||
@@ -9,8 +9,14 @@ MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.bz2
|
||||
MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools
|
||||
MTOOLS_LICENSE = GPLv3+
|
||||
MTOOLS_LICENSE_FILES = COPYING
|
||||
MTOOLS_CONF_ENV = ac_cv_func_setpgrp_void=yes
|
||||
MTOOLS_CONF_OPTS = --without-x
|
||||
# info documentation not needed
|
||||
MTOOLS_CONF_ENV = \
|
||||
ac_cv_func_setpgrp_void=yes \
|
||||
ac_cv_path_INSTALL_INFO=
|
||||
|
||||
HOST_MTOOLS_CONF_ENV = \
|
||||
ac_cv_path_INSTALL_INFO=
|
||||
|
||||
# link with iconv if enabled
|
||||
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
From a2076079a409141704701ec17a205d89e5b24052 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Sat, 28 May 2016 20:45:02 +0200
|
||||
Subject: [PATCH] Makefile: fix static linking issue with lintl
|
||||
|
||||
When net-tools are build with uClibc-ng and statically linked,
|
||||
some tools like hostname and route needs to link with -lintl.
|
||||
|
||||
Adding -lintl in LDFLAGS place the library before object files:
|
||||
arm-linux-gcc -O2 -g -Wall -fno-strict-aliasing -static -lintl -Llib -o hostname hostname.o
|
||||
|
||||
Add $(LIBS) after object files in the Makefile to place -lintl correctly.
|
||||
|
||||
Fixes:
|
||||
http://autobuild.buildroot.net/results/134/1345b6d366125320b89512e7ce7f142f1a03acf8
|
||||
|
||||
Ref:
|
||||
http://lists.busybox.net/pipermail/buildroot/2016-May/162216.html
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
Makefile | 20 ++++++++++----------
|
||||
1 file changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 171123d..a2baf79 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -158,37 +158,37 @@ subdirs: libdir
|
||||
@for i in $(SUBDIRS:$(NET_LIB_PATH)/=); do $(MAKE) -C $$i || exit $$? ; done
|
||||
|
||||
ifconfig: $(NET_LIB) ifconfig.o
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ifconfig.o $(NLIB)
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ifconfig.o $(LIBS) $(NLIB)
|
||||
|
||||
nameif: $(NET_LIB) nameif.o
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ nameif.o $(NLIB)
|
||||
|
||||
hostname: hostname.o
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ hostname.o $(DNLIB)
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ hostname.o $(LIBS) $(DNLIB)
|
||||
|
||||
route: $(NET_LIB) route.o
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ route.o $(NLIB)
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ route.o $(LIBS) $(NLIB)
|
||||
|
||||
arp: $(NET_LIB) arp.o
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ arp.o $(NLIB)
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ arp.o $(LIBS) $(NLIB)
|
||||
|
||||
rarp: $(NET_LIB) rarp.o
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ rarp.o $(NLIB)
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ rarp.o $(LIBS) $(NLIB)
|
||||
|
||||
slattach: $(NET_LIB) slattach.o
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ slattach.o $(NLIB)
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ slattach.o $(LIBS) $(NLIB)
|
||||
|
||||
plipconfig: $(NET_LIB) plipconfig.o
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ plipconfig.o $(NLIB)
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ plipconfig.o $(LIBS) $(NLIB)
|
||||
|
||||
netstat: $(NET_LIB) netstat.o statistics.o
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ netstat.o statistics.o $(NLIB) $(SELIB)
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ netstat.o statistics.o $(LIBS) $(NLIB) $(SELIB)
|
||||
|
||||
iptunnel: $(NET_LIB) iptunnel.o
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ iptunnel.o $(NLIB)
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ iptunnel.o $(LIBS) $(NLIB)
|
||||
|
||||
ipmaddr: $(NET_LIB) ipmaddr.o
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ipmaddr.o $(NLIB)
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ipmaddr.o $(LIBS) $(NLIB)
|
||||
|
||||
mii-tool: $(NET_LIB) mii-tool.o
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB)
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -7,8 +7,6 @@
|
||||
NET_TOOLS_VERSION = 3f170bff115303e92319791cbd56371e33dcbf6d
|
||||
NET_TOOLS_SITE = git://git.code.sf.net/p/net-tools/code
|
||||
NET_TOOLS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
|
||||
NET_TOOLS_LDFLAGS = $(TARGET_LDFLAGS) \
|
||||
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)
|
||||
NET_TOOLS_LICENSE = GPLv2+
|
||||
NET_TOOLS_LICENSE_FILES = COPYING
|
||||
|
||||
@@ -37,7 +35,9 @@ NET_TOOLS_POST_CONFIGURE_HOOKS += NET_TOOLS_ENABLE_I18N NET_TOOLS_ENABLE_IPV6
|
||||
|
||||
define NET_TOOLS_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) AR="$(TARGET_AR)" CC="$(TARGET_CC)" \
|
||||
LDFLAGS="$(NET_TOOLS_LDFLAGS)" $(MAKE) -C $(@D)
|
||||
LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" \
|
||||
$(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
# install renames conflicting binaries, update does not
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
From 42a95209c5650662b86d222678ec14e7edfae156 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Wed, 25 May 2016 13:26:49 +0200
|
||||
Subject: [PATCH] veth: avoid kernel header issue with musl
|
||||
|
||||
The Virtual Ethernet driver doesn't build when the musl libc is used on the
|
||||
system. As stated in the musl wiki [1], the userspace and kernel headers are
|
||||
mixed leading to a "clash" with the definitions provided by musl.
|
||||
|
||||
Remove netinet/if_ether.h userspace header and replace ETHER_ADDR_LEN by
|
||||
ETH_ALEN [2] and ETHERMTU by ETH_DATA_LEN [3] in veth-linuxuser.c.
|
||||
|
||||
Fixes:
|
||||
http://autobuild.buildroot.org/results/2ca/2ca04bb046263e479e7597867b56469893d3c11d/build-end.log
|
||||
|
||||
Upsteam status: pending
|
||||
https://github.com/OpenAutomationTechnologies/openPOWERLINK_V2/pull/120
|
||||
|
||||
[Rebase on v2.2.2]
|
||||
[1] http://wiki.musl-libc.org/wiki/FAQ#Q:_why_am_i_getting_.22error:_redefinition_of_struct_ethhdr.2Ftcphdr.2Fetc.22_.3F
|
||||
[2] https://git.musl-libc.org/cgit/musl/tree/include/net/ethernet.h?h=v1.1.14#n35
|
||||
[3] https://git.musl-libc.org/cgit/musl/tree/include/net/ethernet.h?h=v1.1.14#n48
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
stack/src/kernel/veth/veth-linuxuser.c | 13 ++++++-------
|
||||
1 file changed, 6 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/stack/src/kernel/veth/veth-linuxuser.c b/stack/src/kernel/veth/veth-linuxuser.c
|
||||
index 2a0bdd0..2bfaa87 100644
|
||||
--- a/stack/src/kernel/veth/veth-linuxuser.c
|
||||
+++ b/stack/src/kernel/veth/veth-linuxuser.c
|
||||
@@ -61,7 +61,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#include <arpa/inet.h>
|
||||
#include <linux/if.h>
|
||||
#include <linux/if_tun.h>
|
||||
-#include <netinet/if_ether.h>
|
||||
|
||||
//============================================================================//
|
||||
// G L O B A L D E F I N I T I O N S //
|
||||
@@ -248,7 +247,7 @@ static void getMacAdrs(UINT8* pMac_p)
|
||||
|
||||
close(sock);
|
||||
|
||||
- OPLK_MEMCPY(pMac_p, &ifr.ifr_hwaddr.sa_data[0], ETHER_ADDR_LEN);
|
||||
+ OPLK_MEMCPY(pMac_p, &ifr.ifr_hwaddr.sa_data[0], ETH_ALEN);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
@@ -272,9 +271,9 @@ static tOplkError veth_receiveFrame(tFrameInfo* pFrameInfo_p,
|
||||
|
||||
// replace the MAC address of the POWERLINK Ethernet interface with virtual
|
||||
// Ethernet MAC address before forwarding it into the virtual Ethernet interface
|
||||
- if (OPLK_MEMCMP(pFrameInfo_p->pFrame->aDstMac, vethInstance_l.macAdrs, ETHER_ADDR_LEN) == 0)
|
||||
+ if (OPLK_MEMCMP(pFrameInfo_p->pFrame->aDstMac, vethInstance_l.macAdrs, ETH_ALEN) == 0)
|
||||
{
|
||||
- OPLK_MEMCPY(pFrameInfo_p->pFrame->aDstMac, vethInstance_l.tapMacAdrs, ETHER_ADDR_LEN);
|
||||
+ OPLK_MEMCPY(pFrameInfo_p->pFrame->aDstMac, vethInstance_l.tapMacAdrs, ETH_ALEN);
|
||||
}
|
||||
|
||||
nwrite = write(vethInstance_l.fd, pFrameInfo_p->pFrame, pFrameInfo_p->frameSize);
|
||||
@@ -302,7 +301,7 @@ to be used as a thread which does a blocking read in a while loop.
|
||||
//------------------------------------------------------------------------------
|
||||
static void* vethRecvThread(void* pArg_p)
|
||||
{
|
||||
- UINT8 buffer[ETHERMTU];
|
||||
+ UINT8 buffer[ETH_DATA_LEN];
|
||||
UINT nread;
|
||||
tFrameInfo frameInfo;
|
||||
tOplkError ret = kErrorOk;
|
||||
@@ -331,7 +330,7 @@ static void* vethRecvThread(void* pArg_p)
|
||||
break;
|
||||
|
||||
default: // data from tun/tap ready for read
|
||||
- nread = read(pInstance->fd, buffer, ETHERMTU);
|
||||
+ nread = read(pInstance->fd, buffer, ETH_DATA_LEN);
|
||||
if (nread > 0)
|
||||
{
|
||||
DEBUG_LVL_VETH_TRACE("VETH:Read %d bytes from the tap interface\n", nread);
|
||||
@@ -340,7 +339,7 @@ static void* vethRecvThread(void* pArg_p)
|
||||
DEBUG_LVL_VETH_TRACE("DST MAC: %02X:%02X:%02x:%02X:%02X:%02x\n",
|
||||
buffer[0], buffer[1], buffer[2], buffer[3], buffer[4], buffer[5]);
|
||||
// replace src MAC address with MAC address of virtual Ethernet interface
|
||||
- OPLK_MEMCPY(&buffer[6], pInstance->macAdrs, ETHER_ADDR_LEN);
|
||||
+ OPLK_MEMCPY(&buffer[6], pInstance->macAdrs, ETH_ALEN);
|
||||
|
||||
frameInfo.pFrame = (tPlkFrame *)buffer;
|
||||
frameInfo.frameSize = nread;
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -143,7 +143,8 @@ endif
|
||||
# nconfig, gconfig, xconfig).
|
||||
# So we simply remove our PATH and PKG_CONFIG_* variables.
|
||||
$(2)_CONFIGURATOR_MAKE_ENV = \
|
||||
$$(filter-out PATH=% PKG_CONFIG=% PKG_CONFIG_SYSROOT_DIR=% PKG_CONFIG_LIBDIR=%,$$($(2)_MAKE_ENV))
|
||||
$$(filter-out PATH=% PKG_CONFIG=% PKG_CONFIG_SYSROOT_DIR=% PKG_CONFIG_LIBDIR=%,$$($(2)_MAKE_ENV)) \
|
||||
PKG_CONFIG_PATH="$(HOST_PKG_CONFIG_PATH)"
|
||||
|
||||
# Configuration editors (menuconfig, ...)
|
||||
#
|
||||
|
||||
@@ -0,0 +1,117 @@
|
||||
From 71830c804be76cf6abe913ac2fe584947b7a91ea Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Martin <s.martin49@gmail.com>
|
||||
Date: Tue, 24 May 2016 23:08:40 +0200
|
||||
Subject: [PATCH] cmake: add check for explicit linking against libatomic
|
||||
|
||||
To use atomics functions, some toolchains requires to explicitly add
|
||||
-latomic to the linker flags (because they are not provided by libc,
|
||||
but libatomic).
|
||||
|
||||
This change adds a helper function trying to build/link a test program
|
||||
using atomics, then calls it to:
|
||||
* first check if atomics are directly available in the libc;
|
||||
* if not and libatomic has been found, then run the same test with
|
||||
"-latomic" added to the linker flags.
|
||||
The pulseview link library list is updated according to the results of
|
||||
these tests.
|
||||
|
||||
This issue was triggered by the Buildroot farms:
|
||||
http://autobuild.buildroot.org/results/1e3/1e3101261252d5f30fdf842cc99604e4f4c25eef/build-end.log
|
||||
|
||||
Notes:
|
||||
1- CMAKE_REQUIRED_* variables are only used in check functions. They
|
||||
are not automatically forwarded to/handled by the target commands
|
||||
(such as target_link_library), because the check functions are
|
||||
implemented as macro in CMake code, whereas many target commands
|
||||
are native.
|
||||
2- Because of note #1, CMAKE_REQUIRED_LIBRARIES (or its value) must be
|
||||
explicitly passed to the target_link_library command when this is
|
||||
needed.
|
||||
3- In this implementation, LIBATOMIC_LIBRARY is only set when it is
|
||||
needed; so, unconditionally appending it to PULSEVIEW_LINK_LIBS
|
||||
will produce the expected behavior.
|
||||
|
||||
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
||||
|
||||
---
|
||||
changes v1->v2:
|
||||
- use std::atomic_fetch_add_explicit function instead of
|
||||
__atomic_fetch_add_4;
|
||||
- rework code using cmake_*_check_state and find_library helpers;
|
||||
- quiet-ize checks and clean outputs
|
||||
- extend the commit log
|
||||
---
|
||||
CMakeLists.txt | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 50 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9dac69f..44f810e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -107,6 +107,55 @@ endif()
|
||||
# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
|
||||
find_package(Threads REQUIRED)
|
||||
|
||||
+
|
||||
+# Check for explicit link against libatomic
|
||||
+#
|
||||
+# Depending on the toolchain, linking a program using atomic functions may need
|
||||
+# "-latomic" explicitly passed to the linker
|
||||
+#
|
||||
+# This check first tests if atomics are available in the C-library, if not and
|
||||
+# libatomic exists, then it runs the same test with -latomic added to the
|
||||
+# linker flags.
|
||||
+
|
||||
+# Helper for checking for atomics
|
||||
+function(check_working_cxx_atomics varname additional_lib)
|
||||
+ include(CheckCXXSourceCompiles)
|
||||
+ include(CMakePushCheckState)
|
||||
+ cmake_push_check_state()
|
||||
+ set(CMAKE_REQUIRED_FLAGS "-std=c++11")
|
||||
+ set(CMAKE_REQUIRED_LIBRARIES "${additional_lib}")
|
||||
+ set(CMAKE_REQUIRED_QUIET 1)
|
||||
+ CHECK_CXX_SOURCE_COMPILES("
|
||||
+#include <atomic>
|
||||
+std::atomic<int> x;
|
||||
+int main() {
|
||||
+ return std::atomic_fetch_add_explicit(&x, 1, std::memory_order_seq_cst);
|
||||
+}
|
||||
+" ${varname})
|
||||
+ cmake_pop_check_state()
|
||||
+endfunction(check_working_cxx_atomics)
|
||||
+
|
||||
+# First check if atomics work without the library.
|
||||
+# If not, check if the library exists, and atomics work with it.
|
||||
+check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB "")
|
||||
+if(HAVE_CXX_ATOMICS_WITHOUT_LIB)
|
||||
+ message(STATUS "Atomics provided by the C-library - yes")
|
||||
+else()
|
||||
+ message(STATUS "Atomics provided by the C-library - no")
|
||||
+ find_library(LIBATOMIC_LIBRARY NAMES atomic PATH_SUFFIXES lib)
|
||||
+ if(LIBATOMIC_LIBRARY)
|
||||
+ check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB "${LIBATOMIC_LIBRARY}")
|
||||
+ if (HAVE_CXX_ATOMICS_WITH_LIB)
|
||||
+ message(STATUS "Atomics provided by libatomic - yes")
|
||||
+ else()
|
||||
+ message(STATUS "Atomics provided by libatomic - no")
|
||||
+ message(FATAL_ERROR "Compiler must support std::atomic!")
|
||||
+ endif()
|
||||
+ else()
|
||||
+ message(FATAL_ERROR "Compiler appears to require libatomic, but cannot find it.")
|
||||
+ endif()
|
||||
+endif()
|
||||
+
|
||||
#===============================================================================
|
||||
#= System Introspection
|
||||
#-------------------------------------------------------------------------------
|
||||
@@ -387,6 +436,7 @@ set(PULSEVIEW_LINK_LIBS
|
||||
${Boost_LIBRARIES}
|
||||
${QT_LIBRARIES}
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
+ ${LIBATOMIC_LIBRARY}
|
||||
)
|
||||
|
||||
if(STATIC_PKGDEPS_LIBS)
|
||||
--
|
||||
2.8.3
|
||||
|
||||
@@ -2,8 +2,13 @@ comment "rpm needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
|
||||
comment "rpm needs a toolchain w/ gcc >= 5"
|
||||
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 && BR2_sh
|
||||
|
||||
config BR2_PACKAGE_RPM
|
||||
bool "rpm"
|
||||
# triggers internal compiler error
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_sh
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # beecrypt
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_BEECRYPT
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From c8333f8c7a4e4b9549abeef7530b2cd20a18e537 Mon Sep 17 00:00:00 2001
|
||||
From: rofl0r <retnyg@gmx.net>
|
||||
Date: Mon, 12 Oct 2015 12:57:09 +0100
|
||||
Subject: [PATCH] asound.h: include <time.h> to get struct timespec prototype
|
||||
|
||||
without including it, we get
|
||||
In file included from mixer.c:44:0:
|
||||
include/sound/asound.h:337:18: error: field 'trigger_tstamp' has incomplete type
|
||||
include/sound/asound.h:338:18: error: field 'tstamp' has incomplete type
|
||||
etc.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Patch status: upstream commit c8333f8c7a4e
|
||||
|
||||
include/sound/asound.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/include/sound/asound.h b/include/sound/asound.h
|
||||
index a041628ec28e..7c6de81673f5 100644
|
||||
--- a/include/sound/asound.h
|
||||
+++ b/include/sound/asound.h
|
||||
@@ -12,6 +12,7 @@
|
||||
#ifndef __SOUND_ASOUND_H
|
||||
#define __SOUND_ASOUND_H
|
||||
|
||||
+#include <time.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
#define SNDRV_PROTOCOL_VERSION(major, minor, subminor) (((major)<<16)|((minor)<<8)|(subminor))
|
||||
--
|
||||
2.8.1
|
||||
|
||||
@@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_FBTURBO
|
||||
bool "xf86-video-fbturbo"
|
||||
select BR2_PACKAGE_LIBDRM
|
||||
select BR2_PACKAGE_PIXMAN
|
||||
select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_LIBUMP
|
||||
select BR2_PACKAGE_XPROTO_FONTSPROTO
|
||||
select BR2_PACKAGE_XPROTO_RANDRPROTO
|
||||
select BR2_PACKAGE_XPROTO_RENDERPROTO
|
||||
|
||||
@@ -26,6 +26,14 @@ else
|
||||
XDRIVER_XF86_VIDEO_FBTURBO_CONF_OPTS += --disable-pciaccess
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBUMP),y)
|
||||
XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES += libump
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
|
||||
XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES += xproto_dri2proto
|
||||
endif
|
||||
|
||||
define XDRIVER_XF86_VIDEO_FBTURBO_INSTALL_CONF_FILE
|
||||
$(INSTALL) -m 0644 -D $(@D)/xorg.conf $(TARGET_DIR)/etc/X11/xorg.conf
|
||||
endef
|
||||
|
||||
@@ -82,10 +82,10 @@ endif
|
||||
|
||||
# Xwayland support needs libdrm, libepoxy, wayland and libxcomposite
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY)$(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),yyyy)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-wayland
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-xwayland
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libdrm libepoxy wayland xlib_libXcomposite
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-wayland
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-xwayland
|
||||
endif
|
||||
|
||||
# Present protocol only required for xserver 1.15+, but does not matter if
|
||||
|
||||
Vendored
+1
-1
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
# Buildroot version to use
|
||||
RELEASE='2016.02'
|
||||
RELEASE='2016.05'
|
||||
|
||||
### Change here for more memory/cores ###
|
||||
VM_MEMORY=2048
|
||||
|
||||
@@ -101,6 +101,10 @@ comment "systemd needs (e)glibc toolchain, headers >= 3.10"
|
||||
|
||||
config BR2_INIT_NONE
|
||||
bool "None"
|
||||
help
|
||||
Buildroot will not install any init system. You will
|
||||
have to provide your own, either with a new package
|
||||
or with a rootfs-overlay.
|
||||
|
||||
endchoice
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
copy_toolchain_lib_root = \
|
||||
LIB="$(strip $1)"; \
|
||||
\
|
||||
LIBPATHS=`find -L $(STAGING_DIR) -name "$${LIB}" 2>/dev/null` ; \
|
||||
LIBPATHS=`find $(STAGING_DIR)/ -name "$${LIB}" 2>/dev/null` ; \
|
||||
for LIBPATH in $${LIBPATHS} ; do \
|
||||
DESTDIR=`echo $${LIBPATH} | sed "s,^$(STAGING_DIR)/,," | xargs dirname` ; \
|
||||
mkdir -p $(TARGET_DIR)/$${DESTDIR}; \
|
||||
|
||||
Reference in New Issue
Block a user