mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-10 10:10:28 +03:00
Compare commits
25 Commits
2013.11_rc
...
2013.11-rc
| Author | SHA1 | Date | |
|---|---|---|---|
|
b87c05dc95 | ||
|
f078a8bc95 | ||
|
6b8aa11205 | ||
|
|
dcefce4cf8 | ||
|
25507b2a5a | ||
|
db4f6e237f | ||
|
|
f0c5c85215 | ||
|
|
64dbd7d036 | ||
|
157101726c | ||
|
|
21161a0889 | ||
|
|
1b5bd7a296 | ||
|
|
93adbf9c00 | ||
|
|
0294aced5e | ||
|
|
7bf866e7b2 | ||
|
|
893108810b | ||
|
|
2b9bdcafa3 | ||
|
|
58b82e5c40 | ||
|
|
da558954b6 | ||
|
|
c09f5aaa0f | ||
|
4de330fa2d | ||
|
|
d3db5d863d | ||
|
|
68a1bd1e4f | ||
|
|
b6ee44b6d4 | ||
|
be930801a2 | ||
|
|
980220c645 |
22
CHANGES
22
CHANGES
@@ -1,3 +1,25 @@
|
||||
2013.11-rc2, Released November 18th, 2013
|
||||
|
||||
Fixes all over the tree.
|
||||
|
||||
Defconfigs: qemu_arm_versatile, qemu_arm_nuri, sheevaplug:
|
||||
Adjust kernel versions.
|
||||
|
||||
Toolchain: avr32: fix for modern kernel headers
|
||||
|
||||
Bootloader: Barebox updated to 2013.10.1
|
||||
|
||||
Updated/fixed packages: dhcp, e2fsprogs, gst1-plugins-bad,
|
||||
libcurl, libvncserver, nano, pc, qt5base, squashfs, ttcp,
|
||||
wayland, wvstreams
|
||||
|
||||
Issues resolved (http://bugs.uclibc.org):
|
||||
|
||||
#3601: DHCPD S80dhcp-server startup script issues
|
||||
#6320: Fix kernel compile issue if BR2_LINUX_KERNEL_CUSTOM_GIT_VERS..
|
||||
#6416: Xenomai package, patch alternative
|
||||
#6590: directfb-examples build failed whit linaro toolchain
|
||||
|
||||
2013.11-rc1, Released November 12th, 2013
|
||||
|
||||
Architectures: Nios-II support, MIPS arch handling fixes
|
||||
|
||||
2
Makefile
2
Makefile
@@ -24,7 +24,7 @@
|
||||
#--------------------------------------------------------------
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION:=2013.11-rc1
|
||||
export BR2_VERSION:=2013.11-rc2
|
||||
|
||||
# Check for minimal make version (note: this check will break at make 10.x)
|
||||
MIN_MAKE_VERSION=3.81
|
||||
|
||||
@@ -12,7 +12,7 @@ choice
|
||||
Select the specific Barebox version you want to use
|
||||
|
||||
config BR2_TARGET_BAREBOX_LATEST_VERSION
|
||||
bool "2013.10.0"
|
||||
bool "2013.10.1"
|
||||
|
||||
config BR2_TARGET_BAREBOX_CUSTOM_VERSION
|
||||
bool "Custom version"
|
||||
@@ -40,7 +40,7 @@ endif
|
||||
|
||||
config BR2_TARGET_BAREBOX_VERSION
|
||||
string
|
||||
default "2013.10.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
|
||||
default "2013.10.1" if BR2_TARGET_BAREBOX_LATEST_VERSION
|
||||
default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
|
||||
default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
|
||||
default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
|
||||
|
||||
@@ -15,11 +15,11 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
|
||||
|
||||
# Lock to 3.10 headers to avoid breaking with newer kernels
|
||||
BR2_KERNEL_HEADERS_VERSION=y
|
||||
BR2_DEFAULT_KERNEL_VERSION="3.10.18"
|
||||
BR2_DEFAULT_KERNEL_VERSION="3.10.19"
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.18"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.19"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
|
||||
BR2_LINUX_KERNEL_ZIMAGE=y
|
||||
|
||||
@@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
# BR2_TARGET_ROOTFS_TAR is not set
|
||||
|
||||
# Lock to 3.12 headers to avoid breaking with newer kernels
|
||||
# Lock to 3.11 headers to avoid breaking with newer kernels
|
||||
BR2_KERNEL_HEADERS_VERSION=y
|
||||
BR2_DEFAULT_KERNEL_VERSION="3.12"
|
||||
BR2_DEFAULT_KERNEL_VERSION="3.11.8"
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.12"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.8"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.12.config"
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.11.config"
|
||||
BR2_LINUX_KERNEL_ZIMAGE=y
|
||||
|
||||
@@ -13,17 +13,19 @@ BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y
|
||||
|
||||
# Lock down headers to avoid breaking with new defaults
|
||||
BR2_KERNEL_HEADERS_VERSION=y
|
||||
BR2_DEFAULT_KERNEL_VERSION="3.5.4"
|
||||
BR2_DEFAULT_KERNEL_VERSION="3.11.8"
|
||||
|
||||
# bootloader
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BOARDNAME="sheevaplug"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.10"
|
||||
BR2_TARGET_UBOOT_FORMAT_KWB=y
|
||||
# BR2_TARGET_UBOOT_NETWORK is not set
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.5.4"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.8"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="kirkwood"
|
||||
BR2_LINUX_KERNEL_UIMAGE=y
|
||||
|
||||
@@ -15,12 +15,12 @@ or
|
||||
|
||||
<p>
|
||||
|
||||
The latest release candidate is <b>2013.11-rc1</b>, which can be
|
||||
The latest release candidate is <b>2013.11-rc2</b>, which can be
|
||||
downloaded here:<p>
|
||||
|
||||
<a href="/downloads/buildroot-2013.11-rc1tar.gz">buildroot-2013.11-rc1.tar.gz</a>
|
||||
<a href="/downloads/buildroot-2013.11-rc2.tar.gz">buildroot-2013.11-rc2.tar.gz</a>
|
||||
or
|
||||
<a href="/downloads/buildroot-2013.11-rc3.tar.bz2">buildroot-2013.11-rc1.tar.bz2</a>.
|
||||
<a href="/downloads/buildroot-2013.11-rc2.tar.bz2">buildroot-2013.11-rc2.tar.bz2</a>.
|
||||
<p>
|
||||
|
||||
This and earlier releases can always be downloaded from
|
||||
|
||||
@@ -56,6 +56,7 @@
|
||||
<br><a href="/lists.html">Mailing Lists</a>
|
||||
<br><a href="http://autobuild.buildroot.org">Autobuilder</a>
|
||||
<br><a href="http://patchwork.buildroot.org">Patchwork</a>
|
||||
<br><a href="/sponsors.html">Sponsors</a>
|
||||
|
||||
</td>
|
||||
|
||||
|
||||
@@ -5,12 +5,51 @@
|
||||
<p>
|
||||
|
||||
<ul>
|
||||
<li><b>18 November 2013 -- 2013.11-rc2 released</b>
|
||||
|
||||
<p>Another week, another release candidate with more cleanups and
|
||||
build fixes. See the <a
|
||||
href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.11-rc2">CHANGES</a>
|
||||
file for details.</p>
|
||||
|
||||
<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2013.11-rc2.tar.bz2">2013.11-rc2
|
||||
release candidate</a>, and report any problems found to the <a
|
||||
href="lists.html">mailing list</a> or <a
|
||||
href="https://bugs.uclibc.org">bug tracker</a>.</p>
|
||||
|
||||
<li><b>13 November 2013 -- Announcement of the next Buildroot Developer Days</b>
|
||||
|
||||
<p>The next <i>Buildroot Developer Days</i> meeting will take
|
||||
place on Monday 3rd and Tuesday 4th February 2014 in Brussels,
|
||||
Belgium - Just after
|
||||
<a href="http://www.fosdem.org">FOSDEM</a> (February
|
||||
1st/2nd). This two days meeting is mainly open to Buildroot
|
||||
developers and contributors, or Buildroot users having a prior
|
||||
experience with the tool. It will allow developers to work on
|
||||
Buildroot and discuss current issues, the future directions, and
|
||||
more.</p>
|
||||
|
||||
<p>In addition to the Buildroot event, we encourage embedded Linux
|
||||
developers to propose talks for the Embedded and Mobile Developer
|
||||
Room at FOSDEM. See
|
||||
the <a href="https://lists.fosdem.org/pipermail/fosdem/2013-October/001870.html">CFP</a>.</p>
|
||||
|
||||
<p>We would like to thank our
|
||||
sponsor <a href="http://www.google.com">Google</a> for sponsoring
|
||||
the event by providing all the needed logistics.</p>
|
||||
|
||||
<p>For more details, see the
|
||||
<a href="http://www.elinux.org/Buildroot:DeveloperDaysFOSDEM2014">wiki
|
||||
page</a> dedicated to the meeting.</p>
|
||||
|
||||
<li><b>12 November 2013 -- 2013.11-rc1 released</b>
|
||||
|
||||
<p>We have a new release candidate! Lots of changes all over the
|
||||
tree, see the <a
|
||||
href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.11_rc1">CHANGES</a>
|
||||
file for details.</p>
|
||||
file for details, and read the
|
||||
<a href="http://lists.busybox.net/pipermail/buildroot/2013-November/082514.html">announcement</a>.</p>
|
||||
|
||||
<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2013.11-rc1.tar.bz2">2013.11-rc1
|
||||
|
||||
41
docs/sponsors.html
Normal file
41
docs/sponsors.html
Normal file
@@ -0,0 +1,41 @@
|
||||
<!--#include file="header.html" -->
|
||||
|
||||
<h3>Sponsors</h3>
|
||||
|
||||
<p>Throughout its history, the Buildroot project has been sponsored by
|
||||
various companies, that we would like to thank below:</p>
|
||||
|
||||
<ul>
|
||||
|
||||
<li><a href="http://www.google.com">Google</a>, for providing all
|
||||
the logistics for the FOSDEM 2013 and FOSDEM 2014 Developer Days in
|
||||
Brussels, Belgium.</li>
|
||||
|
||||
<li><a href="http://www.imgtec.com/">Imagination Technologies</a>,
|
||||
for sponsoring the meeting room and dinner of the ELCE 2013
|
||||
Developer Days in Edinburgh, UK.</li>
|
||||
|
||||
<li><a href="http://circuitco.com/">CircuitCo</a>, for sponsoring
|
||||
several development boards for the Google Summer of Code 2013
|
||||
project on Buildroot.</li>
|
||||
|
||||
<li><a href="http://boundarydevices.com/">BoundaryDevices</a>, for
|
||||
sponsoring an i.MX6 development board for the Google Summer of Code
|
||||
2013 project on Buildroot.</li>
|
||||
|
||||
<li><a href="http://www.fluendo.com/">Fluendo</a>, for sponsoring
|
||||
the meeting room for the ELCE 2012 Developer Days in Barcelona
|
||||
Spain.</li>
|
||||
|
||||
<li><a href="http://www.synopsys.com">Synopsys</a>, for sponsoring
|
||||
the dinner for the ELCE 2012 Developer Days in Barcelona,
|
||||
Spain.</li>
|
||||
|
||||
<li><a href="http://www.calao-systems.com/">Calao Systems</a>
|
||||
and <a href="http://free-electrons.com/">Free Electrons</a> for
|
||||
providing a meeting room and offering lunch for the ELCE 2009
|
||||
Developer Days in Grenoble, France.</li>
|
||||
|
||||
</ul>
|
||||
|
||||
<!--#include file="footer.html" -->
|
||||
@@ -1,5 +1,5 @@
|
||||
config BR2_PACKAGE_DHCP
|
||||
bool "isc dhcp"
|
||||
bool "dhcp (ISC)"
|
||||
# fork()
|
||||
depends on BR2_USE_MMU
|
||||
help
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
# $Id: dhcp3-relay,v 1.1 2004/04/16 15:41:08 ml Exp $
|
||||
#
|
||||
|
||||
|
||||
# What servers should the DHCP relay forward requests to?
|
||||
# e.g: SERVERS="192.168.0.1"
|
||||
SERVERS=""
|
||||
@@ -14,31 +13,29 @@ INTERFACES=""
|
||||
# Additional options that are passed to the DHCP relay daemon?
|
||||
OPTIONS=""
|
||||
|
||||
|
||||
|
||||
|
||||
# It is not safe to start if we don't have a default configuration...
|
||||
echo "/etc/init.d/dhcp-relay not yet configured! - Aborting..."
|
||||
exit 1;
|
||||
|
||||
|
||||
# Sanity checks
|
||||
test -f /usr/sbin/dhcrelay || exit 0
|
||||
test -n "$INTERFACES" || exit 0
|
||||
test -n "$SERVERS" || exit 0
|
||||
|
||||
# Build command line for interfaces (will be passed to dhrelay below.)
|
||||
IFCMD=""
|
||||
if test "$INTERFACES" != ""; then
|
||||
for I in $INTERFACES; do
|
||||
IFCMD=${IFCMD}"-i "${I}" "
|
||||
done
|
||||
fi
|
||||
for I in $INTERFACES; do
|
||||
IFCMD=${IFCMD}"-i "${I}" "
|
||||
done
|
||||
|
||||
DHCRELAYPID=/var/run/dhcrelay.pid
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Starting DHCP relay: "
|
||||
start-stop-daemon -S -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD $SERVERS
|
||||
[ $? == 0 ] && echo "OK" || echo "FAIL"
|
||||
;;
|
||||
stop)
|
||||
echo -n "Stopping DHCP relay: "
|
||||
start-stop-daemon -K -x /usr/sbin/dhcrelay
|
||||
[ $? == 0 ] && echo "OK" || echo "FAIL"
|
||||
;;
|
||||
restart | force-reload)
|
||||
$0 stop
|
||||
@@ -47,7 +44,7 @@ case "$1" in
|
||||
;;
|
||||
*)
|
||||
echo "Usage: /etc/init.d/dhcp-relay {start|stop|restart|force-reload}"
|
||||
exit 1
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit 0
|
||||
|
||||
@@ -3,34 +3,27 @@
|
||||
# $Id: dhcp3-server.init.d,v 1.4 2003/07/13 19:12:41 mdz Exp $
|
||||
#
|
||||
|
||||
|
||||
|
||||
# On what interfaces should the DHCP server (dhcpd) serve DHCP requests?
|
||||
# Separate multiple interfaces with spaces, e.g. "eth0 eth1".
|
||||
INTERFACES=""
|
||||
|
||||
|
||||
# It is not safe to start if we don't have a default configuration...
|
||||
echo "/etc/init.d/dhcp-server not yet configured! - Aborting..."
|
||||
exit 1;
|
||||
|
||||
|
||||
|
||||
# Sanity checks
|
||||
test -f /usr/sbin/dhcpd || exit 0
|
||||
|
||||
test -f /etc/dhcpd.conf || exit 0
|
||||
test -n "$INTERFACES" || exit 0
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Starting DHCP server: "
|
||||
test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/
|
||||
test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases
|
||||
test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases
|
||||
start-stop-daemon -S -x /usr/sbin/dhcpd -- -q $INTERFACES
|
||||
echo "."
|
||||
[ $? == 0 ] && echo "OK" || echo "FAIL"
|
||||
;;
|
||||
stop)
|
||||
echo -n "Stopping DHCP server: dhcpd3"
|
||||
start-stop-daemon -K -x /usr/sbin/dhcpd
|
||||
echo "."
|
||||
[ $? == 0 ] && echo "OK" || echo "FAIL"
|
||||
;;
|
||||
restart | force-reload)
|
||||
$0 stop
|
||||
@@ -42,7 +35,7 @@ case "$1" in
|
||||
;;
|
||||
*)
|
||||
echo "Usage: /etc/init.d/dhcp-server {start|stop|restart|force-reload}"
|
||||
exit 1
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit 0
|
||||
|
||||
@@ -49,6 +49,7 @@ config BR2_PACKAGE_E2FSPROGS_E2UNDO
|
||||
|
||||
config BR2_PACKAGE_E2FSPROGS_E4DEFRAG
|
||||
bool "e4defrag"
|
||||
depends on !BR2_avr32 # fallocate not implemented
|
||||
|
||||
config BR2_PACKAGE_E2FSPROGS_FILEFRAG
|
||||
bool "filefrag"
|
||||
|
||||
@@ -358,6 +358,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND
|
||||
bool "wayland"
|
||||
depends on !BR2_avr32 # wayland
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
|
||||
select BR2_PACKAGE_WAYLAND
|
||||
help
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
[PATCH] work around dfb-example build issue
|
||||
|
||||
directfb.h defines a number of macros which conflicts with gst/gst.h:
|
||||
|
||||
In file included from ../sysroot/usr/include/gstreamer-1.0/gst/gst.h:50:0,
|
||||
from dfb-example.c:4:
|
||||
../sysroot/usr/include/gstreamer-1.0/gst/gstinfo.h:295:69: error: expected ‘)’ before ‘__attribute__’
|
||||
../sysroot/usr/include/gstreamer-1.0/gst/gstinfo.h:295:69: error: expected ‘,’ or ‘;’ before ‘)’ token
|
||||
|
||||
As mentioned in the upstream bug report:
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=685609
|
||||
|
||||
A workaround is to simply swap the include order around.
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
ext/directfb/dfb-example.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: gst1-plugins-bad-1.2.1/ext/directfb/dfb-example.c
|
||||
===================================================================
|
||||
--- gst1-plugins-bad-1.2.1.orig/ext/directfb/dfb-example.c
|
||||
+++ gst1-plugins-bad-1.2.1/ext/directfb/dfb-example.c
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
-#include <directfb.h>
|
||||
#include <stdio.h>
|
||||
#include <gst/gst.h>
|
||||
+#include <directfb.h>
|
||||
|
||||
static IDirectFB *dfb = NULL;
|
||||
static IDirectFBSurface *primary = NULL;
|
||||
32
package/libcurl/libcurl-0001-CVE-2013-4545.patch
Normal file
32
package/libcurl/libcurl-0001-CVE-2013-4545.patch
Normal file
@@ -0,0 +1,32 @@
|
||||
From 3c3622b66221d89509cffaa693fc7dcd5c5b96cf Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Stenberg <daniel@haxx.se>
|
||||
Date: Wed, 2 Oct 2013 15:31:10 +0200
|
||||
Subject: [PATCH] OpenSSL: acknowledge CURLOPT_SSL_VERIFYHOST without
|
||||
VERIFYPEER
|
||||
|
||||
Setting only CURLOPT_SSL_VERIFYHOST without CURLOPT_SSL_VERIFYPEER set
|
||||
should still verify that the host name fields in the server certificate
|
||||
is fine or return failure.
|
||||
|
||||
Bug: http://curl.haxx.se/mail/lib-2013-10/0002.html
|
||||
Reported-by: Ishan SinghLevett
|
||||
---
|
||||
lib/ssluse.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/ssluse.c b/lib/ssluse.c
|
||||
index 4f3c1e1..9974ac8 100644
|
||||
--- a/lib/ssluse.c
|
||||
+++ b/lib/ssluse.c
|
||||
@@ -2351,7 +2351,7 @@ ossl_connect_step3(struct connectdata *conn,
|
||||
* operations.
|
||||
*/
|
||||
|
||||
- if(!data->set.ssl.verifypeer)
|
||||
+ if(!data->set.ssl.verifypeer && !data->set.ssl.verifyhost)
|
||||
(void)servercert(conn, connssl, FALSE);
|
||||
else
|
||||
retcode = servercert(conn, connssl, TRUE);
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
@@ -16,6 +16,10 @@ config BR2_PACKAGE_LIBPLAYER_MPLAYER
|
||||
depends on !BR2_sh4a && !BR2_sh4aeb && !BR2_microblaze && !BR2_aarch64
|
||||
# mplayer
|
||||
depends on BR2_LARGEFILE
|
||||
# mplayer
|
||||
# Broken support for <ARMv5
|
||||
depends on !(BR2_arm7tdmi || BR2_arm720t || BR2_arm920t \
|
||||
|| BR2_arm920t || BR2_arm922t || BR2_fa526 || BR2_strongarm)
|
||||
select BR2_PACKAGE_MPLAYER
|
||||
|
||||
config BR2_PACKAGE_LIBPLAYER_GSTREAMER
|
||||
|
||||
@@ -15,6 +15,10 @@ LIBVNCSERVER_CONFIG_SCRIPTS = libvncserver-config
|
||||
# only used for examples
|
||||
LIBVNCSERVER_CONF_OPT += --with-sdl-config=/bin/false
|
||||
|
||||
ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||
LIBVNCSERVER_CONF_OPT += --without-pthread
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_INET_IPV6),y)
|
||||
LIBVNCSERVER_CONF_OPT += --without-ipv6
|
||||
endif
|
||||
|
||||
@@ -83,14 +83,14 @@ config BR2_DEFAULT_KERNEL_HEADERS
|
||||
default "3.1.10" if BR2_KERNEL_HEADERS_3_1
|
||||
default "3.2.52" if BR2_KERNEL_HEADERS_3_2
|
||||
default "3.3.8" if BR2_KERNEL_HEADERS_3_3
|
||||
default "3.4.68" if BR2_KERNEL_HEADERS_3_4
|
||||
default "3.4.69" if BR2_KERNEL_HEADERS_3_4
|
||||
default "3.5.7" if BR2_KERNEL_HEADERS_3_5
|
||||
default "3.6.11" if BR2_KERNEL_HEADERS_3_6
|
||||
default "3.7.10" if BR2_KERNEL_HEADERS_3_7
|
||||
default "3.8.13" if BR2_KERNEL_HEADERS_3_8
|
||||
default "3.9.11" if BR2_KERNEL_HEADERS_3_9
|
||||
default "3.10.18" if BR2_KERNEL_HEADERS_3_10
|
||||
default "3.11.7" if BR2_KERNEL_HEADERS_3_11
|
||||
default "3.10.19" if BR2_KERNEL_HEADERS_3_10
|
||||
default "3.11.8" if BR2_KERNEL_HEADERS_3_11
|
||||
default "3.12" if BR2_KERNEL_HEADERS_3_12
|
||||
default "2.6" if BR2_KERNEL_HEADERS_SNAP
|
||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||
|
||||
@@ -13,6 +13,12 @@ NANO_CONF_OPT = --without-slang
|
||||
NANO_CONF_ENV = ac_cv_prog_NCURSESW_CONFIG=false
|
||||
NANO_DEPENDENCIES = ncurses
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FILE),y)
|
||||
NANO_DEPENDENCIES += file
|
||||
else
|
||||
NANO_CONF_ENV += ac_cv_lib_magic_magic_open=no
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NANO_TINY),y)
|
||||
NANO_CONF_OPT += --enable-tiny
|
||||
endif
|
||||
|
||||
@@ -17,7 +17,7 @@ PV_LICENSE_FILES = doc/COPYING
|
||||
# the correct one. By passing the below values for LD and LDFLAGS, we
|
||||
# ensure that 'gcc' is used to do these partial linking steps.
|
||||
PV_MAKE_OPT = \
|
||||
LD=$(TARGET_CC) \
|
||||
LD="$(TARGET_CC)" \
|
||||
LDFLAGS="-Wl,-r -nostdlib"
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -136,12 +136,11 @@ diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri
|
||||
index 58d4ddd..072502c 100644
|
||||
--- a/src/3rdparty/sqlite.pri
|
||||
+++ b/src/3rdparty/sqlite.pri
|
||||
@@ -1,6 +1,7 @@
|
||||
@@ -1,5 +1,6 @@
|
||||
CONFIG(release, debug|release):DEFINES *= NDEBUG
|
||||
DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_RTREE
|
||||
!contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS
|
||||
+contains(QT_CONFIG, posix_fallocate):DEFINES += HAVE_POSIX_FALLOCATE=1
|
||||
winrt: DEFINES += SQLITE_OS_WINRT
|
||||
INCLUDEPATH += $$PWD/sqlite
|
||||
SOURCES += $$PWD/sqlite/sqlite3.c
|
||||
diff --git a/src/3rdparty/sqlite/sqlite3.c b/src/3rdparty/sqlite/sqlite3.c
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
SQUASHFS_VERSION = 4.2
|
||||
SQUASHFS_SOURCE = squashfs$(SQUASHFS_VERSION).tar.gz
|
||||
SQUASHFS_SITE = http://downloads.sourceforge.net/projct/squashfs/squashfs/squashfs$(SQUASHFS_VERSION)
|
||||
SQUASHFS_SITE = http://downloads.sourceforge.net/project/squashfs/squashfs/squashfs$(SQUASHFS_VERSION)
|
||||
|
||||
# no libattr in BR
|
||||
SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0
|
||||
|
||||
@@ -4,4 +4,4 @@ config BR2_PACKAGE_TTCP
|
||||
help
|
||||
Benchmarking tool for determining TCP and UDP performance.
|
||||
|
||||
ftp://ftp.sunet.se/pub/network/monitoring/ttcp/
|
||||
ftp://ftp.sgi.com/sgi/src/ttcp/README
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
diff -urN ttcp-0rig/ttcp.c ttcp/ttcp.c
|
||||
--- ttcp-0rig/ttcp.c 1993-05-17 00:00:00.000000000 +0200
|
||||
+++ ttcp/ttcp.c 2009-01-14 23:46:19.000000000 +0100
|
||||
Replace deprecated bcopy call by using memmove instead.
|
||||
|
||||
Index: b/ttcp.c
|
||||
===================================================================
|
||||
--- a/ttcp.c
|
||||
+++ b/ttcp.c
|
||||
@@ -241,7 +241,7 @@
|
||||
if ((addr=gethostbyname(host)) == NULL)
|
||||
err("bad hostname");
|
||||
@@ -4,9 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
#
|
||||
TTCP_VERSION =
|
||||
TTCP_SITE = http://ftp.sunet.se/pub/network/monitoring/ttcp
|
||||
TTCP_VERSION = 1.12
|
||||
TTCP_SITE = ftp://ftp.sgi.com/sgi/src/ttcp/
|
||||
TTCP_SOURCE = ttcp.c
|
||||
TTCP_LICENSE = public domain
|
||||
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
libc/sysdeps: add __kernel_long and __kernel_ulong
|
||||
|
||||
Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
|
||||
exported header files were updated to use these new types. Add the
|
||||
definitions for __kernel_long_t and __kernel_ulong_t to the relevant
|
||||
kernel_types.h headers.
|
||||
|
||||
Signed-off-by: Simon Dawson <spdawson@gmail.com>
|
||||
|
||||
diff -Nurp a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h
|
||||
--- a/libc/sysdeps/linux/avr32/bits/kernel_types.h 2011-06-08 19:58:40.000000000 +0100
|
||||
+++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h 2013-11-15 08:01:09.209037851 +0000
|
||||
@@ -39,6 +39,8 @@ typedef unsigned int __kernel_gid32_t;
|
||||
typedef unsigned short __kernel_old_uid_t;
|
||||
typedef unsigned short __kernel_old_gid_t;
|
||||
typedef unsigned short __kernel_old_dev_t;
|
||||
+typedef long __kernel_long_t;
|
||||
+typedef unsigned long __kernel_ulong_t;
|
||||
|
||||
#ifdef __GNUC__
|
||||
typedef long long __kernel_loff_t;
|
||||
@@ -1,5 +1,6 @@
|
||||
config BR2_PACKAGE_WAYLAND
|
||||
bool "wayland"
|
||||
depends on !BR2_avr32 # no epoll_create1, timerfd_create or timerfd_settime
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_LIBFFI
|
||||
select BR2_PACKAGE_EXPAT
|
||||
@@ -11,4 +12,5 @@ config BR2_PACKAGE_WAYLAND
|
||||
http://wayland.freedesktop.org/
|
||||
|
||||
comment "wayland needs a toolchain w/ threads"
|
||||
depends on !BR2_avr32
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
comment "weston needs udev and a toolchain w/ threads"
|
||||
depends on !BR2_avr32
|
||||
depends on !BR2_PACKAGE_UDEV || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_WESTON
|
||||
@@ -11,6 +12,7 @@ config BR2_PACKAGE_WESTON
|
||||
select BR2_PACKAGE_JPEG
|
||||
select BR2_PACKAGE_MTDEV
|
||||
depends on BR2_PACKAGE_UDEV
|
||||
depends on !BR2_avr32 # wayland
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
|
||||
# Runtime dependency
|
||||
select BR2_PACKAGE_XKEYBOARD_CONFIG
|
||||
|
||||
@@ -22,7 +22,8 @@ WVSTREAMS_CONF_OPT += \
|
||||
--with-openssl \
|
||||
--with-zlib \
|
||||
--without-pam \
|
||||
--disable-warnings
|
||||
--disable-warnings \
|
||||
--without-tcl
|
||||
|
||||
# needed for openssl detection when statically linking (as ssl needs lz)
|
||||
WVSTREAMS_CONF_ENV += LIBS=-lz
|
||||
@@ -38,13 +39,6 @@ else
|
||||
WVSTREAMS_CONF_OPT += --without-dbus
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_TCL),y)
|
||||
WVSTREAMS_DEPENDENCIES += tcl
|
||||
WVSTREAMS_CONF_OPT += --with-tcl
|
||||
else
|
||||
WVSTREAMS_CONF_OPT += --without-tcl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT),y)
|
||||
WVSTREAMS_DEPENDENCIES += qt
|
||||
WVSTREAMS_CONF_OPT += --with-qt
|
||||
|
||||
Reference in New Issue
Block a user