diff options
author | Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 2020-10-30 13:59:41 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-11-02 09:00:52 -0800 |
commit | 43448e97f1b66becc5f550548e6301934ce8888f (patch) | |
tree | 9592640f09bbf5a0819cbbfc91e52078ef495e7c | |
parent | f604ed19d2312f296555986f52e1a432b092a4a4 (diff) | |
download | meta-openembedded-contrib-43448e97f1b66becc5f550548e6301934ce8888f.tar.gz |
toybox: upgrade 0.8.3 -> 0.8.4
0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch
mips-no-STKFLT.patch
Removed since these are included in 0.8.4
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch | 25 | ||||
-rw-r--r-- | meta-oe/recipes-core/toybox/toybox_0.8.4.bb (renamed from meta-oe/recipes-core/toybox/toybox_0.8.3.bb) | 4 |
3 files changed, 1 insertions, 58 deletions
diff --git a/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch b/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch deleted file mode 100644 index faabc597ee..0000000000 --- a/meta-oe/recipes-core/toybox/toybox/0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch +++ /dev/null @@ -1,30 +0,0 @@ -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-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch b/meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch deleted file mode 100644 index 7ab95932cf..0000000000 --- a/meta-oe/recipes-core/toybox/toybox/mips-no-STKFLT.patch +++ /dev/null @@ -1,25 +0,0 @@ -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-oe/recipes-core/toybox/toybox_0.8.3.bb b/meta-oe/recipes-core/toybox/toybox_0.8.4.bb index 1513255c46..cc98b9ec07 100644 --- a/meta-oe/recipes-core/toybox/toybox_0.8.3.bb +++ b/meta-oe/recipes-core/toybox/toybox_0.8.4.bb @@ -8,10 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=78659a599b9325da368f2f1eb88f19c7" inherit cml1 update-alternatives SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ - file://mips-no-STKFLT.patch \ - file://0001-Tackle-SIGEMT-and-SIGSTKFLT-is-not-glibc-specific.patch \ " -SRC_URI[sha256sum] = "eab28fd29d19d4e61ef09704e5871940e6f35fd35a3bb1285e41f204504b5c01" +SRC_URI[sha256sum] = "cb2a565a8d30015d08d73628795dca51a85b99b149aeabbbecd9e8dbdbd8fddc" SECTION = "base" |