Compare commits
96 Commits
2016.11-rc2
...
2016.11
| Author | SHA1 | Date | |
|---|---|---|---|
| a7eb052ff8 | |||
| 30b4f9bae0 | |||
| 1816f87540 | |||
| 41fc9e40a5 | |||
| 0689e77eec | |||
| bf5487e21e | |||
| bf116466d2 | |||
| 286c6b4e4d | |||
| 97f8aa4005 | |||
| 737c804f1c | |||
| 93106e9e1f | |||
| ee99fe4088 | |||
| e920e521ac | |||
| 008ab8d590 | |||
| 114f5a9310 | |||
| e64ee501a0 | |||
| 344566a778 | |||
| cbe1f288d4 | |||
| 1546afad3c | |||
| 9d67242653 | |||
| d45465e488 | |||
| 79061fe52f | |||
| 6d3e05690f | |||
| 907ea41c52 | |||
| 4c6d5e33ae | |||
| ca41a78c2d | |||
| 9b2f9b137c | |||
| 0f496d77db | |||
| 01354e1a0f | |||
| c111562706 | |||
| d764abd1b9 | |||
| 16a4241cb7 | |||
| 1938ad4efa | |||
| 40a60b7545 | |||
| 83e207d7bc | |||
| fa62773826 | |||
| 72dcc7c252 | |||
| d2ff457e88 | |||
| 5a8d3f83b5 | |||
| 0c029a7acc | |||
| 1683c91c12 | |||
| 9d5241615a | |||
| ccd49eec60 | |||
| b4c050e9af | |||
| b14b02698e | |||
| f4cd8ceb9c | |||
| 171d4103c5 | |||
| 82f7217b33 | |||
| 47329fb4cf | |||
| a01c4cda3e | |||
| f09b33a0ab | |||
| 8ad8e9917f | |||
| 18af7b5787 | |||
| 99b3e82133 | |||
| cbc2fd07b0 | |||
| 48341ce1cb | |||
| e5a51555f8 | |||
| a227cf11f4 | |||
| fb45f199e5 | |||
| edc18ac932 | |||
| fe0607e68b | |||
| 8528db817d | |||
| ebd63d405f | |||
| c88713070e | |||
| 99d06dbd3d | |||
| 568013ecae | |||
| fe13efe19d | |||
| 4f5f481991 | |||
| 63a20d5dfe | |||
| d082d20a8a | |||
| 592188e34b | |||
| 4d907c71d4 | |||
| 59d047fa58 | |||
| 320d73ab1b | |||
| ef5596aa03 | |||
| 8715e8da11 | |||
| d20845c447 | |||
| d9eeadbcc3 | |||
| d149dae430 | |||
| 6c248452d6 | |||
| 12c2c80aa3 | |||
| 75022c5270 | |||
| e550e4783a | |||
| 614e821a7f | |||
| 0ee4deb961 | |||
| ca99d0ea92 | |||
| aae80e71b6 | |||
| 2114cf021f | |||
| 9c49afdad6 | |||
| 2775276135 | |||
| d3f0d52144 | |||
| 7f4dfd1188 | |||
| eac8c9ee24 | |||
| 6e0d4bac19 | |||
| c418476aa8 | |||
| dab808e6ae |
@@ -1,3 +1,44 @@
|
||||
2016.11, Released November 30th, 2016
|
||||
|
||||
Minor fixes.
|
||||
|
||||
Updated/fixed packages: bzip2, gcc, jasper, sane-backends,
|
||||
uboot, uclibc
|
||||
|
||||
Issues resolved (http://bugs.buildroot.org):
|
||||
|
||||
#9451: packages/postgresql/postgresql.mk contains wrong POST...
|
||||
|
||||
2016.11-rc3, Released November 28th, 2016
|
||||
|
||||
Fixes all over the tree, including a number of security fixes.
|
||||
|
||||
The move from fakeroot to pseudo unfortunately brought a
|
||||
number of issues. The SELinux issue described in #9386 which
|
||||
triggered the move to pseudo has been investigated further and
|
||||
a workaround implemented and the pseudo changes reverted.
|
||||
|
||||
Linux kernel: update default to 4.8.11.
|
||||
|
||||
Defconfigs: Updates/fixes for imx28ek, mx6udoo, imx6ulpico,
|
||||
olimex a20 olinuxino lime mali, roseapplepi, synopsis aarch64
|
||||
vdk, axs101, axs103 and hs38 smd vdk.
|
||||
|
||||
Updated/fixed packages: autossh, chrony, dosfstools,
|
||||
dtv-scan-tables, e2fsprogs, gcc, gdb, gnuchess, gnuradio,
|
||||
gpsd, gst1-plugins-bad, gst1-plugins-good, imagemagick,
|
||||
kvm-unit-tests, libfribi, libuv, mesa3d, mpfr, mplayer, mpv,
|
||||
ntp, ola, olsr, openblas, openjpeg, openssh, postgresql,
|
||||
ptpd2python3, qemu, qextserialport, qt5base, quagga, xqwt,
|
||||
taskd, tiff, tremor, trousers, udisks, uclibc, wireshark,
|
||||
xapp_xload, xenomai, xmlstarlet
|
||||
|
||||
Issues resolved (http://bugs.buildroot.org):
|
||||
|
||||
#9386: ubinize fails with or without custom config
|
||||
#9431: A misspelling
|
||||
#9446: make raspberrypi3_defconfig compilation failure
|
||||
|
||||
2016.11-rc2, Released November 13th, 2016
|
||||
|
||||
Fixes all over the tree.
|
||||
|
||||
@@ -83,7 +83,7 @@ else # umask / $(CURDIR) / $(O)
|
||||
all:
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2016.11-rc2
|
||||
export BR2_VERSION := 2016.11
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
@@ -928,7 +928,7 @@ clean:
|
||||
$(LEGAL_INFO_DIR) $(GRAPHS_DIR)
|
||||
|
||||
distclean: clean
|
||||
ifeq ($(O),output)
|
||||
ifeq ($(O),$(CURDIR)/output)
|
||||
rm -rf $(O)
|
||||
endif
|
||||
rm -rf $(TOPDIR)/dl $(BR2_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/..config.tmp \
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Run the emulation with:
|
||||
|
||||
qemu-system-ppc -M g3beige -kernel output/images/vmlinux -hda -drive file=output/images/rootfs.ext2,format=raw -append "console=ttyS0 root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user
|
||||
qemu-system-ppc -M g3beige -kernel output/images/vmlinux -drive file=output/images/rootfs.ext2,format=raw -append "console=ttyS0 root=/dev/hda" -serial stdio -net nic,model=rtl8139 -net user
|
||||
|
||||
The login prompt will appear in the terminal that started Qemu. The
|
||||
graphical window is the framebuffer.
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
From 96b4fb75d15be65edc5494579e4a944534042f99 Mon Sep 17 00:00:00 2001
|
||||
From: Sasha Levin <sasha.levin@oracle.com>
|
||||
Date: Mon, 13 Oct 2014 15:51:05 -0700
|
||||
Subject: [PATCH] kernel: add support for gcc 5
|
||||
|
||||
We're missing include/linux/compiler-gcc5.h which is required now
|
||||
because gcc branched off to v5 in trunk.
|
||||
|
||||
Just copy the relevant bits out of include/linux/compiler-gcc4.h,
|
||||
no new code is added as of now.
|
||||
|
||||
This fixes a build error when using gcc 5.
|
||||
|
||||
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
|
||||
Cc: <stable@vger.kernel.org>
|
||||
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
(cherry picked from commit 71458cfc782eafe4b27656e078d379a34e472adf)
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 66 insertions(+)
|
||||
create mode 100644 include/linux/compiler-gcc5.h
|
||||
|
||||
diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
|
||||
new file mode 100644
|
||||
index 0000000..cdd1cc2
|
||||
--- /dev/null
|
||||
+++ b/include/linux/compiler-gcc5.h
|
||||
@@ -0,0 +1,66 @@
|
||||
+#ifndef __LINUX_COMPILER_H
|
||||
+#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
|
||||
+#endif
|
||||
+
|
||||
+#define __used __attribute__((__used__))
|
||||
+#define __must_check __attribute__((warn_unused_result))
|
||||
+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b)
|
||||
+
|
||||
+/* Mark functions as cold. gcc will assume any path leading to a call
|
||||
+ to them will be unlikely. This means a lot of manual unlikely()s
|
||||
+ are unnecessary now for any paths leading to the usual suspects
|
||||
+ like BUG(), printk(), panic() etc. [but let's keep them for now for
|
||||
+ older compilers]
|
||||
+
|
||||
+ Early snapshots of gcc 4.3 don't support this and we can't detect this
|
||||
+ in the preprocessor, but we can live with this because they're unreleased.
|
||||
+ Maketime probing would be overkill here.
|
||||
+
|
||||
+ gcc also has a __attribute__((__hot__)) to move hot functions into
|
||||
+ a special section, but I don't see any sense in this right now in
|
||||
+ the kernel context */
|
||||
+#define __cold __attribute__((__cold__))
|
||||
+
|
||||
+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
|
||||
+
|
||||
+#ifndef __CHECKER__
|
||||
+# define __compiletime_warning(message) __attribute__((warning(message)))
|
||||
+# define __compiletime_error(message) __attribute__((error(message)))
|
||||
+#endif /* __CHECKER__ */
|
||||
+
|
||||
+/*
|
||||
+ * Mark a position in code as unreachable. This can be used to
|
||||
+ * suppress control flow warnings after asm blocks that transfer
|
||||
+ * control elsewhere.
|
||||
+ *
|
||||
+ * Early snapshots of gcc 4.5 don't support this and we can't detect
|
||||
+ * this in the preprocessor, but we can live with this because they're
|
||||
+ * unreleased. Really, we need to have autoconf for the kernel.
|
||||
+ */
|
||||
+#define unreachable() __builtin_unreachable()
|
||||
+
|
||||
+/* Mark a function definition as prohibited from being cloned. */
|
||||
+#define __noclone __attribute__((__noclone__))
|
||||
+
|
||||
+/*
|
||||
+ * Tell the optimizer that something else uses this function or variable.
|
||||
+ */
|
||||
+#define __visible __attribute__((externally_visible))
|
||||
+
|
||||
+/*
|
||||
+ * GCC 'asm goto' miscompiles certain code sequences:
|
||||
+ *
|
||||
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
|
||||
+ *
|
||||
+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
|
||||
+ * Fixed in GCC 4.8.2 and later versions.
|
||||
+ *
|
||||
+ * (asm goto is automatically volatile - the naming reflects this.)
|
||||
+ */
|
||||
+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
|
||||
+
|
||||
+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
|
||||
+#define __HAVE_BUILTIN_BSWAP32__
|
||||
+#define __HAVE_BUILTIN_BSWAP64__
|
||||
+#define __HAVE_BUILTIN_BSWAP16__
|
||||
+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
|
||||
--
|
||||
2.10.2
|
||||
|
||||
+54
@@ -0,0 +1,54 @@
|
||||
From 8ac9a3f6dbf00d861134bea3f2c930defed6311a Mon Sep 17 00:00:00 2001
|
||||
From: Behan Webster <behanw@converseincode.com>
|
||||
Date: Wed, 24 Sep 2014 01:06:46 +0100
|
||||
Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
|
||||
|
||||
With compilers which follow the C99 standard (like modern versions of gcc and
|
||||
clang), "extern inline" does the wrong thing (emits code for an externally
|
||||
linkable version of the inline function). In this case using static inline
|
||||
and removing the NULL version of return_address in return_address.c does
|
||||
the right thing.
|
||||
|
||||
Signed-off-by: Behan Webster <behanw@converseincode.com>
|
||||
Reviewed-by: Mark Charlebois <charlebm@gmail.com>
|
||||
Acked-by: Steven Rostedt <rostedt@goodmis.org>
|
||||
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
||||
(cherry picked from commit aeea3592a13bf12861943e44fc48f1f270941f8d)
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
arch/arm/include/asm/ftrace.h | 2 +-
|
||||
arch/arm/kernel/return_address.c | 5 -----
|
||||
2 files changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
|
||||
index f89515a..2bb8cac 100644
|
||||
--- a/arch/arm/include/asm/ftrace.h
|
||||
+++ b/arch/arm/include/asm/ftrace.h
|
||||
@@ -45,7 +45,7 @@ void *return_address(unsigned int);
|
||||
|
||||
#else
|
||||
|
||||
-extern inline void *return_address(unsigned int level)
|
||||
+static inline void *return_address(unsigned int level)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
|
||||
index 2f8f523..a3b587f 100755
|
||||
--- a/arch/arm/kernel/return_address.c
|
||||
+++ b/arch/arm/kernel/return_address.c
|
||||
@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
|
||||
//#warning "TODO: return_address should use unwind tables"
|
||||
//#endif
|
||||
|
||||
-void *return_address(unsigned int level)
|
||||
-{
|
||||
- return NULL;
|
||||
-}
|
||||
-
|
||||
#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
|
||||
|
||||
EXPORT_SYMBOL_GPL(return_address);
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -0,0 +1,121 @@
|
||||
From ef34609395c72a1e777ef9c3fb6ce60aa92976bb Mon Sep 17 00:00:00 2001
|
||||
From: Marco Franceschetti <vonfritz1@gmail.com>
|
||||
Date: Sun, 13 Mar 2016 09:44:54 +0100
|
||||
Subject: [PATCH] Fix compile errors with gcc5
|
||||
|
||||
(cherry picked from commit e824d45043efd49607f66c89c921b07c1523bf9e)
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h | 6 +++---
|
||||
drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h | 6 +++---
|
||||
drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h | 6 +++---
|
||||
drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h | 6 +++---
|
||||
4 files changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h b/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h
|
||||
index fc293c4..0898cd4 100755
|
||||
--- a/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h
|
||||
+++ b/drivers/net/wireless/actions/rtl8188etv/include/ieee80211.h
|
||||
@@ -1314,18 +1314,18 @@ enum ieee80211_state {
|
||||
(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
|
||||
(((Addr[5]) & 0xff) == 0xff))
|
||||
#else
|
||||
-extern __inline int is_multicast_mac_addr(const u8 *addr)
|
||||
+static __inline int is_multicast_mac_addr(const u8 *addr)
|
||||
{
|
||||
return ((addr[0] != 0xff) && (0x01 & addr[0]));
|
||||
}
|
||||
|
||||
-extern __inline int is_broadcast_mac_addr(const u8 *addr)
|
||||
+static __inline int is_broadcast_mac_addr(const u8 *addr)
|
||||
{
|
||||
return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
|
||||
(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
|
||||
}
|
||||
|
||||
-extern __inline int is_zero_mac_addr(const u8 *addr)
|
||||
+static __inline int is_zero_mac_addr(const u8 *addr)
|
||||
{
|
||||
return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
|
||||
(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
|
||||
diff --git a/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h
|
||||
index 09475ef..56e0f5a 100755
|
||||
--- a/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h
|
||||
+++ b/drivers/net/wireless/actions/rtl8723bs/include/ieee80211.h
|
||||
@@ -1318,18 +1318,18 @@ enum ieee80211_state {
|
||||
(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
|
||||
(((Addr[5]) & 0xff) == 0xff))
|
||||
#else
|
||||
-extern __inline int is_multicast_mac_addr(const u8 *addr)
|
||||
+static __inline int is_multicast_mac_addr(const u8 *addr)
|
||||
{
|
||||
return ((addr[0] != 0xff) && (0x01 & addr[0]));
|
||||
}
|
||||
|
||||
-extern __inline int is_broadcast_mac_addr(const u8 *addr)
|
||||
+static __inline int is_broadcast_mac_addr(const u8 *addr)
|
||||
{
|
||||
return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
|
||||
(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
|
||||
}
|
||||
|
||||
-extern __inline int is_zero_mac_addr(const u8 *addr)
|
||||
+static __inline int is_zero_mac_addr(const u8 *addr)
|
||||
{
|
||||
return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
|
||||
(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
|
||||
diff --git a/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h
|
||||
index 5dfc421..95144b6 100755
|
||||
--- a/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h
|
||||
+++ b/drivers/net/wireless/actions/rtl8723bs_vq0/include/ieee80211.h
|
||||
@@ -1314,18 +1314,18 @@ enum ieee80211_state {
|
||||
(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
|
||||
(((Addr[5]) & 0xff) == 0xff))
|
||||
#else
|
||||
-extern __inline int is_multicast_mac_addr(const u8 *addr)
|
||||
+static __inline int is_multicast_mac_addr(const u8 *addr)
|
||||
{
|
||||
return ((addr[0] != 0xff) && (0x01 & addr[0]));
|
||||
}
|
||||
|
||||
-extern __inline int is_broadcast_mac_addr(const u8 *addr)
|
||||
+static __inline int is_broadcast_mac_addr(const u8 *addr)
|
||||
{
|
||||
return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
|
||||
(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
|
||||
}
|
||||
|
||||
-extern __inline int is_zero_mac_addr(const u8 *addr)
|
||||
+static __inline int is_zero_mac_addr(const u8 *addr)
|
||||
{
|
||||
return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
|
||||
(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
|
||||
diff --git a/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h b/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h
|
||||
index 09475ef..56e0f5a 100755
|
||||
--- a/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h
|
||||
+++ b/drivers/net/wireless/actions/rtl8723bu/include/ieee80211.h
|
||||
@@ -1318,18 +1318,18 @@ enum ieee80211_state {
|
||||
(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
|
||||
(((Addr[5]) & 0xff) == 0xff))
|
||||
#else
|
||||
-extern __inline int is_multicast_mac_addr(const u8 *addr)
|
||||
+static __inline int is_multicast_mac_addr(const u8 *addr)
|
||||
{
|
||||
return ((addr[0] != 0xff) && (0x01 & addr[0]));
|
||||
}
|
||||
|
||||
-extern __inline int is_broadcast_mac_addr(const u8 *addr)
|
||||
+static __inline int is_broadcast_mac_addr(const u8 *addr)
|
||||
{
|
||||
return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \
|
||||
(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
|
||||
}
|
||||
|
||||
-extern __inline int is_zero_mac_addr(const u8 *addr)
|
||||
+static __inline int is_zero_mac_addr(const u8 *addr)
|
||||
{
|
||||
return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \
|
||||
(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -11,7 +11,7 @@ config BR2_TARGET_BOOT_WRAPPER_AARCH64
|
||||
possible to start an Aarch64 kernel inside the available
|
||||
software simulators for the Aarch64 architecture.
|
||||
|
||||
git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git
|
||||
git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git
|
||||
|
||||
if BR2_TARGET_BOOT_WRAPPER_AARCH64
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
BOOT_WRAPPER_AARCH64_VERSION = 4266507a84f8c06452109d38e0350d4759740694
|
||||
BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git
|
||||
BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git
|
||||
BOOT_WRAPPER_AARCH64_LICENSE = BSD3c
|
||||
BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt
|
||||
BOOT_WRAPPER_AARCH64_DEPENDENCIES = linux
|
||||
|
||||
@@ -223,6 +223,7 @@ define UBOOT_INSTALL_IMAGES_CMDS
|
||||
cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) | \
|
||||
$(HOST_DIR)/usr/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \
|
||||
$(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \
|
||||
$(if $(filter BIG,$(BR2_ENDIAN)),-b) \
|
||||
-o $(BINARIES_DIR)/uboot-env.bin -)
|
||||
endef
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
|
||||
# kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.4"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.8"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="mxs"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk"
|
||||
|
||||
@@ -17,7 +17,7 @@ BR2_GLOBAL_PATCH_DIR="board/technexion/imx6ulpico/patches"
|
||||
# kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.11"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/technexion/imx6ulpico/linux.fragment"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
|
||||
@@ -15,7 +15,7 @@ BR2_TARGET_UBOOT_SPL=y
|
||||
BR2_TARGET_UBOOT_SPL_NAME="SPL"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.11"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/udoo/linux.fragment"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
|
||||
@@ -17,8 +17,10 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot-mali.cmd $(TARGET_D
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,linux-sunxi,linux-sunxi,sunxi-v3.4.103-r1)/sunxi-v3.4.103-r1.tar.gz"
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/dan-and/linux-sunxi.git"
|
||||
# based on Linux version 3.4.113
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="dbabbacbbf8984dea0a8c893b38b376a6ecbb3c1"
|
||||
BR2_LINUX_KERNEL_USE_DEFCONFIG=y
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="sun7i"
|
||||
BR2_LINUX_KERNEL_INSTALL_TARGET=y
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
BR2_aarch64=y
|
||||
# Linux headers same as kernel, a 3.18 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y
|
||||
BR2_TARGET_GENERIC_HOSTNAME="vdk-buildroot"
|
||||
BR2_TARGET_GENERIC_ISSUE="Welcome to SNPS VDK by Buildroot"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://git.linaro.org/kernel/linux-linaro-tracking.git"
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux-linaro-3.18-2014.12"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6"
|
||||
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/synopsys/vdk/linux-vdk-aarch64-defconfig"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
|
||||
@@ -8,19 +8,19 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
|
||||
BR2_SYSTEM_DHCP="eth0"
|
||||
BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay"
|
||||
|
||||
# Linux headers same as kernel, a 4.7 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y
|
||||
# Linux headers same as kernel, a 4.8 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="axs101"
|
||||
|
||||
# Bootloader
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.07"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="axs101"
|
||||
BR2_TARGET_UBOOT_NEEDS_DTC=y
|
||||
|
||||
@@ -9,19 +9,19 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
|
||||
BR2_SYSTEM_DHCP="eth0"
|
||||
BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay"
|
||||
|
||||
# Linux headers same as kernel, a 4.7 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y
|
||||
# Linux headers same as kernel, a 4.8 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="axs103_smp"
|
||||
|
||||
# Bootloader
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.07"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="axs103"
|
||||
BR2_TARGET_UBOOT_NEEDS_DTC=y
|
||||
|
||||
@@ -8,12 +8,12 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the HS38 VDK Software Development Platform"
|
||||
BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
|
||||
# Linux headers same as kernel, a 4.7 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y
|
||||
# Linux headers same as kernel, a 4.8 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y
|
||||
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="vdk_hs38_smp"
|
||||
BR2_LINUX_KERNEL_VMLINUX=y
|
||||
|
||||
@@ -384,9 +384,6 @@ openGL libraries.
|
||||
|
||||
See xref:virtual-package-tutorial[] for more on the virtual packages.
|
||||
|
||||
See xref:virtual-package-list[] for the symbols to depend on if your package
|
||||
depends on a feature provided by a virtual package.
|
||||
|
||||
=== The +.mk+ file
|
||||
|
||||
[[adding-packages-mk]]
|
||||
|
||||
@@ -178,7 +178,7 @@ the br2-external tree. Buildroot will automatically show them in the
|
||||
output of +make list-defconfigs+ and allow them to be loaded with the
|
||||
normal +make <name>_defconfig+ command. They will be visible in the
|
||||
'make list-defconfigs' output, below an +External configs+ label that
|
||||
contains the name of the br2-extermnal tree they are defined in.
|
||||
contains the name of the br2-external tree they are defined in.
|
||||
|
||||
.Note:
|
||||
If a defconfig file is present in more than one br2-external tree, then
|
||||
@@ -217,8 +217,8 @@ illustration, of course):
|
||||
| `----
|
||||
|
|
||||
|- Config.in
|
||||
| |source "$BR2_EXTERNAL_BAR_42_DIR/package/pkg-1/Config.in
|
||||
| |source "$BR2_EXTERNAL_BAR_42_DIR/package/pkg-2/Config.in
|
||||
| |source "$BR2_EXTERNAL_BAR_42_PATH/package/pkg-1/Config.in"
|
||||
| |source "$BR2_EXTERNAL_BAR_42_PATH/package/pkg-2/Config.in"
|
||||
| |
|
||||
| |config BAR_42_FLASH_ADDR
|
||||
| | hex "my-board flash address"
|
||||
@@ -229,7 +229,7 @@ illustration, of course):
|
||||
| |include $(sort $(wildcard $(BR2_EXTERNAL_BAR_42_PATH)/package/*/*.mk))
|
||||
| |
|
||||
| |flash-my-board:
|
||||
| | $(BR2_EXTERNAL_BAR_42_DIR)/board/my-board/flash-image \
|
||||
| | $(BR2_EXTERNAL_BAR_42_PATH)/board/my-board/flash-image \
|
||||
| | --image $(BINARIES_DIR)/image.bin \
|
||||
| | --address $(BAR_42_FLASH_ADDR)
|
||||
| `----
|
||||
|
||||
+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.08.1</b></h3>
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2016.11</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.08.1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.11.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2016.08.1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.11.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h3><a href="/downloads/buildroot-2016.08.1.tar.gz">buildroot-2016.08.1.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.08.1.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2016.11.tar.gz">buildroot-2016.11.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.11.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.08.1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.11.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2016.08.1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.11.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2016.08.1.tar.bz2">buildroot-2016.08.1.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.08.1.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2016.11.tar.bz2">buildroot-2016.11.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.11.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2016.11-rc2</b></h3>
|
||||
<!--
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2016.11-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-2016.11-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.11-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2016.11-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.11-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2016.11-rc2.tar.gz">buildroot-2016.11-rc2.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.11-rc2.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2016.11-rc3.tar.gz">buildroot-2016.11-rc3.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.11-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-2016.11-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.11-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2016.11-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.11-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2016.11-rc2.tar.bz2">buildroot-2016.11-rc2.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.11-rc2.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2016.11-rc3.tar.bz2">buildroot-2016.11-rc3.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.11-rc3.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
-->
|
||||
This and earlier releases (and their PGP signatures) can always be downloaded from
|
||||
<a href="/downloads/">http://buildroot.net/downloads/</a>.
|
||||
</div>
|
||||
|
||||
@@ -9,6 +9,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">2016.11 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>30 November 2016</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The stable 2016.11 release is out - Thanks to everyone
|
||||
contributing and testing the release candidates. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2016.11">CHANGES</a>
|
||||
file for more details
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2016.11.tar.bz2">2016.11 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">2016.11-rc3 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>28 November 2016</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=2016.11-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-2016.11-rc3.tar.bz2">2016.11-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
@@ -43,7 +43,7 @@ ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES))
|
||||
define ROOTFS_TARGET_INTERNAL
|
||||
|
||||
# extra deps
|
||||
ROOTFS_$(2)_DEPENDENCIES += host-pseudo host-makedevs \
|
||||
ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs \
|
||||
$$(if $$(PACKAGES_USERS)$$(ROOTFS_USERS_TABLES),host-mkpasswd)
|
||||
|
||||
ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y)
|
||||
@@ -97,7 +97,7 @@ endif
|
||||
echo $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep))
|
||||
$$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT)
|
||||
chmod a+x $$(FAKEROOT_SCRIPT)
|
||||
PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/pseudo-wrapper -- $$(FAKEROOT_SCRIPT)
|
||||
PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
|
||||
$$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE)
|
||||
-@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE)
|
||||
ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),)
|
||||
|
||||
+5
-6
@@ -20,12 +20,11 @@ ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),0)
|
||||
EXT2_OPTS += -r $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)
|
||||
endif
|
||||
|
||||
# Not qstrip-ing the variable, because it may contain spaces, but we must
|
||||
# qstrip it when checking. Furthermore, we need to further quote it, so
|
||||
# that the quotes do not get eaten by the echo statement when creating the
|
||||
# fakeroot script
|
||||
ifneq ($(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_LABEL)),)
|
||||
EXT2_OPTS += -l '$(BR2_TARGET_ROOTFS_EXT2_LABEL)'
|
||||
# qstrip results in stripping consecutive spaces into a single one. So the
|
||||
# variable is not qstrip-ed to preserve the integrity of the string value.
|
||||
EXT2_LABEL := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_LABEL))
|
||||
ifneq ($(EXT2_LABEL),)
|
||||
EXT2_OPTS += -l "$(EXT2_LABEL)"
|
||||
endif
|
||||
|
||||
ROOTFS_EXT2_DEPENDENCIES = host-mke2img
|
||||
|
||||
+4
-2
@@ -20,9 +20,11 @@ else
|
||||
UBINIZE_CONFIG_FILE_PATH = fs/ubifs/ubinize.cfg
|
||||
endif
|
||||
|
||||
# don't use sed -i as it misbehaves on systems with SELinux enabled when this is
|
||||
# executed through fakeroot (see #9386)
|
||||
define ROOTFS_UBI_CMD
|
||||
$(INSTALL) -m 0644 $(UBINIZE_CONFIG_FILE_PATH) $(BUILD_DIR)/ubinize.cfg
|
||||
$(SED) 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' $(BUILD_DIR)/ubinize.cfg
|
||||
sed 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' \
|
||||
$(UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg
|
||||
$(HOST_DIR)/usr/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg
|
||||
rm $(BUILD_DIR)/ubinize.cfg
|
||||
endef
|
||||
|
||||
+2
-2
@@ -26,7 +26,7 @@ choice
|
||||
prompt "Kernel version"
|
||||
|
||||
config BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
bool "Latest version (4.8.7)"
|
||||
bool "Latest version (4.8.11)"
|
||||
|
||||
config BR2_LINUX_KERNEL_CUSTOM_VERSION
|
||||
bool "Custom version"
|
||||
@@ -97,7 +97,7 @@ endif
|
||||
|
||||
config BR2_LINUX_KERNEL_VERSION
|
||||
string
|
||||
default "4.8.7" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "4.8.11" 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
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
Honour LDFLAGS, especially required when static linking
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
|
||||
diff -Nur autossh-1.4e.orig/Makefile.in autossh-1.4e/Makefile.in
|
||||
--- autossh-1.4e.orig/Makefile.in 2015-02-10 05:41:58.000000000 +0100
|
||||
+++ autossh-1.4e/Makefile.in 2016-11-25 12:49:06.052122855 +0100
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
|
||||
$(TARGET): $(OFILES)
|
||||
- $(CC) $(CPPFLAGS) -o $(TARGET) $(OFILES) $(LIBS)
|
||||
+ $(CC) $(CPPFLAGS) $(LDFLAGS) -o $(TARGET) $(OFILES) $(LIBS)
|
||||
|
||||
clean:
|
||||
- /bin/rm -f *.o *.a *.core *~
|
||||
@@ -22,7 +22,7 @@ endchoice
|
||||
|
||||
config BR2_BINUTILS_VERSION
|
||||
string
|
||||
default "arc-2016.09-eng015" if BR2_arc
|
||||
default "arc-2016.09-rc1" if BR2_arc
|
||||
default "2.25.1" if BR2_BINUTILS_VERSION_2_25_X
|
||||
default "2.26.1" if BR2_BINUTILS_VERSION_2_26_X
|
||||
default "2.27" if BR2_BINUTILS_VERSION_2_27_X
|
||||
|
||||
@@ -5,4 +5,4 @@ sha512 9d9165609fd3b0f20d616f9891fc8e2b466eb13e2bfce40125e12427f8f201d20e2b8322
|
||||
sha512 cf276f84935312361a2ca077e04d0b469d23a3aed979d8ba5d92ea590904ffb2c2e7ed12cc842822bfc402836be86f479660cef3791aa62f3753d8a1a6f564cb binutils-2.27.tar.bz2
|
||||
|
||||
# Locally calculated (fetched from Github)
|
||||
sha512 f8cc7529fbe3cb52b666b92e1353063a8a36ea07fa8c5aa8359252f4222feaed15253b6a137033c74dabc0ae784daf8a7978e69ebdb8bf8cd6b8bb61c84bf181 binutils-arc-2016.09-eng015.tar.gz
|
||||
sha512 d0befdeb0a7b76efd1ad655fc062cde2aa67be7b26210c913ab2709e069d815c4ff2863ce7add1f6434da5a2f4faf1ce5a5bc3d0e64f3e04548a7479f24edcbc binutils-arc-2016.09-rc1.tar.gz
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION))
|
||||
ifeq ($(BINUTILS_VERSION),)
|
||||
ifeq ($(BR2_arc),y)
|
||||
BINUTILS_VERSION = arc-2016.09-eng015
|
||||
BINUTILS_VERSION = arc-2016.09-rc1
|
||||
else
|
||||
BINUTILS_VERSION = 2.25.1
|
||||
endif
|
||||
|
||||
@@ -6,4 +6,4 @@ config BR2_PACKAGE_BZIP2
|
||||
available techniques, while being around twice as fast at
|
||||
compression and six times faster at decompression.
|
||||
|
||||
http://sources.redhat.com/bzip2/
|
||||
http://www.bzip.org
|
||||
|
||||
@@ -34,6 +34,12 @@ else
|
||||
CHRONY_CONF_OPTS += --disable-readline
|
||||
endif
|
||||
|
||||
# If pps-tools is available, build it before so the package can use it
|
||||
# (HAVE_SYS_TIMEPPS_H).
|
||||
ifeq ($(BR2_PACKAGE_PPS_TOOLS),y)
|
||||
CHRONY_DEPENDENCIES += pps-tools
|
||||
endif
|
||||
|
||||
define CHRONY_CONFIGURE_CMDS
|
||||
cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(CHRONY_CONF_OPTS)
|
||||
endef
|
||||
|
||||
@@ -3,4 +3,4 @@ config BR2_PACKAGE_HOST_DOSFSTOOLS
|
||||
help
|
||||
Tools for creating and checking DOS FAT filesystems.
|
||||
|
||||
http://www.daniel-baumann.ch/software/dosfstools/
|
||||
https://github.com/dosfstools/dosfstools
|
||||
|
||||
@@ -17,6 +17,15 @@ DTV_SCAN_TABLES_SITE_METHOD = git
|
||||
DTV_SCAN_TABLES_LICENSE = GPLv2, LGPLv2.1
|
||||
DTV_SCAN_TABLES_LICENSE_FILES = COPYING COPYING.LGPL
|
||||
|
||||
# In order to avoid issues with file name encodings, we rename the
|
||||
# only dtv-scan-tables file that has non-ASCII characters to have a
|
||||
# name using only ASCII characters (pl-Krosno_Sucha_Gora)
|
||||
define DTV_SCAN_TABLES_FIX_NONASCII_FILENAMES
|
||||
mv $(@D)/dvb-t/pl-Krosno_Sucha* $(@D)/dvb-t/pl-Krosno_Sucha_Gora
|
||||
endef
|
||||
|
||||
DTV_SCAN_TABLES_POST_PATCH_HOOKS += DTV_SCAN_TABLES_FIX_NONASCII_FILENAMES
|
||||
|
||||
define DTV_SCAN_TABLES_INSTALL_TARGET_CMDS
|
||||
for f in atsc dvb-c dvb-s dvb-t; do \
|
||||
$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/dvb/$$f; \
|
||||
|
||||
@@ -51,6 +51,12 @@ endif
|
||||
# for util/subst.c to build properly.
|
||||
E2FSPROGS_CONF_ENV += BUILD_CFLAGS="-DHAVE_SYS_STAT_H"
|
||||
|
||||
# Disable use of the host magic.h, as on older hosts (e.g. RHEL 5)
|
||||
# it doesn't provide definitions expected by e2fsprogs support lib.
|
||||
HOST_E2FSPROGS_CONF_ENV += \
|
||||
ac_cv_header_magic_h=no \
|
||||
ac_cv_lib_magic_magic_file=no
|
||||
|
||||
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
|
||||
# util-linux libuuid pulls in libintl if needed, so ensure we also
|
||||
# link against it, otherwise static linking fails
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
Description: Hide error from dlsym()
|
||||
dlsym(), starting in glibc 2.24 actually reports errors. In our case,
|
||||
we try to get ACL functions which are not in the glibc. This causes
|
||||
failures in test suites, so hide those messages for non-debugging
|
||||
purposes for now. It also makes the build logs annoying to read.
|
||||
Author: Julian Andres Klode <juliank@ubuntu.com>
|
||||
Origin: vendor
|
||||
Bug-Debian: https://bugs.debian.org/830912
|
||||
Forwarded: no
|
||||
Last-Update: 2016-08-12
|
||||
|
||||
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
|
||||
|
||||
--- a/libfakeroot.c
|
||||
+++ b/libfakeroot.c
|
||||
@@ -256,10 +256,16 @@ void load_library_symbols(void){
|
||||
/* clear dlerror() just in case dlsym() legitimately returns NULL */
|
||||
msg = dlerror();
|
||||
*(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name);
|
||||
+
|
||||
if ( (msg = dlerror()) != NULL){
|
||||
- fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
|
||||
-/* abort ();*/
|
||||
+#ifdef LIBFAKEROOT_DEBUGGING
|
||||
+ if (fakeroot_debug) {
|
||||
+ fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
|
||||
+/* abort ();*/
|
||||
+ }
|
||||
+#endif
|
||||
}
|
||||
+
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
# From http://snapshot.debian.org/package/fakeroot/1.20.2-1/
|
||||
sha1 367040df07043edb630942b21939e493f3fad888 fakeroot_1.20.2.orig.tar.bz2
|
||||
# Calculated based on the hash above
|
||||
sha256 7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c fakeroot_1.20.2.orig.tar.bz2
|
||||
@@ -0,0 +1,20 @@
|
||||
################################################################################
|
||||
#
|
||||
# fakeroot
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FAKEROOT_VERSION = 1.20.2
|
||||
FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2
|
||||
FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20141005T221953Z/pool/main/f/fakeroot
|
||||
# Force capabilities detection off
|
||||
# For now these are process capabilities (faked) rather than file
|
||||
# so they're of no real use
|
||||
HOST_FAKEROOT_CONF_ENV = \
|
||||
ac_cv_header_sys_capability_h=no \
|
||||
ac_cv_func_capset=no
|
||||
|
||||
FAKEROOT_LICENSE = GPLv3+
|
||||
FAKEROOT_LICENSE_FILES = COPYING
|
||||
|
||||
$(eval $(host-autotools-package))
|
||||
@@ -0,0 +1,43 @@
|
||||
From edb9057c195c41dd7bcd8603e5fd420359edd520 Mon Sep 17 00:00:00 2001
|
||||
From: nsz <nsz@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||
Date: Mon, 23 Nov 2015 15:17:55 +0000
|
||||
Subject: [PATCH] [ARM] PR target/68059 libgcc should not use __write for
|
||||
printing fatal error
|
||||
|
||||
libgcc/
|
||||
PR target/68059
|
||||
* config/arm/linux-atomic-64bit.c (__write): Rename to...
|
||||
(write): ...this and fix the return type.
|
||||
|
||||
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230762 138bc75d-0d04-0410-961f-82ee72b054a4
|
||||
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
libgcc/config/arm/linux-atomic-64bit.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libgcc/config/arm/linux-atomic-64bit.c b/libgcc/config/arm/linux-atomic-64bit.c
|
||||
index 7aa8dfc..570b4ce 100644
|
||||
--- a/libgcc/config/arm/linux-atomic-64bit.c
|
||||
+++ b/libgcc/config/arm/linux-atomic-64bit.c
|
||||
@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
kernels; we check for that in an init section and bail out rather
|
||||
unceremoneously. */
|
||||
|
||||
-extern unsigned int __write (int fd, const void *buf, unsigned int count);
|
||||
+extern int write (int fd, const void *buf, unsigned int count);
|
||||
extern void abort (void);
|
||||
|
||||
/* Kernel helper for compare-and-exchange. */
|
||||
@@ -56,7 +56,7 @@ static void __check_for_sync8_kernelhelper (void)
|
||||
for the user - I'm not sure I can rely on much else being
|
||||
available at this point, so do the same as generic-morestack.c
|
||||
write () and abort (). */
|
||||
- __write (2 /* stderr. */, err, sizeof (err));
|
||||
+ write (2 /* stderr. */, err, sizeof (err));
|
||||
abort ();
|
||||
}
|
||||
};
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
From 80bc14a5249da7054b716229206b453f339b4a5e Mon Sep 17 00:00:00 2001
|
||||
From: nsz <nsz@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||
Date: Mon, 23 Nov 2015 15:17:55 +0000
|
||||
Subject: [PATCH] [ARM] PR target/68059 libgcc should not use __write for
|
||||
printing fatal error
|
||||
|
||||
libgcc/
|
||||
PR target/68059
|
||||
* config/arm/linux-atomic-64bit.c (__write): Rename to...
|
||||
(write): ...this and fix the return type.
|
||||
|
||||
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230762 138bc75d-0d04-0410-961f-82ee72b054a4
|
||||
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
libgcc/config/arm/linux-atomic-64bit.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libgcc/config/arm/linux-atomic-64bit.c b/libgcc/config/arm/linux-atomic-64bit.c
|
||||
index 5b8c6e2..9078673 100644
|
||||
--- a/libgcc/config/arm/linux-atomic-64bit.c
|
||||
+++ b/libgcc/config/arm/linux-atomic-64bit.c
|
||||
@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
kernels; we check for that in an init section and bail out rather
|
||||
unceremoneously. */
|
||||
|
||||
-extern unsigned int __write (int fd, const void *buf, unsigned int count);
|
||||
+extern int write (int fd, const void *buf, unsigned int count);
|
||||
extern void abort (void);
|
||||
|
||||
/* Kernel helper for compare-and-exchange. */
|
||||
@@ -56,7 +56,7 @@ static void __check_for_sync8_kernelhelper (void)
|
||||
for the user - I'm not sure I can rely on much else being
|
||||
available at this point, so do the same as generic-morestack.c
|
||||
write () and abort (). */
|
||||
- __write (2 /* stderr. */, err, sizeof (err));
|
||||
+ write (2 /* stderr. */, err, sizeof (err));
|
||||
abort ();
|
||||
}
|
||||
};
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
From 2b4b5775554c91a63ccae4ee566db696b633652e Mon Sep 17 00:00:00 2001
|
||||
From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||
Date: Wed, 10 Jun 2015 15:07:40 +0000
|
||||
Subject: [PATCH] xtensa: implement trap pattern
|
||||
|
||||
2015-06-10 Max Filippov <jcmvbkbc@gmail.com>
|
||||
gcc/
|
||||
* config/xtensa/xtensa.h (TARGET_DEBUG): New definition.
|
||||
* config/xtensa/xtensa.md (define_attr "type"): New type "trap".
|
||||
(define_insn "trap"): New definition.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
|
||||
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224330 138bc75d-0d04-0410-961f-82ee72b054a4
|
||||
---
|
||||
gcc/config/xtensa/xtensa.h | 1 +
|
||||
gcc/config/xtensa/xtensa.md | 15 ++++++++++++++-
|
||||
2 files changed, 15 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
|
||||
index 615f741..fb8702c 100644
|
||||
--- a/gcc/config/xtensa/xtensa.h
|
||||
+++ b/gcc/config/xtensa/xtensa.h
|
||||
@@ -67,6 +67,7 @@ extern unsigned xtensa_current_frame_size;
|
||||
#define TARGET_THREADPTR XCHAL_HAVE_THREADPTR
|
||||
#define TARGET_LOOPS XCHAL_HAVE_LOOPS
|
||||
#define TARGET_WINDOWED_ABI (XSHAL_ABI == XTHAL_ABI_WINDOWED)
|
||||
+#define TARGET_DEBUG XCHAL_HAVE_DEBUG
|
||||
|
||||
#define TARGET_DEFAULT \
|
||||
((XCHAL_HAVE_L32R ? 0 : MASK_CONST16) | \
|
||||
diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
|
||||
index 6d84384..a577aa3 100644
|
||||
--- a/gcc/config/xtensa/xtensa.md
|
||||
+++ b/gcc/config/xtensa/xtensa.md
|
||||
@@ -86,7 +86,7 @@
|
||||
;; Attributes.
|
||||
|
||||
(define_attr "type"
|
||||
- "unknown,jump,call,load,store,move,arith,multi,nop,farith,fmadd,fconv,fload,fstore,mul16,mul32,div32,mac16,rsr,wsr,entry"
|
||||
+ "unknown,jump,call,load,store,move,arith,multi,nop,farith,fmadd,fconv,fload,fstore,mul16,mul32,div32,mac16,rsr,wsr,entry,trap"
|
||||
(const_string "unknown"))
|
||||
|
||||
(define_attr "mode"
|
||||
@@ -1764,6 +1764,19 @@
|
||||
[(set_attr "length" "0")
|
||||
(set_attr "type" "nop")])
|
||||
|
||||
+(define_insn "trap"
|
||||
+ [(trap_if (const_int 1) (const_int 0))]
|
||||
+ ""
|
||||
+{
|
||||
+ if (TARGET_DEBUG)
|
||||
+ return "break\t1, 15";
|
||||
+ else
|
||||
+ return (TARGET_DENSITY ? "ill.n" : "ill");
|
||||
+}
|
||||
+ [(set_attr "type" "trap")
|
||||
+ (set_attr "mode" "none")
|
||||
+ (set_attr "length" "3")])
|
||||
+
|
||||
;; Setting up a frame pointer is tricky for Xtensa because GCC doesn't
|
||||
;; know if a frame pointer is required until the reload pass, and
|
||||
;; because there may be an incoming argument value in the hard frame
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
From e178289a12a829ec47dc5038d91401f65381e71d Mon Sep 17 00:00:00 2001
|
||||
From: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Date: Tue, 29 Nov 2016 13:09:17 -0800
|
||||
Subject: [PATCH 8/8] xtensa: Fix PR target/78603
|
||||
|
||||
2016-11-29 Max Filippov <jcmvbkbc@gmail.com>
|
||||
gcc/
|
||||
* config/xtensa/xtensa.c (hwloop_optimize): Don't emit zero
|
||||
overhead loop start between a call and its CALL_ARG_LOCATION
|
||||
note.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
Backported from: r242979
|
||||
|
||||
gcc/config/xtensa/xtensa.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
|
||||
index 206ff80..36ab1e3 100644
|
||||
--- a/gcc/config/xtensa/xtensa.c
|
||||
+++ b/gcc/config/xtensa/xtensa.c
|
||||
@@ -4182,7 +4182,10 @@ hwloop_optimize (hwloop_info loop)
|
||||
entry_after = BB_END (entry_bb);
|
||||
while (DEBUG_INSN_P (entry_after)
|
||||
|| (NOTE_P (entry_after)
|
||||
- && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK))
|
||||
+ && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK
|
||||
+ /* Make sure we don't split a call and its corresponding
|
||||
+ CALL_ARG_LOCATION note. */
|
||||
+ && NOTE_KIND (entry_after) != NOTE_INSN_CALL_ARG_LOCATION))
|
||||
entry_after = PREV_INSN (entry_after);
|
||||
|
||||
emit_insn_after (seq, entry_after);
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
Add support for musl on ppc32
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
|
||||
diff -Nur gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h gcc-5.4.0/gcc/config/rs6000/sysv4.h
|
||||
--- gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h 2015-09-24 15:46:45.000000000 +0200
|
||||
+++ gcc-5.4.0/gcc/config/rs6000/sysv4.h 2016-11-27 13:12:33.226953738 +0100
|
||||
@@ -537,6 +537,9 @@
|
||||
#ifndef CC1_SECURE_PLT_DEFAULT_SPEC
|
||||
#define CC1_SECURE_PLT_DEFAULT_SPEC ""
|
||||
#endif
|
||||
+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
|
||||
+#define LINK_SECURE_PLT_DEFAULT_SPEC ""
|
||||
+#endif
|
||||
|
||||
/* Pass -G xxx to the compiler. */
|
||||
#undef CC1_SPEC
|
||||
@@ -757,17 +760,23 @@
|
||||
|
||||
#define LINK_START_LINUX_SPEC ""
|
||||
|
||||
+#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","")
|
||||
+
|
||||
#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
|
||||
#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
|
||||
+#define MUSL_DYNAMIC_LINKER \
|
||||
+ "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
|
||||
#if DEFAULT_LIBC == LIBC_UCLIBC
|
||||
-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
|
||||
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
|
||||
+#elif DEFAULT_LIBC == LIBC_MUSL
|
||||
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
|
||||
#elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
|
||||
-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
|
||||
+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
|
||||
#else
|
||||
#error "Unsupported DEFAULT_LIBC"
|
||||
#endif
|
||||
#define GNU_USER_DYNAMIC_LINKER \
|
||||
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
|
||||
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
|
||||
|
||||
#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
|
||||
%{rdynamic:-export-dynamic} \
|
||||
@@ -889,6 +898,7 @@
|
||||
{ "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \
|
||||
{ "link_os_default", LINK_OS_DEFAULT_SPEC }, \
|
||||
{ "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
|
||||
+ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \
|
||||
{ "cpp_os_ads", CPP_OS_ADS_SPEC }, \
|
||||
{ "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
|
||||
{ "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
|
||||
diff -Nur gcc-5.4.0.orig/gcc/config/rs6000/sysv4le.h gcc-5.4.0/gcc/config/rs6000/sysv4le.h
|
||||
--- gcc-5.4.0.orig/gcc/config/rs6000/sysv4le.h 2015-09-24 15:46:45.000000000 +0200
|
||||
+++ gcc-5.4.0/gcc/config/rs6000/sysv4le.h 2016-11-27 13:12:33.226953738 +0100
|
||||
@@ -31,3 +31,5 @@
|
||||
/* Little-endian PowerPC64 Linux uses the ELF v2 ABI by default. */
|
||||
#define LINUX64_DEFAULT_ABI_ELFv2
|
||||
|
||||
+#undef MUSL_DYNAMIC_LINKER_E
|
||||
+#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","le")
|
||||
diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc
|
||||
--- gcc-5.4.0.orig/gcc/config.gcc 2015-09-10 16:17:53.000000000 +0200
|
||||
+++ gcc-5.4.0/gcc/config.gcc 2016-11-27 13:14:17.149638148 +0100
|
||||
@@ -2413,6 +2413,10 @@
|
||||
powerpc*-*-linux*paired*)
|
||||
tm_file="${tm_file} rs6000/750cl.h" ;;
|
||||
esac
|
||||
+ case ${target} in
|
||||
+ powerpc*-*-linux*-musl*)
|
||||
+ enable_secureplt=yes ;;
|
||||
+ esac
|
||||
if test x${enable_secureplt} = xyes; then
|
||||
tm_file="rs6000/secureplt.h ${tm_file}"
|
||||
fi
|
||||
@@ -0,0 +1,320 @@
|
||||
From 0d2556fa652cc85b3d042e862a38dd07d454175a Mon Sep 17 00:00:00 2001
|
||||
From: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Date: Wed, 26 Oct 2016 08:02:51 +0000
|
||||
Subject: [PATCH 1/2] xtensa: Fix PR target/78118
|
||||
|
||||
It started failing after the following commit: 32e90dc6a0cda45 ("PR
|
||||
rtl-optimization/61047").
|
||||
|
||||
The change that made xtensa backend go ICE looks completely unrelated,
|
||||
and indeed, the issue is caused by the side effect of
|
||||
compute_frame_size() function call hidden in the
|
||||
INITIAL_ELIMINATION_OFFSET macro. This call updates the value of the
|
||||
xtensa_current_frame_size static variable, used in "return" instruction
|
||||
predicate. Prior to the change the value of xtensa_current_frame_size was
|
||||
set to 0 after the end of epilogue generation, which enabled the "return"
|
||||
instruction for the CALL0 ABI, but after the change the additional
|
||||
INITIAL_ELIMINATION_OFFSET calls make xtensa_current_frame_size non-zero
|
||||
and "return" pattern unavailable.
|
||||
|
||||
Get rid of the global xtensa_current_frame_size and
|
||||
xtensa_callee_save_size variables by moving them into the
|
||||
machine_function structure. Implement predicate for the "return" pattern
|
||||
as a function. Don't communicate completion of epilogue generation
|
||||
through zeroing of xtensa_current_frame_size, add explicit epilogue_done
|
||||
variable to the machine_function structure. Don't update stack frame
|
||||
layout after the completion of reload.
|
||||
|
||||
2016-10-26 Max Filippov <jcmvbkbc@gmail.com>
|
||||
gcc/
|
||||
* config/xtensa/xtensa-protos.h
|
||||
(xtensa_use_return_instruction_p): New prototype.
|
||||
* config/xtensa/xtensa.c (xtensa_current_frame_size,
|
||||
xtensa_callee_save_size): Remove.
|
||||
(struct machine_function): Add new fields: current_frame_size,
|
||||
callee_save_size, frame_laid_out and epilogue_done.
|
||||
(compute_frame_size, xtensa_expand_prologue,
|
||||
xtensa_expand_epilogue): Replace xtensa_callee_save_size with
|
||||
cfun->machine->callee_save_size and xtensa_current_frame_size
|
||||
with cfun->machine->current_frame_size.
|
||||
(compute_frame_size): Update cfun->machine->frame_laid_out and
|
||||
don't update frame layout after reload completion.
|
||||
(xtensa_expand_epilogue): Set cfun->machine->epilogue_done
|
||||
instead of zeroing xtensa_current_frame_size.
|
||||
(xtensa_use_return_instruction_p): New function.
|
||||
* config/xtensa/xtensa.h (xtensa_current_frame_size): Remove
|
||||
declaration.
|
||||
(INITIAL_ELIMINATION_OFFSET): Use return value of
|
||||
compute_frame_size instead of xtensa_current_frame_size value.
|
||||
* config/xtensa/xtensa.md ("return" pattern): Use new predicate
|
||||
function xtensa_use_return_instruction_p instead of inline code.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
Backported from: r241748
|
||||
|
||||
gcc/config/xtensa/xtensa-protos.h | 1 +
|
||||
gcc/config/xtensa/xtensa.c | 82 ++++++++++++++++++++++++---------------
|
||||
gcc/config/xtensa/xtensa.h | 6 +--
|
||||
gcc/config/xtensa/xtensa.md | 2 +-
|
||||
4 files changed, 55 insertions(+), 36 deletions(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/xtensa-protos.h b/gcc/config/xtensa/xtensa-protos.h
|
||||
index f2ca526..873557f 100644
|
||||
--- a/gcc/config/xtensa/xtensa-protos.h
|
||||
+++ b/gcc/config/xtensa/xtensa-protos.h
|
||||
@@ -68,6 +68,7 @@ extern rtx xtensa_return_addr (int, rtx);
|
||||
extern void xtensa_setup_frame_addresses (void);
|
||||
extern int xtensa_dbx_register_number (int);
|
||||
extern long compute_frame_size (int);
|
||||
+extern bool xtensa_use_return_instruction_p (void);
|
||||
extern void xtensa_expand_prologue (void);
|
||||
extern void xtensa_expand_epilogue (void);
|
||||
extern void order_regs_for_local_alloc (void);
|
||||
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
|
||||
index 64d089b..e49f784 100644
|
||||
--- a/gcc/config/xtensa/xtensa.c
|
||||
+++ b/gcc/config/xtensa/xtensa.c
|
||||
@@ -78,11 +78,6 @@ enum internal_test
|
||||
can support a given mode. */
|
||||
char xtensa_hard_regno_mode_ok[(int) MAX_MACHINE_MODE][FIRST_PSEUDO_REGISTER];
|
||||
|
||||
-/* Current frame size calculated by compute_frame_size. */
|
||||
-unsigned xtensa_current_frame_size;
|
||||
-/* Callee-save area size in the current frame calculated by compute_frame_size. */
|
||||
-int xtensa_callee_save_size;
|
||||
-
|
||||
/* Largest block move to handle in-line. */
|
||||
#define LARGEST_MOVE_RATIO 15
|
||||
|
||||
@@ -94,6 +89,13 @@ struct GTY(()) machine_function
|
||||
bool vararg_a7;
|
||||
rtx vararg_a7_copy;
|
||||
rtx_insn *set_frame_ptr_insn;
|
||||
+ /* Current frame size calculated by compute_frame_size. */
|
||||
+ unsigned current_frame_size;
|
||||
+ /* Callee-save area size in the current frame calculated by
|
||||
+ compute_frame_size. */
|
||||
+ int callee_save_size;
|
||||
+ bool frame_laid_out;
|
||||
+ bool epilogue_done;
|
||||
};
|
||||
|
||||
/* Vector, indexed by hard register number, which contains 1 for a
|
||||
@@ -2628,24 +2630,29 @@ compute_frame_size (int size)
|
||||
{
|
||||
int regno;
|
||||
|
||||
+ if (reload_completed && cfun->machine->frame_laid_out)
|
||||
+ return cfun->machine->current_frame_size;
|
||||
+
|
||||
/* Add space for the incoming static chain value. */
|
||||
if (cfun->static_chain_decl != NULL)
|
||||
size += (1 * UNITS_PER_WORD);
|
||||
|
||||
- xtensa_callee_save_size = 0;
|
||||
+ cfun->machine->callee_save_size = 0;
|
||||
for (regno = 0; regno < FIRST_PSEUDO_REGISTER; ++regno)
|
||||
{
|
||||
if (xtensa_call_save_reg(regno))
|
||||
- xtensa_callee_save_size += UNITS_PER_WORD;
|
||||
+ cfun->machine->callee_save_size += UNITS_PER_WORD;
|
||||
}
|
||||
|
||||
- xtensa_current_frame_size =
|
||||
+ cfun->machine->current_frame_size =
|
||||
XTENSA_STACK_ALIGN (size
|
||||
- + xtensa_callee_save_size
|
||||
+ + cfun->machine->callee_save_size
|
||||
+ crtl->outgoing_args_size
|
||||
+ (WINDOW_SIZE * UNITS_PER_WORD));
|
||||
- xtensa_callee_save_size = XTENSA_STACK_ALIGN (xtensa_callee_save_size);
|
||||
- return xtensa_current_frame_size;
|
||||
+ cfun->machine->callee_save_size =
|
||||
+ XTENSA_STACK_ALIGN (cfun->machine->callee_save_size);
|
||||
+ cfun->machine->frame_laid_out = true;
|
||||
+ return cfun->machine->current_frame_size;
|
||||
}
|
||||
|
||||
|
||||
@@ -2696,6 +2703,7 @@ xtensa_expand_prologue (void)
|
||||
{
|
||||
int regno;
|
||||
HOST_WIDE_INT offset = 0;
|
||||
+ int callee_save_size = cfun->machine->callee_save_size;
|
||||
|
||||
/* -128 is a limit of single addi instruction. */
|
||||
if (total_size > 0 && total_size <= 128)
|
||||
@@ -2709,7 +2717,7 @@ xtensa_expand_prologue (void)
|
||||
add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx);
|
||||
offset = total_size - UNITS_PER_WORD;
|
||||
}
|
||||
- else if (xtensa_callee_save_size)
|
||||
+ else if (callee_save_size)
|
||||
{
|
||||
/* 1020 is maximal s32i offset, if the frame is bigger than that
|
||||
* we move sp to the end of callee-saved save area, save and then
|
||||
@@ -2717,13 +2725,13 @@ xtensa_expand_prologue (void)
|
||||
if (total_size > 1024)
|
||||
{
|
||||
insn = emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx,
|
||||
- GEN_INT (-xtensa_callee_save_size)));
|
||||
+ GEN_INT (-callee_save_size)));
|
||||
RTX_FRAME_RELATED_P (insn) = 1;
|
||||
note_rtx = gen_rtx_SET (stack_pointer_rtx,
|
||||
plus_constant (Pmode, stack_pointer_rtx,
|
||||
- -xtensa_callee_save_size));
|
||||
+ -callee_save_size));
|
||||
add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx);
|
||||
- offset = xtensa_callee_save_size - UNITS_PER_WORD;
|
||||
+ offset = callee_save_size - UNITS_PER_WORD;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2759,13 +2767,13 @@ xtensa_expand_prologue (void)
|
||||
{
|
||||
rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG);
|
||||
emit_move_insn (tmp_reg, GEN_INT (total_size -
|
||||
- xtensa_callee_save_size));
|
||||
+ callee_save_size));
|
||||
insn = emit_insn (gen_subsi3 (stack_pointer_rtx,
|
||||
stack_pointer_rtx, tmp_reg));
|
||||
RTX_FRAME_RELATED_P (insn) = 1;
|
||||
note_rtx = gen_rtx_SET (stack_pointer_rtx,
|
||||
plus_constant (Pmode, stack_pointer_rtx,
|
||||
- xtensa_callee_save_size -
|
||||
+ callee_save_size -
|
||||
total_size));
|
||||
add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx);
|
||||
}
|
||||
@@ -2833,21 +2841,21 @@ xtensa_expand_epilogue (void)
|
||||
int regno;
|
||||
HOST_WIDE_INT offset;
|
||||
|
||||
- if (xtensa_current_frame_size > (frame_pointer_needed ? 127 : 1024))
|
||||
+ if (cfun->machine->current_frame_size > (frame_pointer_needed ? 127 : 1024))
|
||||
{
|
||||
rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG);
|
||||
- emit_move_insn (tmp_reg, GEN_INT (xtensa_current_frame_size -
|
||||
- xtensa_callee_save_size));
|
||||
+ emit_move_insn (tmp_reg, GEN_INT (cfun->machine->current_frame_size -
|
||||
+ cfun->machine->callee_save_size));
|
||||
emit_insn (gen_addsi3 (stack_pointer_rtx, frame_pointer_needed ?
|
||||
hard_frame_pointer_rtx : stack_pointer_rtx,
|
||||
tmp_reg));
|
||||
- offset = xtensa_callee_save_size - UNITS_PER_WORD;
|
||||
+ offset = cfun->machine->callee_save_size - UNITS_PER_WORD;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (frame_pointer_needed)
|
||||
emit_move_insn (stack_pointer_rtx, hard_frame_pointer_rtx);
|
||||
- offset = xtensa_current_frame_size - UNITS_PER_WORD;
|
||||
+ offset = cfun->machine->current_frame_size - UNITS_PER_WORD;
|
||||
}
|
||||
|
||||
/* Prevent reordering of saved a0 update and loading it back from
|
||||
@@ -2867,16 +2875,16 @@ xtensa_expand_epilogue (void)
|
||||
}
|
||||
}
|
||||
|
||||
- if (xtensa_current_frame_size > 0)
|
||||
+ if (cfun->machine->current_frame_size > 0)
|
||||
{
|
||||
if (frame_pointer_needed || /* always reachable with addi */
|
||||
- xtensa_current_frame_size > 1024 ||
|
||||
- xtensa_current_frame_size <= 127)
|
||||
+ cfun->machine->current_frame_size > 1024 ||
|
||||
+ cfun->machine->current_frame_size <= 127)
|
||||
{
|
||||
- if (xtensa_current_frame_size <= 127)
|
||||
- offset = xtensa_current_frame_size;
|
||||
+ if (cfun->machine->current_frame_size <= 127)
|
||||
+ offset = cfun->machine->current_frame_size;
|
||||
else
|
||||
- offset = xtensa_callee_save_size;
|
||||
+ offset = cfun->machine->callee_save_size;
|
||||
|
||||
emit_insn (gen_addsi3 (stack_pointer_rtx,
|
||||
stack_pointer_rtx,
|
||||
@@ -2885,7 +2893,8 @@ xtensa_expand_epilogue (void)
|
||||
else
|
||||
{
|
||||
rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG);
|
||||
- emit_move_insn (tmp_reg, GEN_INT (xtensa_current_frame_size));
|
||||
+ emit_move_insn (tmp_reg,
|
||||
+ GEN_INT (cfun->machine->current_frame_size));
|
||||
emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx,
|
||||
tmp_reg));
|
||||
}
|
||||
@@ -2896,11 +2905,22 @@ xtensa_expand_epilogue (void)
|
||||
stack_pointer_rtx,
|
||||
EH_RETURN_STACKADJ_RTX));
|
||||
}
|
||||
- xtensa_current_frame_size = 0;
|
||||
- xtensa_callee_save_size = 0;
|
||||
+ cfun->machine->epilogue_done = true;
|
||||
emit_jump_insn (gen_return ());
|
||||
}
|
||||
|
||||
+bool
|
||||
+xtensa_use_return_instruction_p (void)
|
||||
+{
|
||||
+ if (!reload_completed)
|
||||
+ return false;
|
||||
+ if (TARGET_WINDOWED_ABI)
|
||||
+ return true;
|
||||
+ if (compute_frame_size (get_frame_size ()) == 0)
|
||||
+ return true;
|
||||
+ return cfun->machine->epilogue_done;
|
||||
+}
|
||||
+
|
||||
void
|
||||
xtensa_set_return_address (rtx address, rtx scratch)
|
||||
{
|
||||
diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
|
||||
index 82e9900..58eb1b2 100644
|
||||
--- a/gcc/config/xtensa/xtensa.h
|
||||
+++ b/gcc/config/xtensa/xtensa.h
|
||||
@@ -23,8 +23,6 @@ along with GCC; see the file COPYING3. If not see
|
||||
|
||||
/* External variables defined in xtensa.c. */
|
||||
|
||||
-extern unsigned xtensa_current_frame_size;
|
||||
-
|
||||
/* Macros used in the machine description to select various Xtensa
|
||||
configuration options. */
|
||||
#ifndef XCHAL_HAVE_MUL32_HIGH
|
||||
@@ -477,14 +475,14 @@ enum reg_class
|
||||
/* Specify the initial difference between the specified pair of registers. */
|
||||
#define INITIAL_ELIMINATION_OFFSET(FROM, TO, OFFSET) \
|
||||
do { \
|
||||
- compute_frame_size (get_frame_size ()); \
|
||||
+ long frame_size = compute_frame_size (get_frame_size ()); \
|
||||
switch (FROM) \
|
||||
{ \
|
||||
case FRAME_POINTER_REGNUM: \
|
||||
(OFFSET) = 0; \
|
||||
break; \
|
||||
case ARG_POINTER_REGNUM: \
|
||||
- (OFFSET) = xtensa_current_frame_size; \
|
||||
+ (OFFSET) = frame_size; \
|
||||
break; \
|
||||
default: \
|
||||
gcc_unreachable (); \
|
||||
diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
|
||||
index db54a12..fcdb6c8 100644
|
||||
--- a/gcc/config/xtensa/xtensa.md
|
||||
+++ b/gcc/config/xtensa/xtensa.md
|
||||
@@ -1663,7 +1663,7 @@
|
||||
(define_insn "return"
|
||||
[(return)
|
||||
(use (reg:SI A0_REG))]
|
||||
- "(TARGET_WINDOWED_ABI || !xtensa_current_frame_size) && reload_completed"
|
||||
+ "xtensa_use_return_instruction_p ()"
|
||||
{
|
||||
return TARGET_WINDOWED_ABI ?
|
||||
(TARGET_DENSITY ? "retw.n" : "retw") :
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
From 59cce7b304a8cbbb508ba21ab2f9052d3ee9a9e3 Mon Sep 17 00:00:00 2001
|
||||
From: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Date: Tue, 29 Nov 2016 13:09:17 -0800
|
||||
Subject: [PATCH 2/2] xtensa: Fix PR target/78603
|
||||
|
||||
2016-11-29 Max Filippov <jcmvbkbc@gmail.com>
|
||||
gcc/
|
||||
* config/xtensa/xtensa.c (hwloop_optimize): Don't emit zero
|
||||
overhead loop start between a call and its CALL_ARG_LOCATION
|
||||
note.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
Backported from: r242979
|
||||
|
||||
gcc/config/xtensa/xtensa.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
|
||||
index e49f784..70f698a 100644
|
||||
--- a/gcc/config/xtensa/xtensa.c
|
||||
+++ b/gcc/config/xtensa/xtensa.c
|
||||
@@ -4158,7 +4158,10 @@ hwloop_optimize (hwloop_info loop)
|
||||
entry_after = BB_END (entry_bb);
|
||||
while (DEBUG_INSN_P (entry_after)
|
||||
|| (NOTE_P (entry_after)
|
||||
- && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK))
|
||||
+ && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK
|
||||
+ /* Make sure we don't split a call and its corresponding
|
||||
+ CALL_ARG_LOCATION note. */
|
||||
+ && NOTE_KIND (entry_after) != NOTE_INSN_CALL_ARG_LOCATION))
|
||||
entry_after = PREV_INSN (entry_after);
|
||||
|
||||
emit_insn_after (seq, entry_after);
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -98,7 +98,7 @@ config BR2_GCC_VERSION
|
||||
default "4.9.4" if BR2_GCC_VERSION_4_9_X
|
||||
default "5.4.0" if BR2_GCC_VERSION_5_X
|
||||
default "6.2.0" if BR2_GCC_VERSION_6_X
|
||||
default "arc-2016.09-eng015" if BR2_GCC_VERSION_ARC
|
||||
default "arc-2016.09-rc1" if BR2_GCC_VERSION_ARC
|
||||
|
||||
config BR2_EXTRA_GCC_CONFIG_OPTIONS
|
||||
string "Additional gcc options"
|
||||
|
||||
@@ -12,4 +12,4 @@ sha512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d
|
||||
sha512 1e8b826a3d44b9d5899309894e20c03abeb352bf3d273b8ad63af814c0ee2911f1a83ce1cd4cdd2d1cb0b3e3c34e9b7ae1b2ab83dfc649ee817ab05247c76198 gcc-6.2.0.tar.bz2
|
||||
|
||||
# Locally calculated (fetched from Github)
|
||||
sha512 9f365452f746ae91875d935c2ec5ed16cd11a2973f69bd23193fec9fc6b557e0dd66bb169e7efb7ec63fd78af36139005abcf5a5a1d89d6f49788b2ed7b334fb gcc-arc-2016.09-eng015.tar.gz
|
||||
sha512 7029d7ae1316b9385880f32283aa6c4979b1257500bb21e3fb234475ecb20082f46b114d8b7022c75a8dcf0c0c7b6b02e9384b49dd3189adc3d454502b8b0c26 gcc-arc-2016.09-rc1.tar.gz
|
||||
|
||||
@@ -27,7 +27,7 @@ config BR2_PACKAGE_HOST_GDB_PYTHON
|
||||
|
||||
config BR2_PACKAGE_HOST_GDB_SIM
|
||||
bool "Simulator support"
|
||||
depends on !BR2_arc
|
||||
depends on !BR2_arc && !BR2_microblaze
|
||||
help
|
||||
This option enables the simulator support in the cross gdb.
|
||||
|
||||
@@ -56,7 +56,7 @@ endif
|
||||
config BR2_GDB_VERSION
|
||||
string
|
||||
depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB
|
||||
default "arc-2016.03-gdb" if BR2_arc
|
||||
default "arc-2016.09-rc1-gdb" if BR2_arc
|
||||
default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze
|
||||
default "7.9.1" if BR2_GDB_VERSION_7_9
|
||||
default "7.10.1" if BR2_GDB_VERSION_7_10 || !BR2_PACKAGE_HOST_GDB
|
||||
|
||||
@@ -5,4 +5,4 @@ sha512 f80ec6c8a0f0b54c8b945666e875809174402b7e121efb378ebac931a91f9a1cc0048568
|
||||
|
||||
# Locally calculated (fetched from Github)
|
||||
sha512 0a467091d4b01fbecabb4b8da1cb743025c70e7f4874a0b5c8fa2ec623569a39bde6762b91806de0be6e63711aeb6909715cfbe43860de73d8aec6159a9f10a7 gdb-6be65fb56ea6694a9260733a536a023a1e2d4d57.tar.gz
|
||||
sha512 1abef1357896c2b57cfa7f7414eedc49d0de26b54321c680c2d027b1a27ec453d421e7f89a5281336047542379fd4820685802059efbd32b87c5ccffbaf2bd16 gdb-arc-2016.03-gdb.tar.gz
|
||||
sha512 e6019ac0d6b1354943d3c06c84f353ba49fef105b07c1a04ad90cc5b65f91e38fe6c671e0c34a9541ee282d0f42cf24579c011a0469d19faaa4d00d64a17afe2 gdb-arc-2016.09-rc1-gdb.tar.gz
|
||||
|
||||
@@ -100,6 +100,13 @@ GDB_CONF_OPTS = \
|
||||
--disable-werror \
|
||||
--enable-static
|
||||
|
||||
# When gdb is built as C++ application for ARC it segfaults at runtime
|
||||
# So we pass --disable-build-with-cxx config option to force gdb not to
|
||||
# be built as C++ app.
|
||||
ifeq ($(BR2_arc),y)
|
||||
GDB_CONF_OPTS += --disable-build-with-cxx
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GDB_TUI),y)
|
||||
GDB_CONF_OPTS += --enable-tui
|
||||
else
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# sha256 locally computed
|
||||
sha256 17caab725539447bcb17a14b17905242cbf287087e53a6777524feb7bbaeed06 gnuchess-6.2.1.tar.gz
|
||||
sha256 3c425c0264f253fc5cc2ba969abe667d77703c728770bd4b23c456cbe5e082ef gnuchess-6.2.4.tar.gz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GNUCHESS_VERSION = 6.2.1
|
||||
GNUCHESS_VERSION = 6.2.4
|
||||
GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess
|
||||
GNUCHESS_LICENSE = GPLv2+
|
||||
GNUCHESS_LICENSE_FILES = COPYING
|
||||
|
||||
@@ -49,6 +49,7 @@ config BR2_PACKAGE_GNURADIO_CTRLPORT
|
||||
config BR2_PACKAGE_GNURADIO_FEC
|
||||
bool "gr-fec support"
|
||||
select BR2_PACKAGE_GNURADIO_BLOCKS
|
||||
select BR2_PACKAGE_GSL
|
||||
help
|
||||
FEC signal processing blocks
|
||||
|
||||
|
||||
@@ -89,6 +89,7 @@ GNURADIO_CONF_OPTS += -DENABLE_GR_DIGITAL=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GNURADIO_FEC),y)
|
||||
GNURADIO_DEPENDENCIES += gsl
|
||||
GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=ON
|
||||
else
|
||||
GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=OFF
|
||||
|
||||
@@ -33,6 +33,8 @@ endif
|
||||
# Build libgpsmm if we've got C++
|
||||
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
|
||||
GPSD_LDFLAGS += -lstdc++
|
||||
GPSD_CFLAGS += -std=gnu++98
|
||||
GPSD_CXXFLAGS += -std=gnu++98
|
||||
GPSD_SCONS_OPTS += libgpsmm=yes
|
||||
else
|
||||
GPSD_SCONS_OPTS += libgpsmm=no
|
||||
|
||||
+51
@@ -0,0 +1,51 @@
|
||||
From 465091253bb3c3198d055b2e9f02d95237204663 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
|
||||
Date: Wed, 16 Nov 2016 20:41:39 +0200
|
||||
Subject: [PATCH] vmncdec: Sanity-check width/height before using it
|
||||
|
||||
We will allocate a screen area of width*height*bpp bytes, however this
|
||||
calculation can easily overflow if too high width or height are given
|
||||
inside the stream. Nonetheless we would just assume that enough memory
|
||||
was allocated, try to fill it and overwrite as much memory as wanted.
|
||||
|
||||
Also allocate the screen area filled with zeroes to ensure that we start
|
||||
with full-black and not any random (or not so random) data.
|
||||
|
||||
https://scarybeastsecurity.blogspot.gr/2016/11/0day-poc-risky-design-decisions-in.html
|
||||
|
||||
Ideally we should just remove this plugin in favour of the one in
|
||||
gst-libav, which generally seems to be of better code quality.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=774533
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
gst/vmnc/vmncdec.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gst/vmnc/vmncdec.c b/gst/vmnc/vmncdec.c
|
||||
index 5504302..a843136 100644
|
||||
--- a/gst/vmnc/vmncdec.c
|
||||
+++ b/gst/vmnc/vmncdec.c
|
||||
@@ -261,7 +261,7 @@ vmnc_handle_wmvi_rectangle (GstVMncDec * dec, struct RfbRectangle *rect,
|
||||
gst_video_codec_state_unref (state);
|
||||
|
||||
g_free (dec->imagedata);
|
||||
- dec->imagedata = g_malloc (dec->format.width * dec->format.height *
|
||||
+ dec->imagedata = g_malloc0 (dec->format.width * dec->format.height *
|
||||
dec->format.bytes_per_pixel);
|
||||
GST_DEBUG_OBJECT (dec, "Allocated image data at %p", dec->imagedata);
|
||||
|
||||
@@ -791,6 +791,10 @@ vmnc_handle_packet (GstVMncDec * dec, const guint8 * data, int len,
|
||||
GST_WARNING_OBJECT (dec, "Rectangle out of range, type %d", r.type);
|
||||
return ERROR_INVALID;
|
||||
}
|
||||
+ } else if (r.width > 16384 || r.height > 16384) {
|
||||
+ GST_WARNING_OBJECT (dec, "Width or height too high: %ux%u", r.width,
|
||||
+ r.height);
|
||||
+ return ERROR_INVALID;
|
||||
}
|
||||
|
||||
switch (r.type) {
|
||||
--
|
||||
2.10.2
|
||||
|
||||
+305
@@ -0,0 +1,305 @@
|
||||
From ec66c7c584f0b41c98e93758d9b53bd6dd582df2 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Waters <matthew@centricular.com>
|
||||
Date: Tue, 22 Nov 2016 19:05:00 +1100
|
||||
Subject: [PATCH] flxdec: add some write bounds checking
|
||||
|
||||
Without checking the bounds of the frame we are writing into, we can
|
||||
write off the end of the destination buffer.
|
||||
|
||||
https://scarybeastsecurity.blogspot.dk/2016/11/0day-exploit-advancing-exploitation.html
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=774834
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
gst/flx/gstflxdec.c | 116 +++++++++++++++++++++++++++++++++++++++++-----------
|
||||
1 file changed, 91 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
|
||||
index 604be2f..d51a8e6 100644
|
||||
--- a/gst/flx/gstflxdec.c
|
||||
+++ b/gst/flx/gstflxdec.c
|
||||
@@ -74,9 +74,9 @@ static gboolean gst_flxdec_src_query_handler (GstPad * pad, GstObject * parent,
|
||||
GstQuery * query);
|
||||
|
||||
static void flx_decode_color (GstFlxDec *, guchar *, guchar *, gint);
|
||||
-static void flx_decode_brun (GstFlxDec *, guchar *, guchar *);
|
||||
-static void flx_decode_delta_fli (GstFlxDec *, guchar *, guchar *);
|
||||
-static void flx_decode_delta_flc (GstFlxDec *, guchar *, guchar *);
|
||||
+static gboolean flx_decode_brun (GstFlxDec *, guchar *, guchar *);
|
||||
+static gboolean flx_decode_delta_fli (GstFlxDec *, guchar *, guchar *);
|
||||
+static gboolean flx_decode_delta_flc (GstFlxDec *, guchar *, guchar *);
|
||||
|
||||
#define rndalign(off) ((off) + ((off) & 1))
|
||||
|
||||
@@ -203,13 +203,14 @@ gst_flxdec_sink_event_handler (GstPad * pad, GstObject * parent,
|
||||
return ret;
|
||||
}
|
||||
|
||||
-static void
|
||||
+static gboolean
|
||||
flx_decode_chunks (GstFlxDec * flxdec, gulong count, guchar * data,
|
||||
guchar * dest)
|
||||
{
|
||||
FlxFrameChunk *hdr;
|
||||
+ gboolean ret = TRUE;
|
||||
|
||||
- g_return_if_fail (data != NULL);
|
||||
+ g_return_val_if_fail (data != NULL, FALSE);
|
||||
|
||||
while (count--) {
|
||||
hdr = (FlxFrameChunk *) data;
|
||||
@@ -228,17 +229,17 @@ flx_decode_chunks (GstFlxDec * flxdec, gulong count, guchar * data,
|
||||
break;
|
||||
|
||||
case FLX_BRUN:
|
||||
- flx_decode_brun (flxdec, data, dest);
|
||||
+ ret = flx_decode_brun (flxdec, data, dest);
|
||||
data += rndalign (hdr->size) - FlxFrameChunkSize;
|
||||
break;
|
||||
|
||||
case FLX_LC:
|
||||
- flx_decode_delta_fli (flxdec, data, dest);
|
||||
+ ret = flx_decode_delta_fli (flxdec, data, dest);
|
||||
data += rndalign (hdr->size) - FlxFrameChunkSize;
|
||||
break;
|
||||
|
||||
case FLX_SS2:
|
||||
- flx_decode_delta_flc (flxdec, data, dest);
|
||||
+ ret = flx_decode_delta_flc (flxdec, data, dest);
|
||||
data += rndalign (hdr->size) - FlxFrameChunkSize;
|
||||
break;
|
||||
|
||||
@@ -256,7 +257,12 @@ flx_decode_chunks (GstFlxDec * flxdec, gulong count, guchar * data,
|
||||
data += rndalign (hdr->size) - FlxFrameChunkSize;
|
||||
break;
|
||||
}
|
||||
+
|
||||
+ if (!ret)
|
||||
+ break;
|
||||
}
|
||||
+
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -289,13 +295,13 @@ flx_decode_color (GstFlxDec * flxdec, guchar * data, guchar * dest, gint scale)
|
||||
}
|
||||
}
|
||||
|
||||
-static void
|
||||
+static gboolean
|
||||
flx_decode_brun (GstFlxDec * flxdec, guchar * data, guchar * dest)
|
||||
{
|
||||
gulong count, lines, row;
|
||||
guchar x;
|
||||
|
||||
- g_return_if_fail (flxdec != NULL);
|
||||
+ g_return_val_if_fail (flxdec != NULL, FALSE);
|
||||
|
||||
lines = flxdec->hdr.height;
|
||||
while (lines--) {
|
||||
@@ -313,12 +319,21 @@ flx_decode_brun (GstFlxDec * flxdec, guchar * data, guchar * dest)
|
||||
if (count > 0x7f) {
|
||||
/* literal run */
|
||||
count = 0x100 - count;
|
||||
+ if ((glong) row - count < 0) {
|
||||
+ GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected.");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
row -= count;
|
||||
|
||||
while (count--)
|
||||
*dest++ = *data++;
|
||||
|
||||
} else {
|
||||
+ if ((glong) row - count < 0) {
|
||||
+ GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected.");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
/* replicate run */
|
||||
row -= count;
|
||||
x = *data++;
|
||||
@@ -328,22 +343,28 @@ flx_decode_brun (GstFlxDec * flxdec, guchar * data, guchar * dest)
|
||||
}
|
||||
}
|
||||
}
|
||||
+
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
-static void
|
||||
+static gboolean
|
||||
flx_decode_delta_fli (GstFlxDec * flxdec, guchar * data, guchar * dest)
|
||||
{
|
||||
gulong count, packets, lines, start_line;
|
||||
guchar *start_p, x;
|
||||
|
||||
- g_return_if_fail (flxdec != NULL);
|
||||
- g_return_if_fail (flxdec->delta_data != NULL);
|
||||
+ g_return_val_if_fail (flxdec != NULL, FALSE);
|
||||
+ g_return_val_if_fail (flxdec->delta_data != NULL, FALSE);
|
||||
|
||||
/* use last frame for delta */
|
||||
memcpy (dest, flxdec->delta_data, flxdec->size);
|
||||
|
||||
start_line = (data[0] + (data[1] << 8));
|
||||
lines = (data[2] + (data[3] << 8));
|
||||
+ if (start_line + lines > flxdec->hdr.height) {
|
||||
+ GST_ERROR_OBJECT (flxdec, "Invalid FLI packet detected. too many lines.");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
data += 4;
|
||||
|
||||
/* start position of delta */
|
||||
@@ -356,7 +377,8 @@ flx_decode_delta_fli (GstFlxDec * flxdec, guchar * data, guchar * dest)
|
||||
|
||||
while (packets--) {
|
||||
/* skip count */
|
||||
- dest += *data++;
|
||||
+ guchar skip = *data++;
|
||||
+ dest += skip;
|
||||
|
||||
/* RLE count */
|
||||
count = *data++;
|
||||
@@ -364,12 +386,24 @@ flx_decode_delta_fli (GstFlxDec * flxdec, guchar * data, guchar * dest)
|
||||
if (count > 0x7f) {
|
||||
/* literal run */
|
||||
count = 0x100 - count;
|
||||
- x = *data++;
|
||||
|
||||
+ if (skip + count > flxdec->hdr.width) {
|
||||
+ GST_ERROR_OBJECT (flxdec, "Invalid FLI packet detected. "
|
||||
+ "line too long.");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ x = *data++;
|
||||
while (count--)
|
||||
*dest++ = x;
|
||||
|
||||
} else {
|
||||
+ if (skip + count > flxdec->hdr.width) {
|
||||
+ GST_ERROR_OBJECT (flxdec, "Invalid FLI packet detected. "
|
||||
+ "line too long.");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
/* replicate run */
|
||||
while (count--)
|
||||
*dest++ = *data++;
|
||||
@@ -378,21 +412,27 @@ flx_decode_delta_fli (GstFlxDec * flxdec, guchar * data, guchar * dest)
|
||||
start_p += flxdec->hdr.width;
|
||||
dest = start_p;
|
||||
}
|
||||
+
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
-static void
|
||||
+static gboolean
|
||||
flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest)
|
||||
{
|
||||
gulong count, lines, start_l, opcode;
|
||||
guchar *start_p;
|
||||
|
||||
- g_return_if_fail (flxdec != NULL);
|
||||
- g_return_if_fail (flxdec->delta_data != NULL);
|
||||
+ g_return_val_if_fail (flxdec != NULL, FALSE);
|
||||
+ g_return_val_if_fail (flxdec->delta_data != NULL, FALSE);
|
||||
|
||||
/* use last frame for delta */
|
||||
memcpy (dest, flxdec->delta_data, flxdec->size);
|
||||
|
||||
lines = (data[0] + (data[1] << 8));
|
||||
+ if (lines > flxdec->hdr.height) {
|
||||
+ GST_ERROR_OBJECT (flxdec, "Invalid FLC packet detected. too many lines.");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
data += 2;
|
||||
|
||||
start_p = dest;
|
||||
@@ -405,9 +445,15 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest)
|
||||
while ((opcode = (data[0] + (data[1] << 8))) & 0xc000) {
|
||||
data += 2;
|
||||
if ((opcode & 0xc000) == 0xc000) {
|
||||
- /* skip count */
|
||||
- start_l += (0x10000 - opcode);
|
||||
- dest += flxdec->hdr.width * (0x10000 - opcode);
|
||||
+ /* line skip count */
|
||||
+ gulong skip = (0x10000 - opcode);
|
||||
+ if (skip > flxdec->hdr.height) {
|
||||
+ GST_ERROR_OBJECT (flxdec, "Invalid FLC packet detected. "
|
||||
+ "skip line count too big.");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+ start_l += skip;
|
||||
+ dest += flxdec->hdr.width * skip;
|
||||
} else {
|
||||
/* last pixel */
|
||||
dest += flxdec->hdr.width;
|
||||
@@ -419,7 +465,8 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest)
|
||||
/* last opcode is the packet count */
|
||||
while (opcode--) {
|
||||
/* skip count */
|
||||
- dest += *data++;
|
||||
+ guchar skip = *data++;
|
||||
+ dest += skip;
|
||||
|
||||
/* RLE count */
|
||||
count = *data++;
|
||||
@@ -427,12 +474,25 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest)
|
||||
if (count > 0x7f) {
|
||||
/* replicate word run */
|
||||
count = 0x100 - count;
|
||||
+
|
||||
+ if (skip + count > flxdec->hdr.width) {
|
||||
+ GST_ERROR_OBJECT (flxdec, "Invalid FLC packet detected. "
|
||||
+ "line too long.");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
while (count--) {
|
||||
*dest++ = data[0];
|
||||
*dest++ = data[1];
|
||||
}
|
||||
data += 2;
|
||||
} else {
|
||||
+ if (skip + count > flxdec->hdr.width) {
|
||||
+ GST_ERROR_OBJECT (flxdec, "Invalid FLC packet detected. "
|
||||
+ "line too long.");
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
/* literal word run */
|
||||
while (count--) {
|
||||
*dest++ = *data++;
|
||||
@@ -442,6 +502,8 @@ flx_decode_delta_flc (GstFlxDec * flxdec, guchar * data, guchar * dest)
|
||||
}
|
||||
lines--;
|
||||
}
|
||||
+
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
static GstFlowReturn
|
||||
@@ -571,9 +633,13 @@ gst_flxdec_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
|
||||
out = gst_buffer_new_and_alloc (flxdec->size * 4);
|
||||
|
||||
/* decode chunks */
|
||||
- flx_decode_chunks (flxdec,
|
||||
- ((FlxFrameType *) chunk)->chunks,
|
||||
- chunk + FlxFrameTypeSize, flxdec->frame_data);
|
||||
+ if (!flx_decode_chunks (flxdec,
|
||||
+ ((FlxFrameType *) chunk)->chunks,
|
||||
+ chunk + FlxFrameTypeSize, flxdec->frame_data)) {
|
||||
+ GST_ELEMENT_ERROR (flxdec, STREAM, DECODE,
|
||||
+ ("%s", "Could not decode chunk"), NULL);
|
||||
+ return GST_FLOW_ERROR;
|
||||
+ }
|
||||
|
||||
/* save copy of the current frame for possible delta. */
|
||||
memcpy (flxdec->delta_data, flxdec->frame_data, flxdec->size);
|
||||
--
|
||||
2.10.2
|
||||
|
||||
+50
@@ -0,0 +1,50 @@
|
||||
From af7f70e60e364b551c2589dee5fb458a83fa0e7e Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Waters <matthew@centricular.com>
|
||||
Date: Tue, 22 Nov 2016 23:46:00 +1100
|
||||
Subject: [PATCH] flxdec: fix some warnings comparing unsigned < 0
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
bf43f44fcfada5ec4a3ce60cb374340486fe9fac was comparing an unsigned
|
||||
expression to be < 0 which was always false.
|
||||
|
||||
gstflxdec.c: In function ‘flx_decode_brun’:
|
||||
gstflxdec.c:322:33: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]
|
||||
if ((glong) row - count < 0) {
|
||||
^
|
||||
gstflxdec.c:332:33: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]
|
||||
if ((glong) row - count < 0) {
|
||||
^
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=774834
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
gst/flx/gstflxdec.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
|
||||
index d51a8e6..e675c99 100644
|
||||
--- a/gst/flx/gstflxdec.c
|
||||
+++ b/gst/flx/gstflxdec.c
|
||||
@@ -319,7 +319,7 @@ flx_decode_brun (GstFlxDec * flxdec, guchar * data, guchar * dest)
|
||||
if (count > 0x7f) {
|
||||
/* literal run */
|
||||
count = 0x100 - count;
|
||||
- if ((glong) row - count < 0) {
|
||||
+ if ((glong) row - (glong) count < 0) {
|
||||
GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected.");
|
||||
return FALSE;
|
||||
}
|
||||
@@ -329,7 +329,7 @@ flx_decode_brun (GstFlxDec * flxdec, guchar * data, guchar * dest)
|
||||
*dest++ = *data++;
|
||||
|
||||
} else {
|
||||
- if ((glong) row - count < 0) {
|
||||
+ if ((glong) row - (glong) count < 0) {
|
||||
GST_ERROR_OBJECT (flxdec, "Invalid BRUN packet detected.");
|
||||
return FALSE;
|
||||
}
|
||||
--
|
||||
2.10.2
|
||||
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
From 1b574eddf789a59aff11ee0b6eb3fe1af288ff06 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
|
||||
Date: Wed, 23 Nov 2016 11:20:49 +0200
|
||||
Subject: [PATCH] flxdec: Don't unref() parent in the chain function
|
||||
|
||||
We don't own the reference here, it is owned by the caller and given to
|
||||
us for the scope of this function. Leftover mistake from 0.10 porting.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=774897
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
gst/flx/gstflxdec.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
|
||||
index e675c99..a237976 100644
|
||||
--- a/gst/flx/gstflxdec.c
|
||||
+++ b/gst/flx/gstflxdec.c
|
||||
@@ -677,7 +677,6 @@ wrong_type:
|
||||
{
|
||||
GST_ELEMENT_ERROR (flxdec, STREAM, WRONG_TYPE, (NULL),
|
||||
("not a flx file (type %x)", flxh->type));
|
||||
- gst_object_unref (flxdec);
|
||||
return GST_FLOW_ERROR;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.10.2
|
||||
|
||||
+1039
File diff suppressed because it is too large
Load Diff
@@ -1,2 +1,2 @@
|
||||
# From http://www.imagemagick.org/download/releases/digest.rdf
|
||||
sha256 86a1f04077de2b1486a93088030b010780067b25ab0284560435e2f458e247ca ImageMagick-7.0.3-4.tar.xz
|
||||
sha256 dc128b281c255d71d754934408d278b3ca314253103ca2501cd0b8d5ec98db74 ImageMagick-7.0.3-8.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IMAGEMAGICK_VERSION = 7.0.3-4
|
||||
IMAGEMAGICK_VERSION = 7.0.3-8
|
||||
IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz
|
||||
IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases
|
||||
IMAGEMAGICK_LICENSE = Apache-2.0
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 6c942ae79108cd6a359e5bc34ea03565bd33ac20f6814cb09c4f92298b6b1cb8 jasper-1.900.22.tar.gz
|
||||
sha256 0099084dce9fa0a318b48a5ed2a12ac7cff3324f3fd4459833e6fe2ff583fb2c jasper-version-1.900.31.tar.gz
|
||||
|
||||
@@ -4,12 +4,16 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
JASPER_VERSION = 1.900.22
|
||||
JASPER_SITE = http://www.ece.uvic.ca/~frodo/jasper/software
|
||||
JASPER_VERSION = version-1.900.31
|
||||
JASPER_SITE = $(call github,mdadams,jasper,$(JASPER_VERSION))
|
||||
JASPER_INSTALL_STAGING = YES
|
||||
JASPER_DEPENDENCIES = jpeg
|
||||
JASPER_LICENSE = JasPer License Version 2.0
|
||||
JASPER_LICENSE_FILES = LICENSE
|
||||
|
||||
# No configure script included. We need to generate it.
|
||||
JASPER_AUTORECONF = YES
|
||||
|
||||
JASPER_CONF_OPTS = --disable-strict
|
||||
|
||||
# Xtensa gcc is unable to generate correct code with -O0 enabled by
|
||||
|
||||
@@ -4,7 +4,9 @@ config BR2_PACKAGE_KVM_UNIT_TESTS
|
||||
# on i386 and x86-64, __builtin_reachable is used, so we need
|
||||
# gcc 4.5 at least. on i386, we use the target gcc, while on
|
||||
# x86-64 we use the host gcc (see .mk file for details)
|
||||
depends on BR2_arm || \
|
||||
# On ARM, it uses virtualization extensions
|
||||
depends on BR2_cortex_a7 || BR2_cortex_a12 || \
|
||||
BR2_cortex_a15 || BR2_cortex_a17 || \
|
||||
(BR2_i386 && BR2_TOOLCHAIN_GCC_AT_LEAST_4_5) || \
|
||||
BR2_powerpc64 || \
|
||||
BR2_powerpc64le || \
|
||||
|
||||
@@ -28,6 +28,7 @@ endif
|
||||
|
||||
KVM_UNIT_TESTS_CONF_OPTS =\
|
||||
--arch="$(KVM_UNIT_TESTS_ARCH)" \
|
||||
--processor="$(call qstrip,$(BR2_GCC_TARGET_CPU))" \
|
||||
--endian="$(KVM_UNIT_TESTS_ENDIAN)"
|
||||
|
||||
# For all architectures but x86-64, we use the target
|
||||
|
||||
@@ -15,7 +15,7 @@ LIBFRIBIDI_INSTALL_STAGING = YES
|
||||
LIBFRIBIDI_AUTORECONF = YES
|
||||
LIBFRIBIDI_DEPENDENCIES = host-pkgconf
|
||||
# libglib2 dependency causes a build failure, and this optional
|
||||
# dependency is going to be removed usptream, see
|
||||
# dependency is going to be removed upstream, see
|
||||
# https://github.com/behdad/fribidi/pull/14
|
||||
LIBFRIBIDI_CONF_OPTS = --with-glib=no
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
config BR2_PACKAGE_LIBUV
|
||||
bool "libuv"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_barrier_*
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on !BR2_STATIC_LIBS
|
||||
help
|
||||
@@ -9,6 +9,6 @@ config BR2_PACKAGE_LIBUV
|
||||
|
||||
https://github.com/libuv/libuv
|
||||
|
||||
comment "libuv needs a toolchain w/ threads, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
comment "libuv needs a toolchain w/ NPTL, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
@@ -223,7 +223,7 @@ endchoice
|
||||
|
||||
config BR2_DEFAULT_KERNEL_HEADERS
|
||||
string
|
||||
default "3.2.83" if BR2_KERNEL_HEADERS_3_2
|
||||
default "3.2.84" if BR2_KERNEL_HEADERS_3_2
|
||||
default "3.4.113" if BR2_KERNEL_HEADERS_3_4
|
||||
default "3.10.104" if BR2_KERNEL_HEADERS_3_10
|
||||
default "3.12.67" if BR2_KERNEL_HEADERS_3_12
|
||||
@@ -232,9 +232,9 @@ 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.35" if BR2_KERNEL_HEADERS_4_1
|
||||
default "4.4.31" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.4.35" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.5.7" if BR2_KERNEL_HEADERS_4_5
|
||||
default "4.6.7" if BR2_KERNEL_HEADERS_4_6
|
||||
default "4.7.10" if BR2_KERNEL_HEADERS_4_7
|
||||
default "4.8.7" if BR2_KERNEL_HEADERS_4_8
|
||||
default "4.8.11" if BR2_KERNEL_HEADERS_4_8
|
||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
config BR2_PACKAGE_LUV
|
||||
bool "luv"
|
||||
select BR2_PACKAGE_LIBUV
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libuv
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
|
||||
depends on BR2_USE_MMU # libuv
|
||||
depends on !BR2_STATIC_LIBS # libuv
|
||||
help
|
||||
@@ -9,6 +9,6 @@ config BR2_PACKAGE_LUV
|
||||
|
||||
https://github.com/luvit/luv
|
||||
|
||||
comment "luv needs a toolchain w/ threads, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
comment "luv needs a toolchain w/ NPTL, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
config BR2_PACKAGE_LUVI
|
||||
bool "luvi"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libuv
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
|
||||
depends on BR2_USE_MMU # libuv
|
||||
depends on !BR2_STATIC_LIBS # libuv
|
||||
depends on BR2_PACKAGE_LUAJIT
|
||||
@@ -22,8 +22,8 @@ config BR2_PACKAGE_LUVI
|
||||
|
||||
https://github.com/luvit/luvi
|
||||
|
||||
comment "luvi needs a toolchain w/ threads, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
comment "luvi needs a toolchain w/ NPTL, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
comment "luvi needs LuaJIT"
|
||||
|
||||
@@ -601,7 +601,6 @@ int main(int argc, char **argv)
|
||||
dev_t rdev;
|
||||
unsigned i;
|
||||
char *full_name_inc;
|
||||
struct stat st;
|
||||
|
||||
if (type == 'p') {
|
||||
mode |= S_IFIFO;
|
||||
@@ -623,23 +622,10 @@ int main(int argc, char **argv)
|
||||
for (i = start; i <= start + count; i++) {
|
||||
sprintf(full_name_inc, count ? "%s%u" : "%s", full_name, i);
|
||||
rdev = makedev(major, minor + (i - start) * increment);
|
||||
if (stat(full_name_inc, &st) == 0) {
|
||||
if ((mode & S_IFMT) != (st.st_mode & S_IFMT)) {
|
||||
bb_error_msg("line %d: node %s exists but is of wrong file type", linenum, full_name_inc);
|
||||
ret = EXIT_FAILURE;
|
||||
continue;
|
||||
}
|
||||
if (st.st_rdev != rdev) {
|
||||
bb_error_msg("line %d: node %s exists but is wrong device number", linenum, full_name_inc);
|
||||
ret = EXIT_FAILURE;
|
||||
continue;
|
||||
}
|
||||
} else if (mknod(full_name_inc, mode, rdev) < 0) {
|
||||
if (mknod(full_name_inc, mode, rdev) < 0) {
|
||||
bb_perror_msg("line %d: can't create node %s", linenum, full_name_inc);
|
||||
ret = EXIT_FAILURE;
|
||||
continue;
|
||||
}
|
||||
if (chown(full_name_inc, uid, gid) < 0) {
|
||||
} else if (chown(full_name_inc, uid, gid) < 0) {
|
||||
bb_perror_msg("line %d: can't chown %s", linenum, full_name_inc);
|
||||
ret = EXIT_FAILURE;
|
||||
} else if (chmod(full_name_inc, mode) < 0) {
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 60ee5191a0c074251862a15b12afdc9db0b2df38 Mon Sep 17 00:00:00 2001
|
||||
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Date: Thu, 17 Nov 2016 15:36:54 -0300
|
||||
Subject: [PATCH] configure.ac: invert order for wayland-scanner check
|
||||
|
||||
When cross-compiling the .pc file might point to the wrong
|
||||
wayland-scanner binary (target rather than host) resulting in a
|
||||
non-executable and wrong scanner.
|
||||
Try searching the PATH first, and if that fails fall back into
|
||||
pkg-config.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
---
|
||||
configure.ac | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5f30ae8..461792e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2025,11 +2025,11 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then
|
||||
AC_MSG_ERROR([cannot build egl state tracker without EGL library])
|
||||
fi
|
||||
|
||||
-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
|
||||
- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
|
||||
- WAYLAND_SCANNER='')
|
||||
+AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
|
||||
if test "x$WAYLAND_SCANNER" = x; then
|
||||
- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
|
||||
+ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
|
||||
+ WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
|
||||
+ WAYLAND_SCANNER='')
|
||||
fi
|
||||
|
||||
# Do per-EGL platform setups and checks
|
||||
--
|
||||
2.7.3
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
config BR2_PACKAGE_MOARVM
|
||||
bool "moarvm"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libuv
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
|
||||
depends on !BR2_STATIC_LIBS # libuv
|
||||
depends on BR2_USE_MMU # libuv
|
||||
depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # libatomic_ops
|
||||
@@ -15,8 +15,8 @@ config BR2_PACKAGE_MOARVM
|
||||
|
||||
http://moarvm.com
|
||||
|
||||
comment "moarvm needs a toolchain w/ threads, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
comment "moarvm 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_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS
|
||||
depends on !BR2_sparc64 && !BR2_sparc
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
mpfr-longlong.h: Fix obsolete ARC asm constraints
|
||||
|
||||
This patch replaces obsolete ARC "J" asm constraint with
|
||||
up-to-date "Cal" constraint.
|
||||
The patch should be applied to upstream "mpfr" library and
|
||||
after that it should be removed from buildroot as soon as
|
||||
mpfr version with current fix will come up.
|
||||
|
||||
Signed-off-by: Vlad Zakharov <vzakhar@synopsys.com>
|
||||
Signed-off-by: Claudiu Zissulescu <claziss@synopsys.com>
|
||||
---
|
||||
Index: /src/mpfr-longlong.h
|
||||
===================================================================
|
||||
--- /src/mpfr-longlong.h (revision 10963)
|
||||
+++ /src/mpfr-longlong.h (working copy)
|
||||
@@ -416,17 +416,17 @@
|
||||
: "=r" (sh), \
|
||||
"=&r" (sl) \
|
||||
: "r" ((USItype) (ah)), \
|
||||
- "rIJ" ((USItype) (bh)), \
|
||||
+ "rICal" ((USItype) (bh)), \
|
||||
"%r" ((USItype) (al)), \
|
||||
- "rIJ" ((USItype) (bl)))
|
||||
+ "rICal" ((USItype) (bl)))
|
||||
#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
|
||||
__asm__ ("sub.f\t%1, %4, %5\n\tsbc\t%0, %2, %3" \
|
||||
: "=r" (sh), \
|
||||
"=&r" (sl) \
|
||||
: "r" ((USItype) (ah)), \
|
||||
- "rIJ" ((USItype) (bh)), \
|
||||
+ "rICal" ((USItype) (bh)), \
|
||||
"r" ((USItype) (al)), \
|
||||
- "rIJ" ((USItype) (bl)))
|
||||
+ "rICal" ((USItype) (bl)))
|
||||
#endif
|
||||
|
||||
#if defined (__arm__) && (defined (__thumb2__) || !defined (__thumb__)) \
|
||||
@@ -6,6 +6,9 @@ config BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
|
||||
|| BR2_m68k || BR2_microblaze || BR2_nios2)
|
||||
# Broken support for <ARMv5
|
||||
depends on !BR2_ARM_CPU_ARMV4
|
||||
# configure script barfs on the -Wl,-elf2flt we add in the toolchain
|
||||
# wrapper, so just disable completely for FLAT
|
||||
depends on !BR2_BINFMT_FLAT
|
||||
|
||||
config BR2_PACKAGE_MPLAYER
|
||||
bool "mplayer"
|
||||
|
||||
@@ -3,6 +3,7 @@ config BR2_PACKAGE_MPV
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
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
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
select BR2_PACKAGE_FFMPEG
|
||||
select BR2_PACKAGE_FFMPEG_SWSCALE
|
||||
@@ -17,5 +18,6 @@ config BR2_PACKAGE_MPV
|
||||
|
||||
comment "mpv needs a toolchain w/ threads, gcc >= 4.5"
|
||||
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
|
||||
|
||||
@@ -28,6 +28,20 @@ else
|
||||
NTP_CONF_OPTS += --without-crypto --disable-openssl-random
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
NTP_CONF_OPTS += --enable-linuxcaps
|
||||
NTP_DEPENDENCIES += libcap
|
||||
else
|
||||
NTP_CONF_OPTS += --disable-linuxcaps
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBEDIT),y)
|
||||
NTP_CONF_OPTS += --with-lineeditlibs=edit
|
||||
NTP_DEPENDENCIES += libedit
|
||||
else
|
||||
NTP_CONF_OPTS += --without-lineeditlibs
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NTP_NTPSNMPD),y)
|
||||
NTP_CONF_OPTS += \
|
||||
--with-net-snmp-config=$(STAGING_DIR)/usr/bin/net-snmp-config
|
||||
|
||||
@@ -54,6 +54,8 @@ config BR2_PACKAGE_OLA_EXAMPLES
|
||||
config BR2_PACKAGE_OLA_RDM_TESTS
|
||||
bool "rdm tests"
|
||||
depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS
|
||||
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
|
||||
select BR2_PACKAGE_PYTHON_NUMPY
|
||||
help
|
||||
Build OLA RDM tests.
|
||||
|
||||
|
||||
@@ -87,6 +87,11 @@ endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y)
|
||||
OLA_CONF_OPTS += --enable-rdm-tests
|
||||
OLA_DEPENDENCIES += python-numpy
|
||||
# needed as numpy builds some shared libraries and ola checks for
|
||||
# numpy using a host python test program which fails with 'wrong ELF
|
||||
# class'.
|
||||
OLA_CONF_ENV = ac_cv_have_pymod_numpy=yes
|
||||
else
|
||||
OLA_CONF_OPTS += --disable-rdm-tests
|
||||
endif
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
config BR2_PACKAGE_OLSR
|
||||
bool "olsrd"
|
||||
bool "olsr"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS
|
||||
|
||||
@@ -31,6 +31,9 @@ else
|
||||
OPENBLAS_MAKE_OPTS += USE_THREAD=0
|
||||
endif
|
||||
|
||||
# We don't know if OpenMP is available or not, so disable
|
||||
OPENBLAS_MAKE_OPTS += USE_OPENMP=0
|
||||
|
||||
# Static-only/Shared-only toggle
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
OPENBLAS_MAKE_OPTS += NO_SHARED=1
|
||||
|
||||
@@ -17,56 +17,56 @@ Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
||||
1 file changed, 21 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
|
||||
index d1e68ca..225f51d 100644
|
||||
index cb24b43b58e2..cd6a5e1391b0 100644
|
||||
--- a/thirdparty/CMakeLists.txt
|
||||
+++ b/thirdparty/CMakeLists.txt
|
||||
@@ -1,5 +1,9 @@
|
||||
# 3rd party libs
|
||||
|
||||
+IF(NOT BUILD_THIRDPARTY)
|
||||
+if(NOT BUILD_THIRDPARTY)
|
||||
+ include(FindPkgConfig)
|
||||
+ENDIF(NOT BUILD_THIRDPARTY)
|
||||
+endif(NOT BUILD_THIRDPARTY)
|
||||
+
|
||||
#------------
|
||||
# Try to find lib Z
|
||||
IF(BUILD_THIRDPARTY)
|
||||
@@ -35,6 +39,9 @@ IF(BUILD_THIRDPARTY)
|
||||
SET(PNG_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libpng PARENT_SCOPE)
|
||||
ELSE (BUILD_THIRDPARTY)
|
||||
IF (ZLIB_FOUND)
|
||||
if(BUILD_THIRDPARTY)
|
||||
@@ -36,6 +40,9 @@ if(BUILD_THIRDPARTY)
|
||||
else(BUILD_THIRDPARTY)
|
||||
if(ZLIB_FOUND)
|
||||
find_package(PNG)
|
||||
+ # Static only build:
|
||||
+ # it is not necessary to invoke pkg_check_module on libpng, because libpng
|
||||
+ # only depends on zlib, which is already checked.
|
||||
FIND_PACKAGE(PNG)
|
||||
IF(PNG_FOUND)
|
||||
if(PNG_FOUND)
|
||||
message(STATUS "Your system seems to have a PNG lib available, we will use it")
|
||||
@@ -66,12 +73,24 @@ IF(BUILD_THIRDPARTY)
|
||||
SET(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE)
|
||||
ELSE (BUILD_THIRDPARTY)
|
||||
FIND_PACKAGE(TIFF)
|
||||
set(OPJ_HAVE_PNG_H 1 PARENT_SCOPE)
|
||||
@@ -66,12 +73,24 @@ if(BUILD_THIRDPARTY)
|
||||
set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE)
|
||||
else(BUILD_THIRDPARTY)
|
||||
find_package(TIFF)
|
||||
+ # Static only build:
|
||||
+ # it is necessary to invoke pkg_check_module on libtiff since it may have
|
||||
+ # several other dependencies not declared by its cmake module, but they are
|
||||
+ # in the its pkgconfig module.
|
||||
+ IF(PKG_CONFIG_FOUND)
|
||||
+ FOREACH(pc_tiff_module tiff tiff3 tiff4 tiff-3 tiff-4 libtiff libtiff3 libtiff4 libtiff-3 libtiff-4)
|
||||
+ if(PKG_CONFIG_FOUND)
|
||||
+ foreach(pc_tiff_module tiff tiff3 tiff4 tiff-3 tiff-4 libtiff libtiff3 libtiff4 libtiff-3 libtiff-4)
|
||||
+ pkg_check_modules(PC_TIFF QUIET ${pc_tiff_module})
|
||||
+ IF(PC_TIFF_FOUND)
|
||||
+ if(PC_TIFF_FOUND)
|
||||
+ break()
|
||||
+ ENDIF(PC_TIFF_FOUND)
|
||||
+ ENDFOREACH()
|
||||
+ ENDIF(PKG_CONFIG_FOUND)
|
||||
IF(TIFF_FOUND)
|
||||
+ endif(PC_TIFF_FOUND)
|
||||
+ endforeach()
|
||||
+ endif(PKG_CONFIG_FOUND)
|
||||
if(TIFF_FOUND)
|
||||
message(STATUS "Your system seems to have a TIFF lib available, we will use it")
|
||||
SET(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE)
|
||||
SET(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE)
|
||||
- SET(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE)
|
||||
- SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE)
|
||||
+ SET(TIFF_LIBNAME ${TIFF_LIBRARIES} ${PC_TIFF_STATIC_LIBRARIES} PARENT_SCOPE)
|
||||
+ SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} ${PC_TIFF_STATIC_INCLUDE_DIRS} PARENT_SCOPE)
|
||||
ELSE (TIFF_FOUND) # not found
|
||||
SET(OPJ_HAVE_TIFF_H 0 PARENT_SCOPE)
|
||||
SET(OPJ_HAVE_LIBTIFF 0 PARENT_SCOPE)
|
||||
set(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE)
|
||||
set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE)
|
||||
- set(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE)
|
||||
- set(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE)
|
||||
+ set(TIFF_LIBNAME ${TIFF_LIBRARIES} ${PC_TIFF_STATIC_LIBRARIES} PARENT_SCOPE)
|
||||
+ set(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} ${PC_TIFF_STATIC_INCLUDE_DIRS} PARENT_SCOPE)
|
||||
else(TIFF_FOUND) # not found
|
||||
set(OPJ_HAVE_TIFF_H 0 PARENT_SCOPE)
|
||||
set(OPJ_HAVE_LIBTIFF 0 PARENT_SCOPE)
|
||||
--
|
||||
2.10.2
|
||||
|
||||
|
||||
@@ -7,9 +7,11 @@ Subject: [PATCH] thirdparty: lcms2: append flags found by pkg-config if
|
||||
This change allows to get all required CFLAGS/LDFLAGS in case of static only
|
||||
build.
|
||||
|
||||
Fixes a buildroot build failure (see [1]).
|
||||
Fixes a buildroot build failure (see [1], [2] and [3]).
|
||||
|
||||
[1] http://autobuild.buildroot.net/results/5ce/5cee20afd8bef5268832cddcb3a5270746be7a57
|
||||
[2] http://lists.busybox.net/pipermail/buildroot/2016-November/177187.html
|
||||
[3] http://lists.busybox.net/pipermail/buildroot/2016-November/177188.html
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
@@ -17,31 +19,31 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
1 file changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
|
||||
index 225f51d..42770ad 100644
|
||||
index cd6a5e1391b0..a3a8494d89b1 100644
|
||||
--- a/thirdparty/CMakeLists.txt
|
||||
+++ b/thirdparty/CMakeLists.txt
|
||||
@@ -113,12 +113,19 @@ IF( BUILD_THIRDPARTY)
|
||||
SET(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
|
||||
ELSE (BUILD_THIRDPARTY)
|
||||
FIND_PACKAGE(LCMS2)
|
||||
@@ -113,12 +113,19 @@ if( BUILD_THIRDPARTY)
|
||||
set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
|
||||
else(BUILD_THIRDPARTY)
|
||||
find_package(LCMS2)
|
||||
+ # Static only build:
|
||||
+ # it is necessary to invoke pkg_check_module on lcms2 since it may have
|
||||
+ # several other dependencies not declared by its cmake module, but they are
|
||||
+ # in the its pkgconfig module.
|
||||
+ IF(PKG_CONFIG_FOUND)
|
||||
+ if(PKG_CONFIG_FOUND)
|
||||
+ pkg_check_modules(PC_LCMS2 QUIET lcms2)
|
||||
+ ENDIF(PKG_CONFIG_FOUND)
|
||||
IF(LCMS2_FOUND)
|
||||
+ endif(PKG_CONFIG_FOUND)
|
||||
if(LCMS2_FOUND)
|
||||
message(STATUS "Your system seems to have a LCMS2 lib available, we will use it")
|
||||
SET(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE)
|
||||
SET(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
|
||||
- SET(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE)
|
||||
- SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE)
|
||||
+ SET(LCMS_LIBNAME ${LCMS2_LIBRARIES} ${PC_LCMS2_STATIC_LIBRARIES} PARENT_SCOPE)
|
||||
+ SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} ${PC_LCMS2_STATIC_INCLUDE_DIRS} PARENT_SCOPE)
|
||||
ELSE (LCMS2_FOUND) # not found lcms2
|
||||
set(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE)
|
||||
set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
|
||||
- set(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE)
|
||||
- set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE)
|
||||
+ set(LCMS_LIBNAME ${LCMS2_LIBRARIES} ${PC_LCMS2_STATIC_LIBRARIES} PARENT_SCOPE)
|
||||
+ set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} ${PC_LCMS2_STATIC_INCLUDE_DIRS} PARENT_SCOPE)
|
||||
else(LCMS2_FOUND) # not found lcms2
|
||||
# try to find LCMS
|
||||
FIND_PACKAGE(LCMS)
|
||||
find_package(LCMS)
|
||||
--
|
||||
2.8.1
|
||||
2.10.2
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 4afc996cd5e0d16360d71c58216950bcb4ce29a3272360eb29cadb1c8bce4efc openjpeg-2.1.tar.gz
|
||||
sha256 4ce77b6ef538ef090d9bde1d5eeff8b3069ab56c4906f083475517c2c023dfa7 openjpeg-2.1.2.tar.gz
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENJPEG_VERSION = 2.1
|
||||
OPENJPEG_SITE = $(call github,uclouvain,openjpeg,version.$(OPENJPEG_VERSION))
|
||||
OPENJPEG_VERSION = 2.1.2
|
||||
OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION))
|
||||
OPENJPEG_LICENSE = BSD-2c
|
||||
OPENJPEG_LICENSE_FILES = LICENSE
|
||||
OPENJPEG_INSTALL_STAGING = YES
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From ec165c392ca54317dbe3064a8c200de6531e89ad Mon Sep 17 00:00:00 2001
|
||||
From: "markus@openbsd.org" <markus@openbsd.org>
|
||||
Date: Mon, 10 Oct 2016 19:28:48 +0000
|
||||
Subject: [PATCH] upstream commit
|
||||
|
||||
Unregister the KEXINIT handler after message has been
|
||||
received. Otherwise an unauthenticated peer can repeat the KEXINIT and cause
|
||||
allocation of up to 128MB -- until the connection is closed. Reported by
|
||||
shilei-c at 360.cn
|
||||
|
||||
Upstream-ID: 43649ae12a27ef94290db16d1a98294588b75c05
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Patch status: upstream
|
||||
|
||||
kex.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kex.c b/kex.c
|
||||
index 3f97f8c..6a94bc5 100644
|
||||
--- a/kex.c
|
||||
+++ b/kex.c
|
||||
@@ -481,6 +481,7 @@ kex_input_kexinit(int type, u_int32_t seq, void *ctxt)
|
||||
if (kex == NULL)
|
||||
return SSH_ERR_INVALID_ARGUMENT;
|
||||
|
||||
+ ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
|
||||
ptr = sshpkt_ptr(ssh, &dlen);
|
||||
if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
|
||||
return r;
|
||||
@@ -13,7 +13,7 @@ POSTGRESQL_INSTALL_STAGING = YES
|
||||
POSTGRESQL_CONFIG_SCRIPTS = pg_config
|
||||
POSTGRESQL_CONF_ENV = \
|
||||
ac_cv_type_struct_sockaddr_in6=yes \
|
||||
pgac_cv_snprintf_long_long_int_modifier="%lld" \
|
||||
pgac_cv_snprintf_long_long_int_modifier="ll" \
|
||||
pgac_cv_snprintf_size_t_support=yes
|
||||
POSTGRESQL_CONF_OPTS = --disable-rpath
|
||||
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ "${0##*/}" = "fakeroot" ]; then
|
||||
cat >&2 <<-_EOF_
|
||||
WARNING: fakeroot has been replaced with pseudo.
|
||||
WARNING: Update your script(s) to use pseudo or pseudo-wrapper instead.
|
||||
_EOF_
|
||||
fi
|
||||
|
||||
export PSEUDO_PREFIX="$(dirname "${0%/*}")"
|
||||
export PSEUDO_OPTS="-t0"
|
||||
if [ -n "${TARGET_DIR}" ]; then
|
||||
export PSEUDO_PASSWD="${TARGET_DIR}"
|
||||
fi
|
||||
if [ -n "${BASE_DIR}" ]; then
|
||||
export PSEUDO_LOCALSTATEDIR="${BASE_DIR}/build/.pseudodb"
|
||||
fi
|
||||
|
||||
exec "${0%/*}/pseudo" "${@}"
|
||||
@@ -26,15 +26,4 @@ HOST_PSEUDO_CONF_OPTS = \
|
||||
--libdir=$(HOST_DIR)/usr/lib \
|
||||
--with-sqlite=$(HOST_DIR)/usr
|
||||
|
||||
define HOST_PSEUDO_INSTALL_WRAPPER
|
||||
$(INSTALL) -D -m 0755 $(HOST_PSEUDO_PKGDIR)/pseudo-wrapper \
|
||||
$(HOST_DIR)/usr/bin/pseudo-wrapper
|
||||
endef
|
||||
HOST_PSEUDO_POST_INSTALL_HOOKS += HOST_PSEUDO_INSTALL_WRAPPER
|
||||
|
||||
define HOST_PSEUDO_FAKEROOT_SYMLINK
|
||||
ln -sf pseudo-wrapper $(HOST_DIR)/usr/bin/fakeroot
|
||||
endef
|
||||
HOST_PSEUDO_POST_INSTALL_HOOKS += HOST_PSEUDO_FAKEROOT_SYMLINK
|
||||
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
@@ -24,6 +24,12 @@ else
|
||||
PTPD2_CONF_OPTS += --disable-snmp
|
||||
endif
|
||||
|
||||
# GCC bug with Os/O1/O2/O3
|
||||
# internal compiler error: in gen_add2_insn, at optabs.c:4454
|
||||
ifeq ($(BR2_bfin),y)
|
||||
PTPD2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O0"
|
||||
endif
|
||||
|
||||
define PTPD2_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -m 755 -D package/ptpd2/S65ptpd2 \
|
||||
$(TARGET_DIR)/etc/init.d/S65ptpd2
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
From: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
|
||||
Subject: [PATCH] Add an option to disable openssl support.
|
||||
|
||||
Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
|
||||
---
|
||||
configure.ac | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3027,6 +3027,12 @@
|
||||
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata"
|
||||
fi])
|
||||
|
||||
+AC_ARG_ENABLE(openssl,
|
||||
+ AS_HELP_STRING([--disable-openssl], [disable openssl support]),
|
||||
+ [ if test "$enableval" = "no"; then
|
||||
+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib"
|
||||
+ fi])
|
||||
+
|
||||
AC_SUBST(TK)
|
||||
AC_ARG_ENABLE(tk,
|
||||
AS_HELP_STRING([--disable-tk], [disable tk]),
|
||||
@@ -36,7 +36,8 @@ HOST_PYTHON3_CONF_OPTS += \
|
||||
--enable-unicodedata \
|
||||
--disable-test-modules \
|
||||
--disable-idle3 \
|
||||
--disable-ossaudiodev
|
||||
--disable-ossaudiodev \
|
||||
--disable-openssl
|
||||
|
||||
# Make sure that LD_LIBRARY_PATH overrides -rpath.
|
||||
# This is needed because libpython may be installed at the same time that
|
||||
|
||||
@@ -34,6 +34,8 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-p
|
||||
# mips64 mips64
|
||||
# mips64el mips64el
|
||||
# powerpc ppc
|
||||
# powerpc64 ppc64
|
||||
# powerpc64le ppc64le
|
||||
# sh2a not supported
|
||||
# sh4 sh4
|
||||
# sh4eb sh4eb
|
||||
@@ -55,6 +57,12 @@ endif
|
||||
ifeq ($(HOST_QEMU_ARCH),powerpc)
|
||||
HOST_QEMU_ARCH = ppc
|
||||
endif
|
||||
ifeq ($(HOST_QEMU_ARCH),powerpc64)
|
||||
HOST_QEMU_ARCH = ppc64
|
||||
endif
|
||||
ifeq ($(HOST_QEMU_ARCH),powerpc64le)
|
||||
HOST_QEMU_ARCH = ppc64le
|
||||
endif
|
||||
ifeq ($(HOST_QEMU_ARCH),sh4a)
|
||||
HOST_QEMU_ARCH = sh4
|
||||
endif
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user