summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-core
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-05-29 23:52:06 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-06-02 04:02:52 +0300
commit2ee498a2ac22fe5c3eb083ef883628f319b86421 (patch)
treed928eb6bc306c7571f58fd58f9c0b1b94db4f9f7 /meta-openembedded/meta-oe/recipes-core
parent8f7ab9e8f3c2d9ac9992f31fbda4678742d1c5c3 (diff)
downloadopenbmc-2ee498a2ac22fe5c3eb083ef883628f319b86421.tar.xz
meta-openembedded: subtree update:7c02c7d411..713e70bd25
Adam Miartus (1): toybox: bump version to 0.8.3 Adrian Bunk (7): libhandy: Remove, moved to OE-core unicode-ucd: Stop broken license downloading python3-docutils: Remove, moved to OE-core python3-dbusmock: Remove, moved to OE-core python3-cython: Remove, moved to OE-core python3-pyparsing: Remove, moved to OE-core postfix: Upgrade 3.4.10 -> 3.4.12 Alistair Francis (1): openocd: Update libjaylink Andreas Müller (4): libusb-compat: upgrade 0.1.5 -> 0.1.7 hidapi: upgrade 0.7.99+ -> 0.9.0 gexiv2: upgrade 0.12.0 -> 0.12.1 thunar: upgrade 1.8.14 -> 1.8.15 Andrew Geissler (1): nlohmann-json: backport gcc10 fix Armin Kuster (1): tremor: update SRC_URI as project moved to gitlab Beniamin Sandu (1): rasdaemon: create recipe for version 0.6.5 Changqing Li (1): apache2: fix service start fail Christoph Steiger (1): python-periphery: Add python-mmap to RDEPENDS Denys Dmytriyenko (2): python3-pycryptodome(x): moved to OE-Core, remove from meta-python python3-pyelftools: moved to OE-Core, remove from meta-python Domarys Correa (18): python3-argh: Add recipe version 0.26.2 python3-graphviz: Add recipe version 0.14 python3-aiohttp-jinja2: Add recipe version 1.2.0 python3-py-ubjson: Add recipe version 0.16.1 python3-trafaret: Add recipe version 2.0.2 python3-trafaret-config: Add recipe version 2.0.2 python3-txaio: Add recipe version 20.4.1 python3-u-msgpack-python: Add recipe version 2.6.0 python3-xmodem: Add recipe version 0.4.6 python3-multidict: Update 4.7.4 -> 4.7.5 python3-lz4: Add recipe version 3.0.2 python3-autobahn: Add recipe version 20.4.3 python3-snappy: Add recipe version 0.5.4 python3-cbor2: Add recipe version 5.1.0 python3-pathtools3: Add recipe version 0.2.1 python3-watchdog: Add recipe version 0.10.2 python3-jinja2: Update 2.11.1 -> 2.11.2 python3-ansicolors: Add recipe version 1.1.8 Emmanuel Roullit (1): appstream-glib: update 0.7.16 -> 0.7.17 Honggyu Kim (1): uftrace: add PV to update the package version Kai Kang (4): garcon: 0.6.4 -> 0.7.0 xfconf: 4.14.2 -> 4.14.3 thunar: 1.8.12 -> 1.8.14 catfish: 1.4.11 -> 1.4.13 Khem Raj (5): gtkwave: Disable mime update during install netplan: Depend on systemd if it is in distro postfix: Upgrade to 3.4.10 and compile with -fcommon uim: Add patch to fix -fno-common link error safec: Update to latest on 3.5.1 release tags Leon Anavi (17): transmission: Add version 2.94 pamela: Upgrade 0.3.0 -> 1.0.0 python3-absl: Upgrade to 0.9.0 python3-gmqtt: Upgrade to 0.6.5 python3-appdirs: Upgrade to 1.4.4 python3-aiofiles: Upgrade to 0.5.0 python3-markdown: Upgrade to 3.2.2 python3-luma-core: Upgrade to 1.14.0 python3-pandas: Upgrade 1.0.1 -> 1.0.3 python3-parallax: Upgrade 1.0.5 -> 1.0.6 python3-openpyxl: Upgrade 2.6.3 -> 3.0.3 python3-setuptools-scm: Upgrade 3.3.3 -> 3.5.0 python3-toml: Extend with native build variants python3-zipp: Upgrade 0.6.0 -> 3.1.0 python3-ujson: Upgrade 1.35 -> 2.0.3 python3-webcolors: Upgrade 1.8.1 -> 1.11.1 python3-pid: Upgrade 2.2.5 -> 3.0.3 Michael Haener (2): cockpit: upgrade 218 -> 219 cockpit: rt-deps for storaged Paul Barker (1): mplayer-common: Drop obsolete recipe Pierre-Jean Texier (4): iwd: upgrade 1.6 -> 1.7 librsync: upgrade 2.3.0 -> 2.3.1 ser2net: fix upstream check URL ser2net: upgrade 4.1.5 -> 4.1.8 Robert P. J. Day (1): meta-python: delete superfluous python-mako.inc Sean Nyekjaer (2): gpsd: fix build on aarch64 gpsd: mark CLEANBROKEN Trevor Gamblin (2): meta-python: add self as maintainer python3-iso8601: add python3-numbers to RDEPENDS Wang Mingyu (6): modemmanager: upgrade 1.12.8 -> 1.12.10 python3-pyroute2: upgrade 0.5.11 -> 0.5.12 jansson: upgrade 2.12 -> 2.13.1 openldap: upgrade 2.4.49 -> 2.4.50 python3-pycparser: upgrade 2.19 -> 2.20 cryptsetup: upgrade 2.3.1 -> 2.3.2 William A. Kennington III (1): cli11: upgrade 1.8.0 -> 1.9.0 Yanfei Xu (1): turbostat: fix the build failure for new v5.7-rc6 kernel Yi Zhao (3): libldb: upgrade 1.5.6 -> 1.5.7 samba: upgrade 4.10.13 -> 4.10.15 apache2: create log/run directory via pkg_postinst Zang Ruochen (2): dnsmasq: upgrade 2.80 -> 2.81 fetchmail: upgrade 6.4.3 -> 6.4.4 Zheng Ruoqin (3): dstat: Fix runtime error that depend python. kea: upgrade 1.7.6 -> 1.7.7 libqmi: upgrade 1.24.8 -> 1.24.12 Change-Id: Ib7baf9b4dadc540df133bcd2d18d5b446b3e2e89 Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core')
-rw-r--r--meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb2
-rw-r--r--meta-openembedded/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch30
-rw-r--r--meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.1.bb (renamed from meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.bb)8
-rw-r--r--meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch30
-rw-r--r--meta-openembedded/meta-oe/recipes-core/toybox/toybox/OE-path-changes.patch195
-rw-r--r--meta-openembedded/meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch25
-rw-r--r--meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.3.bb (renamed from meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb)24
7 files changed, 78 insertions, 236 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 8358e933d..0812da1af 100644
--- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -210,7 +210,7 @@ RDEPENDS_packagegroup-meta-oe-multimedia ="\
alsa-oss audiofile cdrkit id3lib \
a2jmidid jack libass libburn libcdio libcdio-paranoia \
libdvdread libmms libmodplug libopus live555 \
- mplayer-common opus-tools \
+ opus-tools \
sound-theme-freedesktop v4l-utils yavta wavpack libvpx \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "xpext pavucontrol xsp", "", d)} \
libmikmod \
diff --git a/meta-openembedded/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch b/meta-openembedded/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch
deleted file mode 100644
index 8f18f4872..000000000
--- a/meta-openembedded/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 57456b5d034c8965b11eceed1bf861c98a18c324 Mon Sep 17 00:00:00 2001
-From: "jenkins@kwaj" <jenkins@kwaj>
-Date: Wed, 11 Sep 2019 13:43:45 -0700
-Subject: [PATCH] memrchr: Use _ISOC11_SOURCE only with glibc
-
-this is a glibc feature test macro which is not available
-on other libraries e.g. musl
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/extmem/memrchr_s.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/extmem/memrchr_s.c b/src/extmem/memrchr_s.c
-index 8d10a7b9..e73d3579 100644
---- a/src/extmem/memrchr_s.c
-+++ b/src/extmem/memrchr_s.c
-@@ -36,7 +36,7 @@
- #endif
-
- #ifdef HAVE_MEMRCHR
--#ifndef _ISOC11_SOURCE
-+#if defined (__GLIBC__) && !defined(_ISOC11_SOURCE)
- extern void *memrchr(const void *, int, size_t);
- #endif
- #endif
---
-2.17.1
-
diff --git a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.bb b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.1.bb
index 94cdb3a3c..91d8fc65a 100644
--- a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.bb
+++ b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.1.bb
@@ -7,14 +7,12 @@ SECTION = "lib"
inherit autotools pkgconfig
S = "${WORKDIR}/git"
-SRCREV = "a99a052a56da409638c9fe7e096a5ae6661ca7cb"
+# v08112019
+SRCREV = "ad76c7b1dbd0403b0c9decf54164fcce271c590f"
SRC_URI = "git://github.com/rurban/safeclib.git \
- file://0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch \
"
-CPPFLAGS_append_libc-musl = " -D_GNU_SOURCE"
-
-COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm|aarch64).*-linux'
+COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm|aarch64|mips).*-linux'
PACKAGES =+ "${PN}-check"
diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch
new file mode 100644
index 000000000..faabc597e
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch
@@ -0,0 +1,30 @@
+From 9e5b1420b89813ee3c58c2b792077fa8bb71f327 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 21 May 2020 13:53:27 -0700
+Subject: [PATCH] Tackle SIGEMT and SIGSTKFLT is not glibc specific
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/portability.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/lib/portability.c b/lib/portability.c
+index 294141c6..1c7ebc12 100644
+--- a/lib/portability.c
++++ b/lib/portability.c
+@@ -430,8 +430,11 @@ static const struct signame signames[] = {
+ // Non-POSIX signals that cause termination
+ SIGNIFY(PROF), SIGNIFY(IO),
+ #ifdef __linux__
+-# if !defined(__GLIBC__) && !defined(__mips__)
++# ifdef SIGSTKFLT
+ SIGNIFY(STKFLT),
++# endif
++# ifdef SIGEMT
++ SIGNIFY(EMT),
+ # endif
+ SIGNIFY(POLL), SIGNIFY(PWR),
+ #elif defined(__APPLE__)
+--
+2.26.2
+
diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/OE-path-changes.patch b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/OE-path-changes.patch
deleted file mode 100644
index e42c22ebd..000000000
--- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/OE-path-changes.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-diff --git a/toys/net/microcom.c b/toys/net/microcom.c
-index d34e1fe..a369e6c 100644
---- a/toys/net/microcom.c
-+++ b/toys/net/microcom.c
-@@ -2,7 +2,7 @@
- *
- * Copyright 2017 The Android Open Source Project.
-
--USE_MICROCOM(NEWTOY(microcom, "<1>1s:X", TOYFLAG_BIN))
-+USE_MICROCOM(NEWTOY(microcom, "<1>1s:X", TOYFLAG_USR|TOYFLAG_BIN))
-
- config MICROCOM
- bool "microcom"
-diff --git a/toys/other/blockdev.c b/toys/other/blockdev.c
-index 38e0993..c5d9fcd 100644
---- a/toys/other/blockdev.c
-+++ b/toys/other/blockdev.c
-@@ -4,7 +4,7 @@
- *
- * No Standard.
-
--USE_BLOCKDEV(NEWTOY(blockdev, "<1>1(setro)(setrw)(getro)(getss)(getbsz)(setbsz)#<0(getsz)(getsize)(getsize64)(flushbufs)(rereadpt)",TOYFLAG_USR|TOYFLAG_BIN))
-+USE_BLOCKDEV(NEWTOY(blockdev, "<1>1(setro)(setrw)(getro)(getss)(getbsz)(setbsz)#<0(getsz)(getsize)(getsize64)(flushbufs)(rereadpt)",TOYFLAG_SBIN))
-
- config BLOCKDEV
- bool "blockdev"
-diff --git a/toys/other/chrt.c b/toys/other/chrt.c
-index a1c37a0..d6db3a5 100644
---- a/toys/other/chrt.c
-+++ b/toys/other/chrt.c
-@@ -4,7 +4,7 @@
- *
- * Note: -ibrfo flags sorted to match SCHED positions for highest_bit()
-
--USE_CHRT(NEWTOY(chrt, "^mp#<0iRbrfo[!ibrfo]", TOYFLAG_USR|TOYFLAG_SBIN))
-+USE_CHRT(NEWTOY(chrt, "^mp#<0iRbrfo[!ibrfo]", TOYFLAG_USR|TOYFLAG_BIN))
-
- config CHRT
- bool "chrt"
-diff --git a/toys/other/hwclock.c b/toys/other/hwclock.c
-index 1d313e3..412582d 100644
---- a/toys/other/hwclock.c
-+++ b/toys/other/hwclock.c
-@@ -4,7 +4,7 @@
- *
- * No standard, but see Documentation/rtc.txt in the linux kernel source..
- *
--USE_HWCLOCK(NEWTOY(hwclock, ">0(fast)f(rtc):u(utc)l(localtime)t(systz)s(hctosys)r(show)w(systohc)[-ul][!rtsw]", TOYFLAG_USR|TOYFLAG_BIN))
-+USE_HWCLOCK(NEWTOY(hwclock, ">0(fast)f(rtc):u(utc)l(localtime)t(systz)s(hctosys)r(show)w(systohc)[-ul][!rtsw]", TOYFLAG_SBIN))
-
- config HWCLOCK
- bool "hwclock"
-diff --git a/toys/other/modinfo.c b/toys/other/modinfo.c
-index 1178d67..966a9de 100644
---- a/toys/other/modinfo.c
-+++ b/toys/other/modinfo.c
-@@ -4,7 +4,7 @@
- *
- * TODO: cleanup
-
--USE_MODINFO(NEWTOY(modinfo, "<1b:k:F:0", TOYFLAG_BIN))
-+USE_MODINFO(NEWTOY(modinfo, "<1b:k:F:0", TOYFLAG_SBIN))
-
- config MODINFO
- bool "modinfo"
-diff --git a/toys/other/pmap.c b/toys/other/pmap.c
-index abb0a33..2acef02 100644
---- a/toys/other/pmap.c
-+++ b/toys/other/pmap.c
-@@ -5,7 +5,7 @@
- *
- * No Standard.
-
--USE_PMAP(NEWTOY(pmap, "<1xq", TOYFLAG_BIN))
-+USE_PMAP(NEWTOY(pmap, "<1xq", TOYFLAG_USR|TOYFLAG_BIN))
-
- config PMAP
- bool "pmap"
-diff --git a/toys/other/printenv.c b/toys/other/printenv.c
-index e8bcf29..65f62ed 100644
---- a/toys/other/printenv.c
-+++ b/toys/other/printenv.c
-@@ -2,7 +2,7 @@
- *
- * Copyright 2012 Georgi Chorbadzhiyski <georgi@unixsol.org>
-
--USE_PRINTENV(NEWTOY(printenv, "0(null)", TOYFLAG_USR|TOYFLAG_BIN))
-+USE_PRINTENV(NEWTOY(printenv, "0(null)", TOYFLAG_BIN))
-
- config PRINTENV
- bool "printenv"
-diff --git a/toys/other/taskset.c b/toys/other/taskset.c
-index 8ffdab7..89fd528 100644
---- a/toys/other/taskset.c
-+++ b/toys/other/taskset.c
-@@ -2,7 +2,7 @@
- *
- * Copyright 2012 Elie De Brauwer <eliedebrauwer@gmail.com>
-
--USE_TASKSET(NEWTOY(taskset, "<1^pa", TOYFLAG_BIN|TOYFLAG_STAYROOT))
-+USE_TASKSET(NEWTOY(taskset, "<1^pa", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_STAYROOT))
- USE_NPROC(NEWTOY(nproc, "(all)", TOYFLAG_USR|TOYFLAG_BIN))
-
- config NPROC
-diff --git a/toys/other/timeout.c b/toys/other/timeout.c
-index 9b93466..e1d0f4d 100644
---- a/toys/other/timeout.c
-+++ b/toys/other/timeout.c
-@@ -4,7 +4,7 @@
- *
- * No standard
-
--USE_TIMEOUT(NEWTOY(timeout, "<2^vk:s: ", TOYFLAG_BIN))
-+USE_TIMEOUT(NEWTOY(timeout, "<2^vk:s: ", TOYFLAG_USR|TOYFLAG_BIN))
-
- config TIMEOUT
- bool "timeout"
-diff --git a/toys/other/truncate.c b/toys/other/truncate.c
-index 142d3c7..40eb1e5 100644
---- a/toys/other/truncate.c
-+++ b/toys/other/truncate.c
-@@ -2,7 +2,7 @@
- *
- * Copyright 2011 Rob Landley <rob@landley.net>
-
--USE_TRUNCATE(NEWTOY(truncate, "<1s:|c", TOYFLAG_BIN))
-+USE_TRUNCATE(NEWTOY(truncate, "<1s:|c", TOYFLAG_USR|TOYFLAG_BIN))
-
- config TRUNCATE
- bool "truncate"
-diff --git a/toys/posix/nice.c b/toys/posix/nice.c
-index 4b587ee..9f7b119 100644
---- a/toys/posix/nice.c
-+++ b/toys/posix/nice.c
-@@ -4,7 +4,7 @@
- *
- * See http://opengroup.org/onlinepubs/9699919799/utilities/nice.html
-
--USE_NICE(NEWTOY(nice, "^<1n#", TOYFLAG_USR|TOYFLAG_BIN))
-+USE_NICE(NEWTOY(nice, "^<1n#", TOYFLAG_BIN))
-
- config NICE
- bool "nice"
-diff --git a/toys/posix/nl.c b/toys/posix/nl.c
-index 9b02bfa..41e1b89 100644
---- a/toys/posix/nl.c
-+++ b/toys/posix/nl.c
-@@ -7,7 +7,7 @@
- * This implements a subset: only one logical page (-ip), no sections (-dfh).
- * todo: -lv
-
--USE_NL(NEWTOY(nl, "v#<1=1l#b:n:s:w#<0=6E", TOYFLAG_BIN))
-+USE_NL(NEWTOY(nl, "v#<1=1l#b:n:s:w#<0=6E", TOYFLAG_USR|TOYFLAG_BIN))
-
- config NL
- bool "nl"
-diff --git a/toys/posix/paste.c b/toys/posix/paste.c
-index ea04f02..8972f71 100644
---- a/toys/posix/paste.c
-+++ b/toys/posix/paste.c
-@@ -6,7 +6,7 @@
- *
- * Deviations from posix: the FILE argument isn't mandatory, none == '-'
-
--USE_PASTE(NEWTOY(paste, "d:s", TOYFLAG_BIN|TOYFLAG_LOCALE))
-+USE_PASTE(NEWTOY(paste, "d:s", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LOCALE))
-
- config PASTE
- bool "paste"
-diff --git a/toys/posix/ps.c b/toys/posix/ps.c
-index aef2a7f..b559e09 100644
---- a/toys/posix/ps.c
-+++ b/toys/posix/ps.c
-@@ -44,7 +44,7 @@
- * TODO: top: thread support and SMP
- * TODO: pgrep -f only searches the amount of cmdline that fits in toybuf.
-
--USE_PS(NEWTOY(ps, "k(sort)*P(ppid)*aAdeflMno*O*p(pid)*s*t*Tu*U*g*G*wZ[!ol][+Ae][!oO]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LOCALE))
-+USE_PS(NEWTOY(ps, "k(sort)*P(ppid)*aAdeflMno*O*p(pid)*s*t*Tu*U*g*G*wZ[!ol][+Ae][!oO]", TOYFLAG_BIN|TOYFLAG_LOCALE))
- // stayroot because iotop needs root to read other process' proc/$$/io
- USE_TOP(NEWTOY(top, ">0m" "O*Hk*o*p*u*s#<1d#=3<1n#<1bq[!oO]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LOCALE))
- USE_IOTOP(NEWTOY(iotop, ">0AaKO" "k*o*p*u*s#<1=7d#=3<1n#<1bq", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_STAYROOT|TOYFLAG_LOCALE))
-diff --git a/toys/posix/sed.c b/toys/posix/sed.c
-index cf7d15e..130ac08 100644
---- a/toys/posix/sed.c
-+++ b/toys/posix/sed.c
-@@ -10,7 +10,7 @@
- * TODO: handle error return from emit(), error_msg/exit consistently
- * What's the right thing to do for -i when write fails? Skip to next?
-
--USE_SED(NEWTOY(sed, "(help)(version)e*f*inEr[+Er]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LOCALE|TOYFLAG_NOHELP))
-+USE_SED(NEWTOY(sed, "(help)(version)e*f*inEr[+Er]", TOYFLAG_BIN|TOYFLAG_LOCALE|TOYFLAG_NOHELP))
-
- config SED
- bool "sed"
diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch
new file mode 100644
index 000000000..7ab95932c
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch
@@ -0,0 +1,25 @@
+glibc on mips is missing SIGSTKFLT
+
+Do not therefore assume it being available linuxwide
+
+Fixes
+| lib/portability.c:433:3: error: use of undeclared identifier 'SIGSTKFLT'
+| SIGNIFY(STKFLT), SIGNIFY(POLL), SIGNIFY(PWR),
+| ^
+
+Upstream-Status: Submitted [https://github.com/landley/toybox/pull/195]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/lib/portability.c
++++ b/lib/portability.c
+@@ -430,7 +430,10 @@ static const struct signame signames[] =
+ // Non-POSIX signals that cause termination
+ SIGNIFY(PROF), SIGNIFY(IO),
+ #ifdef __linux__
+- SIGNIFY(STKFLT), SIGNIFY(POLL), SIGNIFY(PWR),
++# if !defined(__GLIBC__) && !defined(__mips__)
++ SIGNIFY(STKFLT),
++# endif
++ SIGNIFY(POLL), SIGNIFY(PWR),
+ #elif defined(__APPLE__)
+ SIGNIFY(EMT), SIGNIFY(INFO),
+ #endif
diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.3.bb
index 2f8297833..4e72f295d 100644
--- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb
+++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.3.bb
@@ -3,21 +3,35 @@ HOMEPAGE = "http://www.landley.net/toybox/"
DEPENDS = "attr virtual/crypt"
LICENSE = "BSD-0-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=78659a599b9325da368f2f1eb88f19c7"
inherit cml1 update-alternatives
SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \
- file://OE-path-changes.patch \
+ file://mips-no-STKFLT.patch \
+ file://0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch \
"
-SRC_URI[md5sum] = "a8bb502a1be941f06dd2644fff25f547"
-SRC_URI[sha256sum] = "3ada450ac1eab1dfc352fee915ea6129b9a4349c1885f1394b61bd2d89a46c04"
+SRC_URI[sha256sum] = "eab28fd29d19d4e61ef09704e5871940e6f35fd35a3bb1285e41f204504b5c01"
SECTION = "base"
TOYBOX_BIN = "generated/unstripped/toybox"
-EXTRA_OEMAKE = 'HOSTCC="${BUILD_CC}" CPUS=${@oe.utils.cpu_count()}'
+# Toybox is strict on what CC, CFLAGS and CROSS_COMPILE variables should contain.
+# Fix CC, CFLAGS, CROSS_COMPILE to match expectations.
+# CC = compiler name
+# CFLAGS = only compiler flags
+# CROSS_COMPILE = compiler prefix
+CFLAGS += "${TOOLCHAIN_OPTIONS} ${TUNE_CCARGS}"
+
+COMPILER_toolchain-clang = "clang"
+COMPILER ?= "gcc"
+
+EXTRA_OEMAKE = 'CROSS_COMPILE="${HOST_PREFIX}" \
+ CC="${COMPILER}" \
+ STRIP="strip" \
+ CFLAGS="${CFLAGS}" \
+ HOSTCC="${BUILD_CC}" CPUS=${@oe.utils.cpu_count()} V=1'
do_configure() {
# allow user to define their own defconfig in bbappend, taken from kernel.bbclass