Compare commits
69 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 083c0735e9 | |||
| 962d153084 | |||
| 1a8b1eac87 | |||
| f920873b41 | |||
| 1c186c6ca1 | |||
| 6395652c0a | |||
| 39b5a72ee5 | |||
| 84617352f3 | |||
| 4422eca2d4 | |||
| 35e02aeb7b | |||
| 68cebedeb9 | |||
| 0fae8618a3 | |||
| ba1dd18a49 | |||
| 076095a860 | |||
| 2c2920c457 | |||
| 87a23e538a | |||
| 7c77d965bd | |||
| a4b7bdd469 | |||
| fc42501195 | |||
| 85b852a969 | |||
| b6ac8cfbfa | |||
| f3f0ba82c5 | |||
| 1914ce3f31 | |||
| dbd30cd5d8 | |||
| 410082e1d9 | |||
| f12a146f81 | |||
| 0c5946acc2 | |||
| 7bf47ef773 | |||
| 4fec9fc8ff | |||
| 92b770cd82 | |||
| be4d3ff6fc | |||
| 4b47baac64 | |||
| 779ec7f36d | |||
| be8177fcea | |||
| 021f95a2a4 | |||
| a384ce7d4b | |||
| 7e4c99b950 | |||
| e9abb4a8b4 | |||
| ba684f0a12 | |||
| a3c07d08ea | |||
| ce1dac2d42 | |||
| 6cda6506ad | |||
| 01464f56bd | |||
| 5bffdf2a1a | |||
| 28f11b4852 | |||
| e6f4235756 | |||
| 97ca45aa49 | |||
| 1060ff1c70 | |||
| 36fd6fa84a | |||
| 268a8bab9e | |||
| 4664da91c2 | |||
| 3bdd364716 | |||
| 911ac036e0 | |||
| 06b555b6d5 | |||
| a862b53ef9 | |||
| c8b2bd81a1 | |||
| 07d43820f2 | |||
| 6d2f7b4f88 | |||
| 5d436ac5a6 | |||
| 3b1f2c7719 | |||
| 739cfe7a08 | |||
| c5f5d9fa4e | |||
| 8a9b9a4853 | |||
| ddbf1fe62d | |||
| a5015f1025 | |||
| ac8912579f | |||
| 0aac65bd63 | |||
| e453fb9e32 | |||
| 059029edf3 |
@@ -1,3 +1,41 @@
|
||||
2017.02, Released February 28th, 2017
|
||||
|
||||
Minor fixes, mainly fixing autobuilder issues.
|
||||
|
||||
Don't use cmake 3.7.x from the build host as it is also
|
||||
affected by the RPATH handling issues, and instead build our
|
||||
own if needed.
|
||||
|
||||
Updated/fixed packages: assimp, classpath, genimage, mplayer,
|
||||
mpv, openocd, python-libconfig, qt5base, qt5quickcontrols,
|
||||
vlc, xterm
|
||||
|
||||
2017.02-rc3, Released February 26th, 2017
|
||||
|
||||
Fixes all over the tree.
|
||||
|
||||
Cmake reverted to version 3.6.3 to workaround regressions
|
||||
related to RPATH handling.
|
||||
|
||||
Updated/fixed packages: bctoolbox, berkeleydb, binutils,
|
||||
btrfs-progs, classpath, directfb, glibc, gstreamer1,
|
||||
gst1-plugins-{base,good,bad,ugly}, gst1-libav,
|
||||
gst1-rtsp-server, gst1-validate, gst-omx, htop, libcurl,
|
||||
libepoxy, libimxvpuapi, libpcap, libuv, ncurses, openssh,
|
||||
oracle-mysql, poco, python, qt5base, qt5webkit, sslh, synergy,
|
||||
trousers, uclibc-ng-test, util-linux, vlc, xfsprogs
|
||||
|
||||
Issues resolved (http://bugs.buildroot.org):
|
||||
|
||||
#9251: Shared C++ libraries for Microblaze results in Segmentation...
|
||||
#9456: mkusers script bash errors
|
||||
#9506: Collectd 5.7.0 fails to build with libcrypt
|
||||
#9581: VagrantFile provisioning step fails due to issue with grub-pc
|
||||
#9586: usbmount: usbmount slows down the system... to a state of...
|
||||
#9616: CMake host packages cannot provide CONF_ENV
|
||||
#9641: Need raptor package installed in staging
|
||||
#9671: stunnel build error
|
||||
|
||||
2017.02-rc2, Released February 20th, 2017
|
||||
|
||||
Fixes all over the tree.
|
||||
|
||||
@@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O)
|
||||
all:
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2017.02-rc2
|
||||
export BR2_VERSION := 2017.02
|
||||
# Actual time the release is cut (for reproducible builds)
|
||||
BR2_VERSION_EPOCH = 1487631000
|
||||
BR2_VERSION_EPOCH = 1488315000
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
|
||||
@@ -44,7 +44,7 @@ using SAM-BA" section below.
|
||||
For the Xplained boards, an alternative Buildroot configuration is
|
||||
provided to boot from an SD card. Those configurations are labeled as
|
||||
'mmc'. In this case, after building Buildroot, follow the instructions
|
||||
in the "Preparting the SD card" sction.
|
||||
in the "Preparing the SD card" section.
|
||||
|
||||
To configure and build Buildroot, run:
|
||||
|
||||
|
||||
+20
-20
@@ -8,74 +8,74 @@
|
||||
<div class="panel-heading">Download</div>
|
||||
<div class="panel-body">
|
||||
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2016.11.2</b></h3>
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2017.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-2016.11.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2017.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2016.11.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2017.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h3><a href="/downloads/buildroot-2016.11.2.tar.gz">buildroot-2016.11.2.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.11.2.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2017.02.tar.gz">buildroot-2017.02.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2017.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-2016.11.2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2017.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2016.11.2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2017.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2016.11.2.tar.bz2">buildroot-2016.11.2.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.11.2.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2017.02.tar.bz2">buildroot-2017.02.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2017.02.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2017.02-rc2</b></h3>
|
||||
<!--
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2017.02-rc3</b></h3>
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2017.02-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2017.02-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2017.02-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2017.02-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2017.02-rc2.tar.gz">buildroot-2017.02-rc2.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2017.02-rc2.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2017.02-rc3.tar.gz">buildroot-2017.02-rc3.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2017.02-rc3.tar.gz.sign">PGP signature</a></p>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2017.02-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2017.02-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2017.02-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2017.02-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2017.02-rc2.tar.bz2">buildroot-2017.02-rc2.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2017.02-rc2.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2017.02-rc3.tar.bz2">buildroot-2017.02-rc3.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2017.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>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
function load_activity(feedurl, divid) {
|
||||
var yqlURL = "https://query.yahooapis.com/v1/public/yql";
|
||||
var yqlQS = "?q=select%20*%20from%20xml%20where%20url%20%3D%20'";
|
||||
var yqlOPTS = "'&format=json&env=store%3A%2F%2Fdatatables.org%2Falltableswithkeys&callback=";
|
||||
var yqlQS = "?q=select%20entry%20from%20xml%20where%20url%20%3D%20'";
|
||||
var yqlOPTS = "'%20limit%2010&format=json&callback=";
|
||||
var container = document.getElementById(divid);
|
||||
var url = yqlURL + yqlQS + encodeURIComponent(feedurl) + yqlOPTS;
|
||||
|
||||
@@ -10,8 +10,8 @@ function load_activity(feedurl, divid) {
|
||||
var loaded = 0;
|
||||
var nb_display = 8;
|
||||
if (result==null) return;
|
||||
for (var i = 0; i < result.feed.entry.length; i++) {
|
||||
var entry = result.feed.entry[i];
|
||||
for (var i = 0; i < result.feed.length; i++) {
|
||||
var entry = result.feed[i].entry;
|
||||
if (entry.title.indexOf("git commit") != -1)
|
||||
continue;
|
||||
loaded += 1;
|
||||
|
||||
@@ -9,6 +9,46 @@
|
||||
<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">2017.02 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>28 February 2017</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The stable 2017.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=2017.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-2017.02.tar.bz2">2017.02 release</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li class="timeline-inverted">
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2017.02-rc3 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>26 February 2017</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>Release candidate 3 is out with more cleanups and security
|
||||
/ build fixes. See
|
||||
the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.02-rc3">CHANGES</a>
|
||||
file for details.</p>
|
||||
<p>Head to the <a href="/downloads/">downloads page</a> to
|
||||
pick up
|
||||
the <a href="/downloads/buildroot-2017.02-rc3.tar.bz2">2017.02-rc3
|
||||
release candidate</a>, and report any problems found to
|
||||
the <a href="support.html">mailing list</a>
|
||||
or <a href="https://bugs.uclibc.org">bug tracker</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
|
||||
+2
-2
@@ -26,7 +26,7 @@ choice
|
||||
prompt "Kernel version"
|
||||
|
||||
config BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
bool "Latest version (4.9.10)"
|
||||
bool "Latest version (4.9.13)"
|
||||
|
||||
config BR2_LINUX_KERNEL_CUSTOM_VERSION
|
||||
bool "Custom version"
|
||||
@@ -97,7 +97,7 @@ endif
|
||||
|
||||
config BR2_LINUX_KERNEL_VERSION
|
||||
string
|
||||
default "4.9.10" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "4.9.13" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
|
||||
if BR2_LINUX_KERNEL_CUSTOM_VERSION
|
||||
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
|
||||
|
||||
@@ -34,9 +34,6 @@ config BR2_PACKAGE_ALSA_UTILS_ALSALOOP
|
||||
config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER
|
||||
bool "alsamixer"
|
||||
select BR2_PACKAGE_NCURSES
|
||||
select BR2_PACKAGE_NCURSES_TARGET_PANEL
|
||||
select BR2_PACKAGE_NCURSES_TARGET_FORM
|
||||
select BR2_PACKAGE_NCURSES_TARGET_MENU
|
||||
select BR2_PACKAGE_ALSA_LIB_MIXER
|
||||
depends on BR2_USE_WCHAR
|
||||
default y
|
||||
|
||||
@@ -4,11 +4,6 @@ config BR2_PACKAGE_ASSIMP
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71124, that
|
||||
# cause an infinite loop in gcc when building this package.
|
||||
depends on !BR2_microblaze
|
||||
# The ADI Blackfin toolchain does not build assimp properly,
|
||||
# fails with "internal compiler error: in simplify_subreg, at
|
||||
# simplify-rtx.c:5001". It builds fine with a mainline gcc for
|
||||
# Blackfin.
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
|
||||
@@ -16,6 +16,14 @@ ifeq ($(BR2_m68k),y)
|
||||
ASSIMP_CXXFLAGS += -mxgot
|
||||
endif
|
||||
|
||||
# workaround SuperH compiler failure when static linking (i.e -fPIC is
|
||||
# not passed) in gcc versions 5.x or older. The -Os optimization level
|
||||
# causes a "unable to find a register to spill in class
|
||||
# ‘GENERAL_REGS’" error. -O2 works fine.
|
||||
ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:y:)
|
||||
ASSIMP_CXXFLAGS += -O2
|
||||
endif
|
||||
|
||||
ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \
|
||||
-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)"
|
||||
|
||||
|
||||
@@ -8,7 +8,6 @@ BCTOOLBOX_VERSION = 0.4.0
|
||||
BCTOOLBOX_SITE = $(call github,BelledonneCommunications,bctoolbox,$(BCTOOLBOX_VERSION))
|
||||
BCTOOLBOX_LICENSE = GPLv2+
|
||||
BCTOOLBOX_LICENSE_FILES = COPYING
|
||||
BCTOOLBOX_DEPENDENCIES = mbedtls
|
||||
BCTOOLBOX_INSTALL_STAGING = YES
|
||||
|
||||
# Set CMAKE_SKIP_RPATH to prevent bctoolbox from adding the rpath to
|
||||
|
||||
@@ -20,11 +20,18 @@ BERKELEYDB_BINARIES = db_archive db_checkpoint db_deadlock db_dump \
|
||||
db_hotbackup db_load db_log_verify db_printlog db_recover db_replicate \
|
||||
db_stat db_tuner db_upgrade db_verify
|
||||
|
||||
# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509
|
||||
ifeq ($(BR2_m68k_cf),y)
|
||||
BERKELEYDB_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm"
|
||||
endif
|
||||
|
||||
# build directory can't be the directory where configure are there, so..
|
||||
define BERKELEYDB_CONFIGURE_CMDS
|
||||
(cd $(@D)/build_unix; rm -rf config.cache; \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
$(TARGET_CONFIGURE_ARGS) \
|
||||
$(BERKELEYDB_CONF_ENV) \
|
||||
../dist/configure $(QUIET) \
|
||||
--target=$(GNU_TARGET_NAME) \
|
||||
--host=$(GNU_TARGET_NAME) \
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
Fix ld segfault for microblaze when --gc-sections is used
|
||||
Upstream: pending
|
||||
https://sourceware.org/bugzilla/show_bug.cgi?id=21180
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
|
||||
diff -Nur binutils-2.25.1.orig/bfd/elf32-microblaze.c binutils-2.25.1/bfd/elf32-microblaze.c
|
||||
--- binutils-2.25.1.orig/bfd/elf32-microblaze.c 2015-07-21 10:20:58.000000000 +0200
|
||||
+++ binutils-2.25.1/bfd/elf32-microblaze.c 2017-02-23 19:43:24.560776208 +0100
|
||||
@@ -3297,13 +3297,20 @@
|
||||
&& h->def_regular)
|
||||
{
|
||||
asection *sec = h->root.u.def.section;
|
||||
+ bfd_vma value;
|
||||
+
|
||||
+ value = h->root.u.def.value;
|
||||
+ if (sec->output_section != NULL)
|
||||
+ /* PR 21180: If the output section is NULL, then the symbol is no
|
||||
+ longer needed, and in theory the GOT entry is redundant. But
|
||||
+ it is too late to change our minds now... */
|
||||
+ value += sec->output_section->vma + sec->output_offset;
|
||||
+
|
||||
microblaze_elf_output_dynamic_relocation (output_bfd,
|
||||
srela, srela->reloc_count++,
|
||||
/* symindex= */ 0,
|
||||
R_MICROBLAZE_REL, offset,
|
||||
- h->root.u.def.value
|
||||
- + sec->output_section->vma
|
||||
- + sec->output_offset);
|
||||
+ value);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -0,0 +1,33 @@
|
||||
Fix ld segfault for microblaze when --gc-sections is used
|
||||
Upstream: pending
|
||||
https://sourceware.org/bugzilla/show_bug.cgi?id=21180
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
|
||||
diff -Nur binutils-2.26.1.orig/bfd/elf32-microblaze.c binutils-2.26.1/bfd/elf32-microblaze.c
|
||||
--- binutils-2.26.1.orig/bfd/elf32-microblaze.c 2015-11-13 09:27:40.000000000 +0100
|
||||
+++ binutils-2.26.1/bfd/elf32-microblaze.c 2017-02-23 19:43:18.536542964 +0100
|
||||
@@ -3300,13 +3300,20 @@
|
||||
&& h->def_regular)
|
||||
{
|
||||
asection *sec = h->root.u.def.section;
|
||||
+ bfd_vma value;
|
||||
+
|
||||
+ value = h->root.u.def.value;
|
||||
+ if (sec->output_section != NULL)
|
||||
+ /* PR 21180: If the output section is NULL, then the symbol is no
|
||||
+ longer needed, and in theory the GOT entry is redundant. But
|
||||
+ it is too late to change our minds now... */
|
||||
+ value += sec->output_section->vma + sec->output_offset;
|
||||
+
|
||||
microblaze_elf_output_dynamic_relocation (output_bfd,
|
||||
srela, srela->reloc_count++,
|
||||
/* symindex= */ 0,
|
||||
R_MICROBLAZE_REL, offset,
|
||||
- h->root.u.def.value
|
||||
- + sec->output_section->vma
|
||||
- + sec->output_offset);
|
||||
+ value);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -0,0 +1,33 @@
|
||||
Fix ld segfault for microblaze when --gc-sections is used
|
||||
Upstream: pending
|
||||
https://sourceware.org/bugzilla/show_bug.cgi?id=21180
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
|
||||
diff -Nur binutils-2.27.orig/bfd/elf32-microblaze.c binutils-2.27/bfd/elf32-microblaze.c
|
||||
--- binutils-2.27.orig/bfd/elf32-microblaze.c 2016-08-03 09:36:50.000000000 +0200
|
||||
+++ binutils-2.27/bfd/elf32-microblaze.c 2017-02-23 19:43:12.612313590 +0100
|
||||
@@ -3297,13 +3297,20 @@
|
||||
|| h->dynindx == -1))
|
||||
{
|
||||
asection *sec = h->root.u.def.section;
|
||||
+ bfd_vma value;
|
||||
+
|
||||
+ value = h->root.u.def.value;
|
||||
+ if (sec->output_section != NULL)
|
||||
+ /* PR 21180: If the output section is NULL, then the symbol is no
|
||||
+ longer needed, and in theory the GOT entry is redundant. But
|
||||
+ it is too late to change our minds now... */
|
||||
+ value += sec->output_section->vma + sec->output_offset;
|
||||
+
|
||||
microblaze_elf_output_dynamic_relocation (output_bfd,
|
||||
srela, srela->reloc_count++,
|
||||
/* symindex= */ 0,
|
||||
R_MICROBLAZE_REL, offset,
|
||||
- h->root.u.def.value
|
||||
- + sec->output_section->vma
|
||||
- + sec->output_offset);
|
||||
+ value);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -0,0 +1,42 @@
|
||||
From 1fc5444f5620670bb9d293be4f92df59661e1810 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Mon, 20 Feb 2017 23:31:24 +0100
|
||||
Subject: [PATCH] kerncompat.h: define BTRFS_DISABLE_BACKTRACE when building
|
||||
with uClibc
|
||||
|
||||
uClibc does not provide backtrace() nor <execinfo.h>. When building
|
||||
btrfs-progs, passing --disable-backtrace is enough to make it build with
|
||||
uClibc. But once btrfs-progs is installed and another program/library
|
||||
includes kerncompat.h, it fails to build with uClibc, because
|
||||
BTRFS_DISABLE_BACKTRACE is not defined.
|
||||
|
||||
The most correct fix for this would be to have kerncompat.h generated
|
||||
from kerncompat.h.in during the btrfs-progs build process, and tuned
|
||||
depending on autoconf/automake variables. But as a quick fix that
|
||||
follows the current strategy, we simply tweak the existing __GLIBC__
|
||||
conditional. Indeed, uClibc pretends to be glibc and defines __GLIBC__,
|
||||
but it does not replace it completely, hence the need to define
|
||||
BTRFS_DISABLE_BACKTRACE when __GLIBC__ is not defined *or* when
|
||||
__UCLIBC__ is defined.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
kerncompat.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kerncompat.h b/kerncompat.h
|
||||
index 0f207b7..e47d164 100644
|
||||
--- a/kerncompat.h
|
||||
+++ b/kerncompat.h
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
#include <features.h>
|
||||
|
||||
-#ifndef __GLIBC__
|
||||
+#if !defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
#ifndef BTRFS_DISABLE_BACKTRACE
|
||||
#define BTRFS_DISABLE_BACKTRACE
|
||||
#endif
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,7 +1,15 @@
|
||||
config BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
|
||||
bool
|
||||
default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k \
|
||||
|| BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \
|
||||
|| BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le \
|
||||
|| BR2_sh || BR2_x86_64
|
||||
|
||||
config BR2_PACKAGE_CLASSPATH
|
||||
bool "classpath"
|
||||
select BR2_NEEDS_HOST_JAR
|
||||
select BR2_NEEDS_HOST_JAVAC
|
||||
depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
|
||||
help
|
||||
GNU Classpath, Essential Libraries for Java, is a GNU
|
||||
project to create free core class libraries for use with
|
||||
|
||||
@@ -20,14 +20,11 @@ config BR2_PACKAGE_CMAKE_CTEST
|
||||
select BR2_PACKAGE_EXPAT
|
||||
select BR2_PACKAGE_BZIP2
|
||||
select BR2_PACKAGE_XZ
|
||||
select BR2_PACKAGE_LIBUV
|
||||
depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp
|
||||
depends on BR2_USE_WCHAR # libarchive
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
|
||||
depends on BR2_USE_MMU # libuv
|
||||
help
|
||||
CTest is a testing tool distributed as a part of CMake. It
|
||||
can be used to automate updating (using CVS for example),
|
||||
@@ -37,9 +34,7 @@ config BR2_PACKAGE_CMAKE_CTEST
|
||||
|
||||
http://www.cmake.org/
|
||||
|
||||
comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, NPTL"
|
||||
comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7"
|
||||
depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
|
||||
BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://www.cmake.org/files/v3.7/cmake-3.7.2-SHA-256.txt
|
||||
sha256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 cmake-3.7.2.tar.gz
|
||||
# From http://www.cmake.org/files/v3.6/cmake-3.6.3-SHA-256.txt
|
||||
sha256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe cmake-3.6.3.tar.gz
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CMAKE_VERSION_MAJOR = 3.7
|
||||
CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2
|
||||
CMAKE_VERSION_MAJOR = 3.6
|
||||
CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3
|
||||
CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
|
||||
CMAKE_LICENSE = BSD-3c
|
||||
CMAKE_LICENSE_FILES = Copyright.txt
|
||||
@@ -22,7 +22,7 @@ CMAKE_LICENSE_FILES = Copyright.txt
|
||||
# the system-wide libraries instead of rebuilding and statically
|
||||
# linking with the ones bundled into the CMake sources.
|
||||
|
||||
CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz libuv
|
||||
CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz
|
||||
|
||||
CMAKE_CONF_OPTS = \
|
||||
-DKWSYS_LFS_WORKS=TRUE \
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
config BR2_PACKAGE_DIRECTFB
|
||||
bool "directfb"
|
||||
depends on !BR2_STATIC_LIBS # static link issues
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
|
||||
@@ -161,7 +162,8 @@ config BR2_PACKAGE_DIRECTFB_TESTS
|
||||
|
||||
endif # BR2_PACKAGE_DIRECTFB
|
||||
|
||||
comment "directfb needs a glibc or uClibc toolchain w/ C++, NPTL, gcc >= 4.5"
|
||||
comment "directfb needs a glibc or uClibc toolchain w/ C++, NPTL, gcc >= 4.5, dynamic library"
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || BR2_TOOLCHAIN_USES_MUSL
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || BR2_TOOLCHAIN_USES_MUSL || \
|
||||
BR2_STATIC_LIBS
|
||||
|
||||
@@ -5,7 +5,7 @@ config BR2_PACKAGE_HOST_GENIMAGE
|
||||
images from a given root filesystem tree. genimage is
|
||||
intended to be run in a fakeroot environment.
|
||||
|
||||
Configuration is done is a config file parsed by
|
||||
Configuration is done in a config file parsed by
|
||||
libconfuse. Options like the path to tools can be given in
|
||||
environment variables, the config file or commandline
|
||||
switches.
|
||||
|
||||
@@ -101,9 +101,9 @@ endef
|
||||
#
|
||||
|
||||
GLIBC_LIBS_LIB = \
|
||||
ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* \
|
||||
libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* libutil.so.* \
|
||||
libnss_files.so.* libnss_dns.so.* libmvec.so.*
|
||||
ld*.so.* libanl.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* \
|
||||
libm.so.* libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* \
|
||||
libutil.so.* libnss_files.so.* libnss_dns.so.* libmvec.so.*
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GDB),y)
|
||||
GLIBC_LIBS_LIB += libthread_db.so.*
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.10.3.tar.xz.sha256sum
|
||||
sha256 dd88451e175df7a6b6f619eff0f43a6078054ec7068787b19faf89af94cdb6e1 gst-omx-1.10.3.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.10.4.tar.xz.sha256sum
|
||||
sha256 45072925cf262f0fd528fab78f0de52734e46a5a88aa802fae51c67c09c81aa2 gst-omx-1.10.4.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST_OMX_VERSION = 1.10.3
|
||||
GST_OMX_VERSION = 1.10.4
|
||||
GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz
|
||||
GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.3.tar.xz.sha256sum
|
||||
sha256 9a6bc165b1862b18b98d9f1755c43806e4839a80f69ec7ea9a2dab61b65752a9 gst-libav-1.10.3.tar.xz
|
||||
# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.4.tar.xz.sha256sum
|
||||
sha256 6ca0feca75e3d48315e07f20ec37cf6260ed1e9dde58df355febd5016246268b gst-libav-1.10.4.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_LIBAV_VERSION = 1.10.3
|
||||
GST1_LIBAV_VERSION = 1.10.4
|
||||
GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz
|
||||
GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav
|
||||
GST1_LIBAV_CONF_OPTS = --with-system-libav
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.3.tar.xz.sha256sum
|
||||
sha256 24099351fb6984c9e7560de06e072ff2e33d0b2db38b8fcc7afefb536e5094e7 gst-plugins-bad-1.10.3.tar.xz
|
||||
# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.4.tar.xz.sha256sum
|
||||
sha256 23ddae506b3a223b94869a0d3eea3e9a12e847f94d2d0e0b97102ce13ecd6966 gst-plugins-bad-1.10.4.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PLUGINS_BAD_VERSION = 1.10.3
|
||||
GST1_PLUGINS_BAD_VERSION = 1.10.4
|
||||
GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
|
||||
GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad
|
||||
GST1_PLUGINS_BAD_INSTALL_STAGING = YES
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.3.tar.xz.sha256sum
|
||||
sha256 e6299617d705a0cbfb535107c1d3a8fc0f0967f14193a8c5c7583f46a88b1710 gst-plugins-base-1.10.3.tar.xz
|
||||
# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.4.tar.xz.sha256sum
|
||||
sha256 f6d245b6b3d4cb733f81ebb021074c525ece83db0c10e932794b339b8d935eb7 gst-plugins-base-1.10.4.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PLUGINS_BASE_VERSION = 1.10.3
|
||||
GST1_PLUGINS_BASE_VERSION = 1.10.4
|
||||
GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz
|
||||
GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base
|
||||
GST1_PLUGINS_BASE_INSTALL_STAGING = YES
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.3.tar.xz.sha256sum
|
||||
sha256 4e07e93e34d4b93208f1579c21e7d91a236577b36f128a5332ffee85b4465955 gst-plugins-good-1.10.3.tar.xz
|
||||
# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.4.tar.xz.sha256sum
|
||||
sha256 8a86c61434a8c44665365bd0b3557a040937d1f44bf69caee4e9ea816ce74d7e gst-plugins-good-1.10.4.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PLUGINS_GOOD_VERSION = 1.10.3
|
||||
GST1_PLUGINS_GOOD_VERSION = 1.10.4
|
||||
GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz
|
||||
GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good
|
||||
GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.3.tar.xz.sha256sum
|
||||
sha256 c91597d03abff9df435ad4892eae44df1ee14159c7cc7317ac9d2766ff446bd2 gst-plugins-ugly-1.10.3.tar.xz
|
||||
# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.4.tar.xz.sha256sum
|
||||
sha256 6386c77ca8459cba431ed0b63da780c7062c7cc48055d222024d8eaf198ffa59 gst-plugins-ugly-1.10.4.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PLUGINS_UGLY_VERSION = 1.10.3
|
||||
GST1_PLUGINS_UGLY_VERSION = 1.10.4
|
||||
GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz
|
||||
GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly
|
||||
GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.10.3.tar.xz.sha256sum
|
||||
sha256 baf9f7d229711cb3d823a447a930132f809b3321eab3535491bb01c8a21566fe gst-rtsp-server-1.10.3.tar.xz
|
||||
# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.10.4.tar.xz.sha256sum
|
||||
sha256 2f6e12fd4e3568ee190dc24e57e4c3a878971c3a3fb6904a9674404fac256de6 gst-rtsp-server-1.10.4.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_RTSP_SERVER_VERSION = 1.10.3
|
||||
GST1_RTSP_SERVER_VERSION = 1.10.4
|
||||
GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz
|
||||
GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server
|
||||
GST1_RTSP_SERVER_LICENSE = LGPLv2+
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.10.3.tar.xz.sha256sum
|
||||
sha256 be6b48569324c541266310e7e6d1098b1a2ec7cd06b9e95b6701c96bc4562c02 gst-validate-1.10.3.tar.xz
|
||||
# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.10.4.tar.xz.sha256sum
|
||||
sha256 e59c00bf64cca9c477cdb44eb8dd0b3aac5499b17d77bf28ee054fd211e8d73c gst-validate-1.10.4.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_VALIDATE_VERSION = 1.10.3
|
||||
GST1_VALIDATE_VERSION = 1.10.4
|
||||
GST1_VALIDATE_SOURCE = gst-validate-$(GST1_VALIDATE_VERSION).tar.xz
|
||||
GST1_VALIDATE_SITE = https://gstreamer.freedesktop.org/src/gst-validate
|
||||
GST1_VALIDATE_LICENSE = LGPLv2.1+
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.10.3.tar.xz.sha256sum
|
||||
sha256 85b9dc1b2991f224fa90d534ec57014896c479e061dc9fa1bc16ae17cbebb63d gstreamer-1.10.3.tar.xz
|
||||
# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.10.4.tar.xz.sha256sum
|
||||
sha256 50c2f5af50a6cc6c0a3f3ed43bdd8b5e2bff00bacfb766d4be139ec06d8b5218 gstreamer-1.10.4.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GSTREAMER1_VERSION = 1.10.3
|
||||
GSTREAMER1_VERSION = 1.10.4
|
||||
GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz
|
||||
GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer
|
||||
GSTREAMER1_INSTALL_STAGING = YES
|
||||
|
||||
@@ -18,4 +18,11 @@ else
|
||||
HTOP_CONF_OPTS += --disable-unicode
|
||||
endif
|
||||
|
||||
# ARC uses an old uClibc that needs dladdr() for backtrace support,
|
||||
# which doesn't work for static only scenario, so as a workaround, we
|
||||
# pretend that execinfo.h is not available.
|
||||
ifeq ($(BR2_arc)$(BR2_STATIC_LIBS),yy)
|
||||
HTOP_CONF_ENV += ac_cv_header_execinfo_h=no
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
config BR2_PACKAGE_IPRUTILS
|
||||
bool "iprutils"
|
||||
select BR2_PACKAGE_NCURSES
|
||||
select BR2_PACKAGE_NCURSES_TARGET_PANEL
|
||||
select BR2_PACKAGE_NCURSES_TARGET_FORM
|
||||
select BR2_PACKAGE_NCURSES_TARGET_MENU
|
||||
select BR2_PACKAGE_LIBSYSFS
|
||||
select BR2_PACKAGE_PCIUTILS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
|
||||
@@ -2,7 +2,6 @@ config BR2_PACKAGE_IPTRAF_NG
|
||||
bool "iptraf-ng"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_NCURSES
|
||||
select BR2_PACKAGE_NCURSES_TARGET_PANEL
|
||||
help
|
||||
IPTraf-ng is a ncurses-based network monitoring utility. It gathers
|
||||
data like TCP connection packet and byte counts, interface statistics
|
||||
|
||||
@@ -4,6 +4,7 @@ config BR2_PACKAGE_JAMVM
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
|
||||
|| BR2_mips || BR2_mipsel || BR2_powerpc
|
||||
depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
|
||||
select BR2_PACKAGE_ZLIB
|
||||
select BR2_PACKAGE_CLASSPATH
|
||||
help
|
||||
@@ -15,4 +16,5 @@ config BR2_PACKAGE_JAMVM
|
||||
comment "jamvm needs a toolchain w/ threads, dynamic library"
|
||||
depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
|
||||
|| BR2_mips || BR2_mipsel || BR2_powerpc
|
||||
depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
|
||||
@@ -10,7 +10,6 @@ config BR2_PACKAGE_KISMET
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on !BR2_STATIC_LIBS # dlfcn.h
|
||||
select BR2_PACKAGE_NCURSES
|
||||
select BR2_PACKAGE_NCURSES_TARGET_PANEL
|
||||
select BR2_PACKAGE_LIBPCAP
|
||||
select BR2_PACKAGE_LIBNL
|
||||
help
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 d16185a767cb2c1ba3d5b9096ec54e5ec198b213f45864a38b3bda4bbf87389b curl-7.52.1.tar.bz2
|
||||
sha256 b2345a8bef87b4c229dedf637cb203b5e21db05e20277c8e1094f0d4da180801 curl-7.53.0.tar.bz2
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBCURL_VERSION = 7.52.1
|
||||
LIBCURL_VERSION = 7.53.0
|
||||
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
|
||||
LIBCURL_SITE = https://curl.haxx.se/download
|
||||
LIBCURL_DEPENDENCIES = host-pkgconf \
|
||||
|
||||
@@ -9,7 +9,7 @@ LIBEPOXY_SITE = $(call github,anholt,libepoxy,$(LIBEPOXY_VERSION))
|
||||
LIBEPOXY_INSTALL_STAGING = YES
|
||||
# For patches 0001-0006:
|
||||
LIBEPOXY_AUTORECONF = YES
|
||||
LIBEPOXY_DEPENDENCIES = xutil_util-macros
|
||||
LIBEPOXY_DEPENDENCIES = host-pkgconf xutil_util-macros
|
||||
LIBEPOXY_LICENSE = MIT
|
||||
LIBEPOXY_LICENSE_FILES = COPYING
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# locally computed hash
|
||||
sha256 8e6dc4105db6164c0de72fd60eb73f4ba1632f7ba5052b1abc834b462b566da2 libimxvpuapi-0.10.2.tar.gz
|
||||
sha256 7151e10a24929935bada1d3d87626f17e411575b3a4ac0d86440999ad0100a55 libimxvpuapi-0.10.3.tar.gz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBIMXVPUAPI_VERSION = 0.10.2
|
||||
LIBIMXVPUAPI_VERSION = 0.10.3
|
||||
LIBIMXVPUAPI_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI_VERSION))
|
||||
LIBIMXVPUAPI_LICENSE = LGPLv2.1+
|
||||
LIBIMXVPUAPI_LICENSE_FILES = LICENSE
|
||||
|
||||
@@ -53,8 +53,8 @@ else
|
||||
LIBPCAP_CONF_OPTS += --without-libnl
|
||||
endif
|
||||
|
||||
# microblaze/sparc64 need -fPIC instead of -fpic
|
||||
ifeq ($(BR2_microblaze)$(BR2_sparc64),y)
|
||||
# microblaze/sparc/sparc64 need -fPIC instead of -fpic
|
||||
ifeq ($(BR2_microblaze)$(BR2_sparc)$(BR2_sparc64),y)
|
||||
LIBPCAP_CFLAGS += -fPIC
|
||||
endif
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBUV
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_barrier_*
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
help
|
||||
libuv is a multi-platform support library with a focus
|
||||
on asynchronous I/O.
|
||||
@@ -12,3 +13,4 @@ config BR2_PACKAGE_LIBUV
|
||||
comment "libuv needs a toolchain w/ NPTL, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
|
||||
@@ -214,7 +214,7 @@ endchoice
|
||||
|
||||
config BR2_DEFAULT_KERNEL_HEADERS
|
||||
string
|
||||
default "3.2.84" if BR2_KERNEL_HEADERS_3_2
|
||||
default "3.2.85" if BR2_KERNEL_HEADERS_3_2
|
||||
default "3.4.113" if BR2_KERNEL_HEADERS_3_4
|
||||
default "3.10.105" if BR2_KERNEL_HEADERS_3_10
|
||||
default "3.12.70" if BR2_KERNEL_HEADERS_3_12
|
||||
@@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
|
||||
default "3.19.8" if BR2_KERNEL_HEADERS_3_19
|
||||
default "4.0.9" if BR2_KERNEL_HEADERS_4_0
|
||||
default "4.1.38" if BR2_KERNEL_HEADERS_4_1
|
||||
default "4.4.49" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.4.52" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.8.17" if BR2_KERNEL_HEADERS_4_8
|
||||
default "4.9.10" if BR2_KERNEL_HEADERS_4_9
|
||||
default "4.9.13" if BR2_KERNEL_HEADERS_4_9
|
||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||
|
||||
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LUV
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
|
||||
depends on BR2_USE_MMU # libuv
|
||||
depends on !BR2_STATIC_LIBS # libuv
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
|
||||
help
|
||||
libuv bindings for LuaJIT and Lua.
|
||||
|
||||
@@ -12,3 +13,4 @@ config BR2_PACKAGE_LUV
|
||||
comment "luv needs a toolchain w/ NPTL, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
|
||||
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LUVI
|
||||
depends on BR2_USE_MMU # libuv
|
||||
depends on !BR2_STATIC_LIBS # libuv
|
||||
depends on BR2_PACKAGE_LUAJIT
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
|
||||
select BR2_PACKAGE_LIBUV
|
||||
select BR2_PACKAGE_LUV
|
||||
help
|
||||
@@ -25,6 +26,7 @@ config BR2_PACKAGE_LUVI
|
||||
comment "luvi needs a toolchain w/ NPTL, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
|
||||
comment "luvi needs LuaJIT"
|
||||
depends on !BR2_PACKAGE_LUAJIT
|
||||
|
||||
@@ -6,6 +6,7 @@ config BR2_PACKAGE_MOARVM
|
||||
depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # libatomic_ops
|
||||
# needs AO_fetch_compare_and_swap, not implemented for sparcv8/sparcv9
|
||||
depends on !BR2_sparc64 && !BR2_sparc
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
|
||||
select BR2_PACKAGE_LIBUV
|
||||
select BR2_PACKAGE_LIBTOMMATH
|
||||
select BR2_PACKAGE_LIBATOMIC_OPS
|
||||
@@ -23,4 +24,4 @@ comment "moarvm needs a toolchain w/ NPTL, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS
|
||||
depends on !BR2_sparc64 && !BR2_sparc
|
||||
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
|
||||
@@ -3,7 +3,7 @@ config BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
|
||||
default y
|
||||
# Those architectures are not supported by MPlayer
|
||||
depends on !(BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
|
||||
|| BR2_m68k || BR2_microblaze || BR2_nios2)
|
||||
|| BR2_m68k || BR2_microblaze || BR2_nios2 || BR2_or1k)
|
||||
# Broken support for <ARMv5
|
||||
depends on !BR2_ARM_CPU_ARMV4
|
||||
# configure script barfs on the -Wl,-elf2flt we add in the toolchain
|
||||
|
||||
@@ -4,6 +4,8 @@ config BR2_PACKAGE_MPV
|
||||
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
|
||||
depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
|
||||
# ARC toolchain issue
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
select BR2_PACKAGE_FFMPEG
|
||||
select BR2_PACKAGE_FFMPEG_SWSCALE
|
||||
@@ -21,3 +23,4 @@ comment "mpv needs a toolchain w/ threads, gcc >= 4.5"
|
||||
depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
|
||||
|
||||
@@ -18,21 +18,6 @@ config BR2_PACKAGE_NCURSES_WCHAR
|
||||
help
|
||||
Enable wide char & UTF-8 support in ncurses libraries
|
||||
|
||||
config BR2_PACKAGE_NCURSES_TARGET_PANEL
|
||||
bool "ncurses libpanel in target"
|
||||
help
|
||||
Includes ncurses dynamic libpanel in target
|
||||
|
||||
config BR2_PACKAGE_NCURSES_TARGET_FORM
|
||||
bool "ncurses libform in target"
|
||||
help
|
||||
Includes ncurses dynamic libform in target
|
||||
|
||||
config BR2_PACKAGE_NCURSES_TARGET_MENU
|
||||
bool "ncurses libmenu in target"
|
||||
help
|
||||
Includes ncurses dynamic libmenu in target
|
||||
|
||||
config BR2_PACKAGE_NCURSES_TARGET_PROGS
|
||||
bool "ncurses programs"
|
||||
help
|
||||
|
||||
+21
-44
@@ -8,7 +8,6 @@ NCURSES_VERSION = 5.9
|
||||
NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
|
||||
NCURSES_INSTALL_STAGING = YES
|
||||
NCURSES_DEPENDENCIES = host-ncurses
|
||||
NCURSES_PROGS = clear infocmp tabs tic toe tput tset
|
||||
NCURSES_LICENSE = MIT with advertising clause
|
||||
NCURSES_LICENSE_FILES = README
|
||||
NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)$(NCURSES_ABI_VERSION)-config
|
||||
@@ -50,11 +49,6 @@ else
|
||||
NCURSES_CONF_OPTS += --without-gpm
|
||||
endif
|
||||
|
||||
NCURSES_LIBS-y = ncurses
|
||||
NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_MENU) += menu
|
||||
NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_PANEL) += panel
|
||||
NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_FORM) += form
|
||||
|
||||
NCURSES_TERMINFO_FILES = \
|
||||
a/ansi \
|
||||
l/linux \
|
||||
@@ -73,38 +67,36 @@ NCURSES_TERMINFO_FILES = \
|
||||
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
|
||||
NCURSES_CONF_OPTS += --enable-widec
|
||||
NCURSES_LIB_SUFFIX = w
|
||||
NCURSES_LIBS = ncurses menu panel form
|
||||
|
||||
define NCURSES_LINK_LIBS_STATIC
|
||||
$(foreach lib,$(NCURSES_LIBS-y:%=lib%), \
|
||||
ln -sf $(lib)$(NCURSES_LIB_SUFFIX).a $(1)/usr/lib/$(lib).a
|
||||
$(foreach lib,$(NCURSES_LIBS:%=lib%), \
|
||||
ln -sf $(lib)$(NCURSES_LIB_SUFFIX).a $(STAGING_DIR)/usr/lib/$(lib).a
|
||||
)
|
||||
ln -sf libncurses$(NCURSES_LIB_SUFFIX).a \
|
||||
$(1)/usr/lib/libcurses.a
|
||||
$(STAGING_DIR)/usr/lib/libcurses.a
|
||||
endef
|
||||
|
||||
define NCURSES_LINK_LIBS_SHARED
|
||||
$(foreach lib,$(NCURSES_LIBS-y:%=lib%), \
|
||||
ln -sf $(lib)$(NCURSES_LIB_SUFFIX).so $(1)/usr/lib/$(lib).so
|
||||
$(foreach lib,$(NCURSES_LIBS:%=lib%), \
|
||||
ln -sf $(lib)$(NCURSES_LIB_SUFFIX).so $(STAGING_DIR)/usr/lib/$(lib).so
|
||||
)
|
||||
ln -sf libncurses$(NCURSES_LIB_SUFFIX).so \
|
||||
$(1)/usr/lib/libcurses.so
|
||||
$(STAGING_DIR)/usr/lib/libcurses.so
|
||||
endef
|
||||
|
||||
define NCURSES_LINK_PC
|
||||
$(foreach pc,$(NCURSES_LIBS-y), \
|
||||
$(foreach pc,$(NCURSES_LIBS), \
|
||||
ln -sf $(pc)$(NCURSES_LIB_SUFFIX).pc \
|
||||
$(1)/usr/lib/pkgconfig/$(pc).pc
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/$(pc).pc
|
||||
)
|
||||
endef
|
||||
|
||||
NCURSES_LINK_TARGET_LIBS = \
|
||||
$(if $(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_STATIC,$(TARGET_DIR));) \
|
||||
$(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_SHARED,$(TARGET_DIR)))
|
||||
NCURSES_LINK_STAGING_LIBS = \
|
||||
$(if $(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_STATIC,$(STAGING_DIR));) \
|
||||
$(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_SHARED,$(STAGING_DIR)))
|
||||
$(if $(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_STATIC);) \
|
||||
$(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_SHARED))
|
||||
|
||||
NCURSES_LINK_STAGING_PC = $(call NCURSES_LINK_PC,$(STAGING_DIR))
|
||||
NCURSES_LINK_STAGING_PC = $(call NCURSES_LINK_PC)
|
||||
|
||||
NCURSES_CONF_OPTS += --enable-ext-colors
|
||||
NCURSES_ABI_VERSION = 6
|
||||
@@ -132,36 +124,21 @@ define NCURSES_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR)
|
||||
endef
|
||||
|
||||
ifneq ($(BR2_STATIC_LIBS),y)
|
||||
define NCURSES_INSTALL_TARGET_LIBS
|
||||
$(foreach lib,$(NCURSES_LIBS-y:%=lib%), \
|
||||
cp -dpf $(NCURSES_DIR)/lib/$(lib)$(NCURSES_LIB_SUFFIX).so* \
|
||||
$(TARGET_DIR)/usr/lib/
|
||||
)
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PROGS),y)
|
||||
define NCURSES_INSTALL_TARGET_PROGS
|
||||
$(foreach prog,$(NCURSES_PROGS), \
|
||||
$(INSTALL) -m 0755 $(NCURSES_DIR)/progs/$(prog) \
|
||||
$(TARGET_DIR)/usr/bin/$(prog)
|
||||
)
|
||||
define NCURSES_TARGET_SYMLINK_RESET
|
||||
ln -sf tset $(TARGET_DIR)/usr/bin/reset
|
||||
endef
|
||||
NCURSES_POST_INSTALL_TARGET_HOOKS += NCURSES_TARGET_SYMLINK_RESET
|
||||
endif
|
||||
|
||||
define NCURSES_INSTALL_TARGET_CMDS
|
||||
mkdir -p $(TARGET_DIR)/usr/lib
|
||||
$(NCURSES_INSTALL_TARGET_LIBS)
|
||||
$(NCURSES_LINK_TARGET_LIBS)
|
||||
$(NCURSES_INSTALL_TARGET_PROGS)
|
||||
ln -snf /usr/share/terminfo $(TARGET_DIR)/usr/lib/terminfo
|
||||
$(foreach terminfo,$(NCURSES_TERMINFO_FILES),\
|
||||
$(INSTALL) -D -m 0644 $(STAGING_DIR)/usr/share/terminfo/$(terminfo) \
|
||||
$(TARGET_DIR)/usr/share/terminfo/$(terminfo)
|
||||
define NCURSES_TARGET_CLEANUP_TERMINFO
|
||||
$(RM) -rf $(TARGET_DIR)/usr/share/terminfo $(TARGET_DIR)/usr/share/tabset
|
||||
$(foreach t,$(NCURSES_TERMINFO_FILES), \
|
||||
$(INSTALL) -D -m 0644 $(STAGING_DIR)/usr/share/terminfo/$(t) \
|
||||
$(TARGET_DIR)/usr/share/terminfo/$(t)
|
||||
)
|
||||
endef # NCURSES_INSTALL_TARGET_CMDS
|
||||
endef
|
||||
NCURSES_POST_INSTALL_TARGET_HOOKS += NCURSES_TARGET_CLEANUP_TERMINFO
|
||||
|
||||
#
|
||||
# On systems with an older version of tic, the installation of ncurses hangs
|
||||
|
||||
@@ -5,7 +5,6 @@ config BR2_PACKAGE_NLOAD
|
||||
bool "nload"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
select BR2_PACKAGE_NCURSES
|
||||
select BR2_PACKAGE_NCURSES_TARGET_FORM
|
||||
help
|
||||
nload is a console application which monitors network traffic
|
||||
and bandwidth usage in real time. It visualizes the in- and
|
||||
|
||||
@@ -99,5 +99,20 @@ HOST_OPENOCD_CONF_OPTS = \
|
||||
|
||||
HOST_OPENOCD_DEPENDENCIES = host-libftdi host-libusb host-libusb-compat
|
||||
|
||||
# Avoid documentation rebuild. On PowerPC64(le), we patch the
|
||||
# configure script. Due to this, the version.texi files gets
|
||||
# regenerated, and then since it has a newer date than openocd.info,
|
||||
# openocd build system rebuilds the documentation. Unfortunately, this
|
||||
# documentation rebuild fails on old machines. We work around this by
|
||||
# faking the date of the generated version.texi file, to make the
|
||||
# build system believe the documentation doesn't need to be
|
||||
# regenerated.
|
||||
define OPENOCD_FIX_VERSION_TEXI
|
||||
touch -r $(@D)/doc/openocd.info $(@D)/doc/version.texi
|
||||
endef
|
||||
OPENOCD_POST_BUILD_HOOKS += OPENOCD_FIX_VERSION_TEXI
|
||||
HOST_OPENOCD_POST_BUILD_HOOKS += OPENOCD_FIX_VERSION_TEXI
|
||||
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
# Make sure the ssh-keygen progam exists
|
||||
[ -f /usr/bin/ssh-keygen ] || exit 0
|
||||
|
||||
# Create any missing keys
|
||||
/usr/bin/ssh-keygen -A
|
||||
|
||||
umask 077
|
||||
|
||||
start() {
|
||||
# Create any missing keys
|
||||
/usr/bin/ssh-keygen -A
|
||||
|
||||
printf "Starting sshd: "
|
||||
/usr/sbin/sshd
|
||||
touch /var/lock/sshd
|
||||
|
||||
@@ -108,12 +108,12 @@ endef
|
||||
ORACLE_MYSQL_POST_INSTALL_TARGET_HOOKS += ORACLE_MYSQL_ADD_FOLDER
|
||||
|
||||
define ORACLE_MYSQL_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -D -m 0755 package/oracle-mysql/S97mysqld \
|
||||
$(INSTALL) -D -m 0755 $(ORACLE_MYSQL_PKGDIR)/S97mysqld \
|
||||
$(TARGET_DIR)/etc/init.d/S97mysqld
|
||||
endef
|
||||
|
||||
define ORACLE_MYSQL_INSTALL_INIT_SYSTEMD
|
||||
$(INSTALL) -D -m 644 package/mysql/mysqld.service \
|
||||
$(INSTALL) -D -m 644 $(ORACLE_MYSQL_PKGDIR)/mysqld.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/mysqld.service
|
||||
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
|
||||
ln -sf ../../../../usr/lib/systemd/system/mysqld.service \
|
||||
|
||||
@@ -109,7 +109,7 @@ define $(2)_CONFIGURE_CMDS
|
||||
cd $$($$(PKG)_BUILDDIR) && \
|
||||
rm -f CMakeCache.txt && \
|
||||
PATH=$$(BR_PATH) \
|
||||
$$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \
|
||||
$$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \
|
||||
-DCMAKE_INSTALL_SO_NO_EXE=0 \
|
||||
-DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \
|
||||
-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \
|
||||
|
||||
@@ -5,7 +5,7 @@ config BR2_PACKAGE_POCO
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS # dlopen()
|
||||
depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel \
|
||||
|| BR2_xtensa)
|
||||
|| BR2_or1k || BR2_xtensa)
|
||||
select BR2_PACKAGE_ZLIB
|
||||
select BR2_PACKAGE_PCRE
|
||||
help
|
||||
@@ -65,4 +65,4 @@ comment "poco needs a toolchain w/ wchar, threads, C++, dynamic library"
|
||||
depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
|
||||
|| !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel \
|
||||
|| BR2_xtensa)
|
||||
|| BR2_or1k || BR2_xtensa)
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
comment "python-libconfig needs a toolchain w/ C++, threads"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
comment "python-libconfig needs a glibc or uClibc toolchain w/ C++, threads"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
BR2_TOOLCHAIN_USES_MUSL
|
||||
|
||||
config BR2_PACKAGE_PYTHON_LIBCONFIG
|
||||
bool "python-libconfig"
|
||||
@@ -8,6 +9,8 @@ config BR2_PACKAGE_PYTHON_LIBCONFIG
|
||||
select BR2_PACKAGE_LIBCONFIG
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
# error: invalid use of incomplete type 'struct _IO_FILE'
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL
|
||||
help
|
||||
Python bindings to the C++ library libconfig
|
||||
|
||||
|
||||
@@ -105,6 +105,9 @@ endif
|
||||
|
||||
# Default is UCS2 w/o a conf opt
|
||||
ifeq ($(BR2_PACKAGE_PYTHON_UCS4),y)
|
||||
# host-python must have the same UCS2/4 configuration as the target
|
||||
# python
|
||||
HOST_PYTHON_CONF_OPTS += --enable-unicode=ucs4
|
||||
PYTHON_CONF_OPTS += --enable-unicode=ucs4
|
||||
endif
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK
|
||||
depends on !BR2_STATIC_LIBS # qt5webkit
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5webkit
|
||||
depends on !BR2_BINFMT_FLAT # qt5webkit
|
||||
depends on !BR2_MIPS_SOFT_FLOAT # qt5webkit
|
||||
help
|
||||
Simple kiosk-mode browser powered by Qt5Webkit
|
||||
|
||||
|
||||
@@ -39,6 +39,8 @@ config BR2_PACKAGE_QT5_VERSION_LATEST
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
|
||||
depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11
|
||||
depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+
|
||||
# no built-in double-conversion support
|
||||
depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa
|
||||
help
|
||||
This option builds Qt 5.8, which is licensed under
|
||||
(L)GPLv3+.
|
||||
@@ -46,6 +48,7 @@ config BR2_PACKAGE_QT5_VERSION_LATEST
|
||||
comment "Latest Qt version needs host/toolchain w/ gcc >= 4.8"
|
||||
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_HOST_GCC_AT_LEAST_4_8
|
||||
depends on !BR2_ARM_CPU_ARMV4
|
||||
depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa
|
||||
|
||||
config BR2_PACKAGE_QT5_VERSION_5_6
|
||||
bool "LTS (5.6)"
|
||||
|
||||
+97
@@ -0,0 +1,97 @@
|
||||
From 35ee8b53549fab6ebffe289417e1d94298447af7 Mon Sep 17 00:00:00 2001
|
||||
From: Shawn Rutledge <shawn.rutledge@digia.com>
|
||||
Date: Fri, 10 Feb 2017 13:56:58 +0100
|
||||
Subject: [PATCH] fix VNC platform plugin build on big-endian machines
|
||||
|
||||
Task-number: QTBUG-58734
|
||||
Change-Id: I3e44ee4be5003acaba2f1b8ed2658a3ff1bd700e
|
||||
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
||||
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
|
||||
|
||||
Upstream: http://code.qt.io/cgit/qt/qtbase.git/patch/?id=6f64bfa654fb7e20bb75ec3b0544b81482babb44
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/plugins/platforms/vnc/qvncclient.cpp | 6 +++---
|
||||
src/plugins/platforms/vnc/qvncscreen.cpp | 7 ++++++-
|
||||
src/plugins/platforms/vnc/qvncscreen.h | 2 +-
|
||||
3 files changed, 10 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/platforms/vnc/qvncclient.cpp b/src/plugins/platforms/vnc/qvncclient.cpp
|
||||
index dae3e83f..58dcfc9b 100644
|
||||
--- a/src/plugins/platforms/vnc/qvncclient.cpp
|
||||
+++ b/src/plugins/platforms/vnc/qvncclient.cpp
|
||||
@@ -142,7 +142,7 @@ void QVncClient::convertPixels(char *dst, const char *src, int count) const
|
||||
case 16: {
|
||||
quint16 p = *reinterpret_cast<const quint16*>(src);
|
||||
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
|
||||
- if (swapBytes)
|
||||
+ if (m_swapBytes)
|
||||
p = ((p & 0xff) << 8) | ((p & 0xff00) >> 8);
|
||||
#endif
|
||||
r = (p >> 11) & 0x1f;
|
||||
@@ -484,7 +484,7 @@ void QVncClient::setPixelFormat()
|
||||
m_sameEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian) == !!m_pixelFormat.bigEndian;
|
||||
m_needConversion = pixelConversionNeeded();
|
||||
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
|
||||
- m_swapBytes = qvnc_screen->swapBytes();
|
||||
+ m_swapBytes = server()->screen()->swapBytes();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -639,7 +639,7 @@ bool QVncClient::pixelConversionNeeded() const
|
||||
return true;
|
||||
|
||||
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
|
||||
- if (qvnc_screen->swapBytes())
|
||||
+ if (server()->screen()->swapBytes())
|
||||
return true;
|
||||
#endif
|
||||
|
||||
diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp
|
||||
index 34def457..64f1bc0b 100644
|
||||
--- a/src/plugins/platforms/vnc/qvncscreen.cpp
|
||||
+++ b/src/plugins/platforms/vnc/qvncscreen.cpp
|
||||
@@ -43,6 +43,7 @@
|
||||
#include <QtFbSupport/private/qfbcursor_p.h>
|
||||
|
||||
#include <QtGui/QPainter>
|
||||
+#include <QtGui/QScreen>
|
||||
#include <QtCore/QRegularExpression>
|
||||
|
||||
|
||||
@@ -172,14 +173,18 @@ QPixmap QVncScreen::grabWindow(WId wid, int x, int y, int width, int height) con
|
||||
}
|
||||
|
||||
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
|
||||
-bool QVNCScreen::swapBytes() const
|
||||
+bool QVncScreen::swapBytes() const
|
||||
{
|
||||
+ return false;
|
||||
+
|
||||
+ /* TODO
|
||||
if (depth() != 16)
|
||||
return false;
|
||||
|
||||
if (screen())
|
||||
return screen()->frameBufferLittleEndian();
|
||||
return frameBufferLittleEndian();
|
||||
+ */
|
||||
}
|
||||
#endif
|
||||
|
||||
diff --git a/src/plugins/platforms/vnc/qvncscreen.h b/src/plugins/platforms/vnc/qvncscreen.h
|
||||
index 785abd6d..0b42c3c7 100644
|
||||
--- a/src/plugins/platforms/vnc/qvncscreen.h
|
||||
+++ b/src/plugins/platforms/vnc/qvncscreen.h
|
||||
@@ -73,7 +73,7 @@ public:
|
||||
void clearDirty() { dirtyRegion = QRegion(); }
|
||||
|
||||
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
|
||||
- bool swapBytes() const
|
||||
+ bool swapBytes() const;
|
||||
#endif
|
||||
|
||||
QStringList mArgs;
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -30,20 +30,25 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy)
|
||||
define QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick
|
||||
endef
|
||||
else
|
||||
define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
define QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick
|
||||
endef
|
||||
endif
|
||||
|
||||
define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
|
||||
$(QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS)
|
||||
$(QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
@@ -9,6 +9,8 @@ config BR2_PACKAGE_QT5WEBKIT
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
depends on !BR2_BINFMT_FLAT # icu
|
||||
# assumes a FPU is available on MIPS
|
||||
depends on !BR2_MIPS_SOFT_FLOAT
|
||||
help
|
||||
Qt is a cross-platform application and UI framework for
|
||||
developers using C++.
|
||||
@@ -28,3 +30,4 @@ comment "qt5webkit needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
depends on !BR2_BINFMT_FLAT
|
||||
depends on !BR2_MIPS_SOFT_FLOAT
|
||||
|
||||
@@ -59,7 +59,7 @@ else
|
||||
SAMBA4_CONF_OPTS += --disable-gnutls
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NCURSES_TARGET_FORM)$(BR2_PACKAGE_NCURSES_TARGET_MENU)$(BR2_PACKAGE_NCURSES_TARGET_PANEL),yyy)
|
||||
ifeq ($(BR2_PACKAGE_NCURSES),y)
|
||||
SAMBA4_CONF_ENV += NCURSES_CONFIG="$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)"
|
||||
SAMBA4_DEPENDENCIES += ncurses
|
||||
else
|
||||
|
||||
@@ -12,6 +12,8 @@ subtree only, this patch adds a check : a .git directory has to exist at
|
||||
the root of the project to enable git-extracted version string.
|
||||
|
||||
Signed-off-by: David Bachelart <david.bachelart@bbright.com>
|
||||
[yann.morin.1998@free.fr: fix troll character U+c2a0]
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
---
|
||||
genver.sh | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
@@ -34,7 +36,7 @@ index 79fd0a0..051e57b 100755
|
||||
fi
|
||||
|
||||
-if head=`git rev-parse --verify HEAD 2>/dev/null`; then
|
||||
+if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
|
||||
+if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
|
||||
# generate the version info based on the tag
|
||||
release=`(git describe --tags || git --describe || git describe --all --long) \
|
||||
2>/dev/null | tr -d '\n'`
|
||||
|
||||
@@ -12,7 +12,7 @@ SSLH_LICENSE_FILES = COPYING
|
||||
SSLH_DEPENDENCIES = libconfig
|
||||
|
||||
define SSLH_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
|
||||
$(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D)
|
||||
endef
|
||||
|
||||
define SSLH_INSTALL_TARGET_CMDS
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
From b79d478c21ed6af20554ead97da72de845dc3206 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Korsgaard <peter@korsgaard.com>
|
||||
Date: Sat, 25 Feb 2017 21:57:19 +0100
|
||||
Subject: [PATCH] Fix build with gcc 6
|
||||
|
||||
Gcc 6.x defaults to C++14, and the iostream operator bool behaviour changed
|
||||
in C++11. In previous versions, a somewhat odd operator void* was used to
|
||||
return the status of the stream as a pointer. Since C++11 a more sensible
|
||||
operator bool is used to return the stream staus.
|
||||
|
||||
For details, see:
|
||||
|
||||
http://en.cppreference.com/w/cpp/io/basic_ios/operator_bool
|
||||
|
||||
The code in CConfigReadContext assumes the pre-C++11 behaviour and provides
|
||||
its own operator void overload to return the status of the embedded
|
||||
iostream. With C++11, iostream no longer provides this overload, breaking
|
||||
the build:
|
||||
|
||||
CConfig.cpp: In member function 'CConfigReadContext::operator void*() const':
|
||||
CConfig.cpp:1851:9: error: cannot convert 'std::istream {aka std::basic_istream<char>}' to 'void*' in return
|
||||
return m_stream;
|
||||
|
||||
To fix it, backport part of upstream commit 3d963bfbe7897d0a33ad (possible
|
||||
fix for mavericks) which changes the code to simply provide a getStream()
|
||||
method which returns a reference to the embedded stream and the calling code
|
||||
is changed to use operator bool on the returned stream, making the code
|
||||
compatible with both old and new compilers.
|
||||
|
||||
This upstream commit is part of the 1.6.0 release, so can be dropped when
|
||||
the version is bumped.
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
lib/server/CConfig.cpp | 7 +------
|
||||
lib/server/CConfig.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/lib/server/CConfig.cpp b/lib/server/CConfig.cpp
|
||||
index a502fe78..d67dde20 100644
|
||||
--- a/lib/server/CConfig.cpp
|
||||
+++ b/lib/server/CConfig.cpp
|
||||
@@ -607,7 +607,7 @@ void
|
||||
CConfig::read(CConfigReadContext& context)
|
||||
{
|
||||
CConfig tmp;
|
||||
- while (context) {
|
||||
+ while (context.getStream()) {
|
||||
tmp.readSection(context);
|
||||
}
|
||||
*this = tmp;
|
||||
@@ -1846,11 +1846,6 @@ CConfigReadContext::getLineNumber() const
|
||||
return m_line;
|
||||
}
|
||||
|
||||
-CConfigReadContext::operator void*() const
|
||||
-{
|
||||
- return m_stream;
|
||||
-}
|
||||
-
|
||||
bool
|
||||
CConfigReadContext::operator!() const
|
||||
{
|
||||
diff --git a/lib/server/CConfig.h b/lib/server/CConfig.h
|
||||
index c0d2faa8..0ee453cb 100644
|
||||
--- a/lib/server/CConfig.h
|
||||
+++ b/lib/server/CConfig.h
|
||||
@@ -480,7 +480,6 @@ public:
|
||||
bool readLine(CString&);
|
||||
UInt32 getLineNumber() const;
|
||||
|
||||
- operator void*() const;
|
||||
bool operator!() const;
|
||||
|
||||
OptionValue parseBoolean(const CString&) const;
|
||||
@@ -502,6 +501,7 @@ public:
|
||||
IPlatformScreen::CButtonInfo*
|
||||
parseMouse(const CString& mouse) const;
|
||||
KeyModifierMask parseModifier(const CString& modifiers) const;
|
||||
+ std::istream& getStream() const { return m_stream; };
|
||||
|
||||
private:
|
||||
// not implemented
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -5,7 +5,7 @@ config BR2_PACKAGE_TROUSERS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
# doesn't build properly in static only configurations
|
||||
depends on !BR2_STATIC_LIBS
|
||||
# broken toolchain
|
||||
# ARC toolchain issue
|
||||
depends on !BR2_arc
|
||||
help
|
||||
The open-source TCG Software Stack (TSS).
|
||||
|
||||
@@ -39,6 +39,7 @@ define UCLIBC_NG_TEST_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(UCLIBC_NG_TEST_MAKE_ENV) $(MAKE) -C $(@D) \
|
||||
CC="$(TARGET_CC)" \
|
||||
UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
|
||||
UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
test_compile
|
||||
$(TARGET_MAKE_ENV) $(UCLIBC_NG_TEST_MAKE_ENV) $(MAKE1) -C $(@D) \
|
||||
CC="$(TARGET_CC)" \
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
From 064a0445f33a67e5498d492dabe0dfc687859756 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Santos <casantos@datacom.ind.br>
|
||||
Date: Wed, 8 Feb 2017 09:29:30 -0200
|
||||
Subject: [PATCH] build-sys: improve detection of the "isnan" function in
|
||||
uClibc
|
||||
|
||||
Since commit beceb14b450ded6560ed743634a5e80604a8edf3, MATH_LIBS is set
|
||||
to "-lm" when the isnan function is detected. In uClibc, however, isnan
|
||||
is a macro that calls __isnan, __isnanf, or __isnanl, depending on the
|
||||
size of the argument (double, float or long double).
|
||||
|
||||
Fixes:
|
||||
http://autobuild.buildroot.net/results/2c2/2c29a78ed81ca844a87dcd076ab3e14ea080296d/
|
||||
http://autobuild.buildroot.net/results/404/404b10f359b2ae8a7216729fa1bab37fed2d3d4c/
|
||||
|
||||
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
|
||||
---
|
||||
configure.ac | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index cc0563b..d03469c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -428,7 +428,8 @@ AC_CHECK_FUNCS([reboot], [have_reboot=yes],[have_reboot=no])
|
||||
AM_CONDITIONAL([HAVE_OPENAT], [test "x$have_openat" = xyes])
|
||||
|
||||
AC_CHECK_FUNCS([isnan], [],
|
||||
- [AC_CHECK_LIB([m], [isnan], [MATH_LIBS="-lm"])]
|
||||
+ [AC_CHECK_LIB([m], [isnan], [MATH_LIBS="-lm"])]
|
||||
+ [AC_CHECK_LIB([m], [__isnan], [MATH_LIBS="-lm"])]
|
||||
)
|
||||
AC_SUBST([MATH_LIBS])
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,99 +0,0 @@
|
||||
From 6f2eb03433bcb2d3c351efed848a1f8554a7ff78 Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Mon, 20 Feb 2017 14:17:37 +0100
|
||||
Subject: [PATCH] build-sys: fix --disable-all-programs --enable-schedutils
|
||||
|
||||
* add UL_ENABLE_ALIAS(NAME, MASTERNAME) to initialize $enable_<name>
|
||||
according to MASTERNAME. Note that we have to use $build_<mastername>,
|
||||
the $enable_<mastername> is just AC_ARG_ENABLE() stuff only. The
|
||||
$build_ is evaluated and modified by our UL_...() functions.
|
||||
|
||||
* add enable-schedutils.conf to have build-system regression test for
|
||||
this use-case
|
||||
|
||||
Addresses: https://github.com/karelzak/util-linux/issues/415
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
---
|
||||
configure.ac | 14 ++++++++------
|
||||
m4/ul.m4 | 15 +++++++++++++++
|
||||
tools/config-gen.d/enable-schedutils.conf | 3 +++
|
||||
3 files changed, 26 insertions(+), 6 deletions(-)
|
||||
create mode 100644 tools/config-gen.d/enable-schedutils.conf
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ad241fe..be282f0 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1909,8 +1909,9 @@ AC_ARG_ENABLE([schedutils],
|
||||
)
|
||||
UL_BUILD_INIT([schedutils])
|
||||
|
||||
-UL_BUILD_INIT([ionice], [check])
|
||||
-UL_REQUIRES_BUILD([ionice], [schedutils])
|
||||
+
|
||||
+UL_ENABLE_ALIAS([ionice], [schedutils])
|
||||
+UL_BUILD_INIT([ionice])
|
||||
UL_REQUIRES_SYSCALL_CHECK([ionice],
|
||||
[UL_CHECK_SYSCALL([ioprio_set],
|
||||
[alpha], [442],
|
||||
@@ -1937,8 +1938,9 @@ UL_REQUIRES_SYSCALL_CHECK([ionice],
|
||||
|
||||
AM_CONDITIONAL([BUILD_IONICE], [test "x$build_ionice" = xyes])
|
||||
|
||||
-UL_BUILD_INIT([taskset], [check])
|
||||
-UL_REQUIRES_BUILD([taskset], [schedutils])
|
||||
+
|
||||
+UL_ENABLE_ALIAS([taskset], [schedutils])
|
||||
+UL_BUILD_INIT([taskset])
|
||||
UL_REQUIRES_HAVE([taskset], [cpu_set_t], [cpu_set_t type])
|
||||
UL_REQUIRES_SYSCALL_CHECK([taskset],
|
||||
[UL_CHECK_SYSCALL([sched_getaffinity])],
|
||||
@@ -1950,8 +1952,8 @@ have_schedsetter=no
|
||||
AS_IF([test "x$ac_cv_func_sched_setscheduler" = xyes], [have_schedsetter=yes],
|
||||
[test "x$ac_cv_func_sched_setattr" = xyes], [have_schedsetter=yes])
|
||||
|
||||
-UL_BUILD_INIT([chrt], [check])
|
||||
-UL_REQUIRES_BUILD([chrt], [schedutils])
|
||||
+UL_ENABLE_ALIAS([chrt], [schedutils])
|
||||
+UL_BUILD_INIT([chrt])
|
||||
UL_REQUIRES_HAVE([chrt], [schedsetter], [sched_set functions])
|
||||
AM_CONDITIONAL([BUILD_CHRT], [test "x$build_chrt" = xyes])
|
||||
|
||||
diff --git a/m4/ul.m4 b/m4/ul.m4
|
||||
index f8a0dd7..ed7227c 100644
|
||||
--- a/m4/ul.m4
|
||||
+++ b/m4/ul.m4
|
||||
@@ -429,6 +429,21 @@ AC_DEFUN([UL_DEFAULT_ENABLE], [
|
||||
fi
|
||||
])
|
||||
|
||||
+
|
||||
+dnl UL_ENABLE_ALIAS(NAME, MASTERNAME)
|
||||
+dnl
|
||||
+dnl Initializes $enable_<name> variable according to $build_<mastername>. This
|
||||
+dnl is usefull for example if you want to use one --enable-mastername option
|
||||
+dnl for group of programs.
|
||||
+dnl
|
||||
+AC_DEFUN([UL_ENABLE_ALIAS], [
|
||||
+ m4_define([suffix], $1)
|
||||
+ m4_define([mastersuffix], $2)
|
||||
+
|
||||
+ enable_[]suffix=$build_[]mastersuffix
|
||||
+])
|
||||
+
|
||||
+
|
||||
dnl UL_NCURSES_CHECK(NAME)
|
||||
dnl
|
||||
dnl Initializes $have_<name>, NCURSES_LIBS and NCURSES_CFLAGS variables according to
|
||||
diff --git a/tools/config-gen.d/enable-schedutils.conf b/tools/config-gen.d/enable-schedutils.conf
|
||||
new file mode 100644
|
||||
index 0000000..08deee4
|
||||
--- /dev/null
|
||||
+++ b/tools/config-gen.d/enable-schedutils.conf
|
||||
@@ -0,0 +1,3 @@
|
||||
+include:disable-all.conf
|
||||
+
|
||||
+--enable-schedutils
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From https://www.kernel.org/pub/linux/utils/util-linux/v2.29/sha256sums.asc
|
||||
sha256 0ce40600b934ec2fecfa6bfc4efe6982d051ba96c2832b05201347aec582f54f util-linux-2.29.1.tar.xz
|
||||
sha256 accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3 util-linux-2.29.2.tar.xz
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
################################################################################
|
||||
|
||||
UTIL_LINUX_VERSION_MAJOR = 2.29
|
||||
UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1
|
||||
UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2
|
||||
UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
|
||||
UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
|
||||
|
||||
# Required because of the patches for configure.ac.
|
||||
# 0001-build-sys-use-lm-for-scriptreplay-if-necessary.patch
|
||||
UTIL_LINUX_AUTORECONF = YES
|
||||
|
||||
# README.licensing claims that some files are GPLv2-only, but this is not true.
|
||||
|
||||
@@ -11,6 +11,8 @@ config BR2_PACKAGE_VLC
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
|
||||
# ARC toolchain issue
|
||||
depends on !BR2_arc
|
||||
select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS
|
||||
select BR2_PACKAGE_VLC_OPENCV_BACKEND if BR2_PACKAGE_OPENCV
|
||||
select BR2_PACKAGE_VLC_OPENCV3_BACKEND if BR2_PACKAGE_OPENCV3
|
||||
@@ -34,5 +36,6 @@ config BR2_PACKAGE_VLC_OPENCV3_BACKEND
|
||||
|
||||
comment "vlc needs a toolchain w/ C++, dynamic library, wchar, threads, headers >= 3.7"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_arc
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_USE_WCHAR \
|
||||
|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
|
||||
|
||||
@@ -15,6 +15,13 @@ VLC_AUTORECONF = YES
|
||||
# Install vlc libraries in staging.
|
||||
VLC_INSTALL_STAGING = YES
|
||||
|
||||
# gcc bug internal compiler error: in merge_overlapping_regs, at
|
||||
# regrename.c:304. This bug is fixed since gcc 6.
|
||||
ifeq ($(BR2_microblaze):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:)
|
||||
VLC_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O0"
|
||||
VLC_CONF_OPTS += --disable-optimizations
|
||||
endif
|
||||
|
||||
# VLC defines two autoconf functions which are also defined by our own pkg.m4
|
||||
# from pkgconf. Unfortunately, they are defined in a different way: VLC adds
|
||||
# --enable- options, but pkg.m4 adds --with- options. To make sure we use
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
From 1e9bb2fba94bc508659f1667bf95501324849bb9 Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Sun, 26 Feb 2017 12:04:54 +0100
|
||||
Subject: [PATCH] build: add EXTRALIBS to link with
|
||||
|
||||
When doing a uClibc static build, the build fails to link:
|
||||
http://autobuild.buildroot.org/results/503/50314716a9f72e8bb238e52e9dc342c68f7e0b8b/build-end.log
|
||||
|
||||
The cause is due to:
|
||||
- xfsprogs links dome programs with util-linux' libblkid
|
||||
- util-linux' libblkid is linked to util-linux' libuuid
|
||||
- util-linux' libuuid uses i18n functions when locales are enabled
|
||||
- uClibc does not provide i18n functions
|
||||
- i18n functions are provided by libintl from libintl from gettext
|
||||
|
||||
util-linux installs pkg-config files for thos two libs. However,
|
||||
xfsprogs does not use pkg-config to find libblkid or libuuid, thus it
|
||||
misses the Libs.private field from libuid.
|
||||
|
||||
In this case, it is necessary to pass LIBS=-lintl at configure time, so
|
||||
that configure correctly finds libblkid.
|
||||
|
||||
Still, this is not enough, because the build will not use LIBS during
|
||||
the link phase.
|
||||
|
||||
We fix that last bit by adding EXTRALIBS to the libraries to link with,
|
||||
so that it is possible to pass EXTRALIBS=-lintl at build time:
|
||||
|
||||
$ ./configure [...] LIBS=-lintl
|
||||
$ make EXTRALIBS=-lintl
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Cc: Waldemar Brodkorb <wbx@openadk.org>
|
||||
---
|
||||
include/buildmacros | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/buildmacros b/include/buildmacros
|
||||
index a7c5d8a..dd62d80 100644
|
||||
--- a/include/buildmacros
|
||||
+++ b/include/buildmacros
|
||||
@@ -11,7 +11,7 @@ BUILDRULES = $(TOPDIR)/include/buildrules
|
||||
|
||||
LDFLAGS += $(LOADERFLAGS) $(LLDFLAGS)
|
||||
LTLDFLAGS += $(LOADERFLAGS)
|
||||
-LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB)
|
||||
+LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB) $(EXTRALIBS)
|
||||
|
||||
MAKEOPTS = --no-print-directory Q=$(Q)
|
||||
SRCFILES = Makefile $(HFILES) $(CFILES) $(LSRCFILES) $(LFILES) $(YFILES)
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -18,6 +18,23 @@ XFSPROGS_CONF_OPTS = \
|
||||
INSTALL_GROUP=root \
|
||||
--enable-static
|
||||
|
||||
# xfsprogs links some of its programs to libs from util-linux, which use
|
||||
# i18n functions. For shared-only builds, that's automatically pulled in.
|
||||
# Static builds need some help, though...
|
||||
#
|
||||
# No need to depend on gettext in this case: xfsprogs does not use it for
|
||||
# itself; util-linux does need it and has it in its own dependencies.
|
||||
#
|
||||
# xfsprogs' buildsystem uses hand-made Makefiles, not automake, and they
|
||||
# do not use the LIBS variable set by configure. So we use EXTRALIBS that
|
||||
# is added by our patch.
|
||||
#
|
||||
# It is not needed to propagate the EXTRALIBS to the install step.
|
||||
ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS)$(BR2_NEEDS_GETTEXT_IF_LOCALE),yy)
|
||||
XFSPROGS_CONF_OPTS += LIBS=-lintl
|
||||
XFSPROGS_MAKE_OPTS = EXTRALIBS=-lintl
|
||||
endif
|
||||
|
||||
XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -4,6 +4,8 @@ config BR2_PACKAGE_XTERM
|
||||
select BR2_PACKAGE_XLIB_LIBXAW
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
depends on BR2_USE_MMU # fork()
|
||||
# ARC toolchain issue
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
|
||||
help
|
||||
xterm terminal emulator
|
||||
|
||||
|
||||
@@ -6,6 +6,9 @@ version_min="${2}"
|
||||
major_min="${version_min%.*}"
|
||||
minor_min="${version_min#*.}"
|
||||
|
||||
# cmake-3.7 incorrectly handles rpath, linking to host libraries
|
||||
blacklist_version="3.7"
|
||||
|
||||
cmake=`which ${candidate}`
|
||||
if [ ! -x "${cmake}" ]; then
|
||||
# echo nothing: no suitable cmake found
|
||||
@@ -27,6 +30,11 @@ version="$(${cmake} --version \
|
||||
major="${version%.*}"
|
||||
minor="${version#*.}"
|
||||
|
||||
if [ "${version}" = "${blacklist_version}" ]; then
|
||||
# echo nothing: no suitable cmake found
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ${major} -gt ${major_min} ]; then
|
||||
echo "${cmake}"
|
||||
else
|
||||
|
||||
Vendored
+11
-10
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
# Buildroot version to use
|
||||
RELEASE='2016.11.2'
|
||||
RELEASE='2017.02'
|
||||
|
||||
### Change here for more memory/cores ###
|
||||
VM_MEMORY=2048
|
||||
@@ -41,19 +41,20 @@ Vagrant.configure('2') do |config|
|
||||
end
|
||||
end
|
||||
|
||||
config.vm.provision 'shell', inline:
|
||||
"sudo dpkg --add-architecture i386
|
||||
sudo apt-get -q update
|
||||
sudo apt-get purge -q -y snapd lxcfs lxd ubuntu-core-launcher snap-confine
|
||||
sudo apt-get -q -y upgrade
|
||||
sudo apt-get -q -y install build-essential libncurses5-dev \
|
||||
config.vm.provision 'shell', privileged: true, inline:
|
||||
"sed -i 's|deb http://us.archive.ubuntu.com/ubuntu/|deb mirror://mirrors.ubuntu.com/mirrors.txt|g' /etc/apt/sources.list
|
||||
dpkg --add-architecture i386
|
||||
apt-get -q update
|
||||
apt-get purge -q -y snapd lxcfs lxd ubuntu-core-launcher snap-confine
|
||||
apt-get -q -y install build-essential libncurses5-dev \
|
||||
git bzr cvs mercurial subversion libc6:i386 unzip bc
|
||||
sudo apt-get -q -y autoremove
|
||||
sudo apt-get -q -y clean
|
||||
sudo update-locale LC_ALL=C"
|
||||
apt-get -q -y autoremove
|
||||
apt-get -q -y clean
|
||||
update-locale LC_ALL=C"
|
||||
|
||||
config.vm.provision 'shell', privileged: false, inline:
|
||||
"echo 'Downloading and extracting buildroot #{RELEASE}'
|
||||
wget -q -c http://buildroot.org/downloads/buildroot-#{RELEASE}.tar.gz
|
||||
tar axf buildroot-#{RELEASE}.tar.gz"
|
||||
|
||||
end
|
||||
|
||||
@@ -124,7 +124,7 @@ endif # ! no threads
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y)
|
||||
TOOLCHAIN_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.* libmvec.so.*
|
||||
TOOLCHAIN_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.* libmvec.so.* libanl.so.*
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y)
|
||||
|
||||
Reference in New Issue
Block a user