diff options
author | Paul Barker <paul@paulbarker.me.uk> | 2016-12-04 10:42:25 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-12-13 11:19:33 +0100 |
commit | efa72fe9565978bcffccfd01eec4554a8a5abc93 (patch) | |
tree | b3d6469b683d5635eae1948be64942aeb9fc6612 /meta-oe/recipes-core/toybox | |
parent | 4685df1dddb38e73d30048bf866d8e36008d058d (diff) | |
download | meta-openembedded-contrib-efa72fe9565978bcffccfd01eec4554a8a5abc93.tar.gz |
toybox: Upgrade to 0.7.2
Patches are dropped as they are no longer needed.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-core/toybox')
-rw-r--r-- | meta-oe/recipes-core/toybox/toybox/0001-Fix-TOYBOX_VERSION.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-core/toybox/toybox/0002-Fix-trimmed-printf-in-grep.patch | 34 | ||||
-rw-r--r-- | meta-oe/recipes-core/toybox/toybox_0.7.2.bb (renamed from meta-oe/recipes-core/toybox/toybox_0.7.1.bb) | 6 |
3 files changed, 2 insertions, 67 deletions
diff --git a/meta-oe/recipes-core/toybox/toybox/0001-Fix-TOYBOX_VERSION.patch b/meta-oe/recipes-core/toybox/toybox/0001-Fix-TOYBOX_VERSION.patch deleted file mode 100644 index 8af4305111..0000000000 --- a/meta-oe/recipes-core/toybox/toybox/0001-Fix-TOYBOX_VERSION.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 209fad8ebd17bf46d0431dafbb547f429a3cffdf Mon Sep 17 00:00:00 2001 -From: Paul Barker <paul@paulbarker.me.uk> -Date: Sat, 4 Jun 2016 15:05:49 +0100 -Subject: [PATCH 1/2] Fix TOYBOX_VERSION - -The latest tagged version is 0.7.1. - -Signed-off-by: Paul Barker <paul@paulbarker.me.uk> -Upstream-status: Submitted ---- - main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/main.c b/main.c -index eeae2f3..bedb333 100644 ---- a/main.c -+++ b/main.c -@@ -6,7 +6,7 @@ - #include "toys.h" - - #ifndef TOYBOX_VERSION --#define TOYBOX_VERSION "0.7.0" -+#define TOYBOX_VERSION "0.7.1" - #endif - - // Populate toy_list[]. --- -2.1.4 - diff --git a/meta-oe/recipes-core/toybox/toybox/0002-Fix-trimmed-printf-in-grep.patch b/meta-oe/recipes-core/toybox/toybox/0002-Fix-trimmed-printf-in-grep.patch deleted file mode 100644 index 37808d03bc..0000000000 --- a/meta-oe/recipes-core/toybox/toybox/0002-Fix-trimmed-printf-in-grep.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9c51a0d7690fb3b08871dae2486af4032d8442fb Mon Sep 17 00:00:00 2001 -From: Paul Barker <paul@paulbarker.me.uk> -Date: Sat, 4 Jun 2016 15:42:48 +0100 -Subject: [PATCH 2/2] Fix trimmed printf in grep - -Using a default trim value of INT_MAX/2 when printing a line causes nothing to -be printed on a system built using OpenEmbedded for the qemux86 target. This may -also affect other systems. - -Signed-off-by: Paul Barker <paul@paulbarker.me.uk> -Upstream-status: Submitted ---- - toys/posix/grep.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/toys/posix/grep.c b/toys/posix/grep.c -index 2ca02d2..f38c538 100644 ---- a/toys/posix/grep.c -+++ b/toys/posix/grep.c -@@ -74,7 +74,10 @@ static void outline(char *line, char dash, char *name, long lcount, long bcount, - if (!line || (lcount && (toys.optflags&FLAG_n))) - printf("%ld%c", lcount, line ? dash : TT.outdelim); - if (bcount && (toys.optflags&FLAG_b)) printf("%ld%c", bcount-1, dash); -- if (line) xprintf("%.*s%c", trim ? trim : INT_MAX/2, line, TT.outdelim); -+ if (line) { -+ if (trim) xprintf("%.*s%c", trim, line, TT.outdelim); -+ else xprintf("%s%c", line, TT.outdelim); -+ } - } - - // Show matches in one file --- -2.1.4 - diff --git a/meta-oe/recipes-core/toybox/toybox_0.7.1.bb b/meta-oe/recipes-core/toybox/toybox_0.7.2.bb index 032b138552..93ef45bb5e 100644 --- a/meta-oe/recipes-core/toybox/toybox_0.7.1.bb +++ b/meta-oe/recipes-core/toybox/toybox_0.7.2.bb @@ -4,12 +4,10 @@ DEPENDS = "attr" SRC_URI = " \ http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ - file://0001-Fix-TOYBOX_VERSION.patch \ - file://0002-Fix-trimmed-printf-in-grep.patch \ " -SRC_URI[md5sum] = "e959e5ff8c6806781eb06e56f302a393" -SRC_URI[sha256sum] = "5bb3069f58faf12940d5cfde3209ac7f63210bebdd9023979b0c20cede126ea7" +SRC_URI[md5sum] = "372d8fdf6ea3675edbf1f6a4109b6db6" +SRC_URI[sha256sum] = "79da71c7c39cef0a5f7b834f0b17d0d436e7994dd33e912f581b4c12d3b1681f" LICENSE = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511" |