Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -0,0 +1,57 @@
|
||||
From 0a337328411d5b3f37b169a83b6fee3f1726130f Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Thu, 26 May 2016 15:57:33 +0200
|
||||
Subject: [PATCH] Support architectures with non-empty __USER_LABEL_PREFIX__
|
||||
|
||||
On some architectures (like Blackfin), a C symbol does not directly
|
||||
match with assembly symbols. The C symbol references are in fact all
|
||||
prefixed by a so-called "user label prefix". So when a symbol defined
|
||||
in an assembly file needs to be referenced from C, this symbol should
|
||||
be prefixed by the "user label prefix".
|
||||
|
||||
This commit updates dtddata.S to take into account
|
||||
__USER_LABEL_PREFIX__ when it exists.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
src/dtddata.S | 19 +++++++++++++------
|
||||
1 file changed, 13 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/dtddata.S b/src/dtddata.S
|
||||
index ce51133..ad2a4db 100644
|
||||
--- a/src/dtddata.S
|
||||
+++ b/src/dtddata.S
|
||||
@@ -30,17 +30,24 @@
|
||||
|
||||
/* from: http://www.linuxjournal.com/content/embedding-file-executable-aka-hello-world-version-5967#comment-348129 */
|
||||
|
||||
+#ifdef __USER_LABEL_PREFIX__
|
||||
+#define CONCAT1(a, b) CONCAT2(a, b)
|
||||
+#define CONCAT2(a, b) a ## b
|
||||
+#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
|
||||
+#else
|
||||
+#endif
|
||||
+
|
||||
.macro binfile name file
|
||||
.p2align 2
|
||||
- .globl \name\()_begin
|
||||
-\name\()_begin:
|
||||
+ .globl SYM(\name\()_begin)
|
||||
+SYM(\name\()_begin):
|
||||
.incbin "\file"
|
||||
-\name\()_end:
|
||||
+SYM(\name\()_end):
|
||||
.byte 0
|
||||
.p2align 2
|
||||
- .globl \name\()_len
|
||||
-\name\()_len:
|
||||
- .int (\name\()_end - \name\()_begin)
|
||||
+ .globl SYM(\name\()_len)
|
||||
+SYM(\name\()_len):
|
||||
+ .int (SYM(\name\()_end) - SYM(\name\()_begin))
|
||||
.endm
|
||||
|
||||
.section .rodata
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 6750b47d9e0d3074d2e56aa36c476493f533d696 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 15 Jul 2016 16:23:48 -0700
|
||||
Subject: [PATCH 1/1] scanner: Use uint32_t instead of uint
|
||||
|
||||
uint32_t is C99 defined stdint type
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Reviewed-by: Daniel Stone <daniels@collabora.com>
|
||||
[Rahul Bedarkar: Backported from: 6750b47d9e0d3074d2e56aa36c476493f533d696]
|
||||
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
|
||||
---
|
||||
src/scanner.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/scanner.c b/src/scanner.c
|
||||
index 6e2c3a3..ebae4cc 100644
|
||||
--- a/src/scanner.c
|
||||
+++ b/src/scanner.c
|
||||
@@ -819,7 +819,7 @@ find_enumeration(struct protocol *protocol,
|
||||
struct interface *i;
|
||||
struct enumeration *e;
|
||||
char *enum_name;
|
||||
- uint idx = 0, j;
|
||||
+ uint32_t idx = 0, j;
|
||||
|
||||
for (j = 0; j + 1 < strlen(enum_attribute); j++) {
|
||||
if (enum_attribute[j] == '.') {
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@@ -2,8 +2,9 @@ config BR2_PACKAGE_WAYLAND
|
||||
bool "wayland"
|
||||
depends on !BR2_STATIC_LIBS # dlfcn.h
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_LIBFFI
|
||||
select BR2_PACKAGE_EXPAT
|
||||
select BR2_PACKAGE_LIBFFI
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
help
|
||||
Wayland is a project to define a protocol for a compositor
|
||||
to talk to its clients as well as a library implementation
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From: http://lists.freedesktop.org/archives/wayland-devel/2015-June/022630.html
|
||||
sha256 f17c938d1c24fd0a10f650a623a2775d329db3168b5732e498b08388ec776fc8 wayland-1.8.1.tar.xz
|
||||
# From https://lists.freedesktop.org/archives/wayland-devel/2016-June/029163.html
|
||||
sha256 9540925f7928becfdf5e3b84c70757f6589bf1ceef09bea78784d8e4772c0db0 wayland-1.11.0.tar.xz
|
||||
|
||||
@@ -4,28 +4,17 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WAYLAND_VERSION = 1.8.1
|
||||
WAYLAND_VERSION = 1.11.0
|
||||
WAYLAND_SITE = http://wayland.freedesktop.org/releases
|
||||
WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
|
||||
WAYLAND_LICENSE = MIT
|
||||
WAYLAND_LICENSE_FILES = COPYING
|
||||
|
||||
WAYLAND_INSTALL_STAGING = YES
|
||||
WAYLAND_DEPENDENCIES = libffi host-pkgconf host-wayland expat
|
||||
WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2
|
||||
HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2
|
||||
|
||||
# wayland-scanner is only needed for building, not on the target
|
||||
WAYLAND_CONF_OPTS = --disable-scanner
|
||||
|
||||
# We must provide a specialy-crafted wayland-scanner .pc file
|
||||
# which we vampirise and adapt from the host-wayland copy
|
||||
define WAYLAND_SCANNER_PC
|
||||
$(INSTALL) -m 0644 -D $(HOST_DIR)/usr/lib/pkgconfig/wayland-scanner.pc \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/wayland-scanner.pc
|
||||
$(SED) 's:^prefix=.*:prefix=/usr:' \
|
||||
-e 's:^wayland_scanner=.*:wayland_scanner=$(HOST_DIR)/usr/bin/wayland-scanner:' \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/wayland-scanner.pc
|
||||
endef
|
||||
WAYLAND_POST_INSTALL_STAGING_HOOKS += WAYLAND_SCANNER_PC
|
||||
WAYLAND_CONF_OPTS = --disable-scanner --with-host-scanner
|
||||
|
||||
# Remove the DTD from the target, it's not needed at runtime
|
||||
define WAYLAND_TARGET_CLEANUP
|
||||
|
||||
Reference in New Issue
Block a user