summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-core
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2016-12-04 10:42:25 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2016-12-13 11:19:33 +0100
commitefa72fe9565978bcffccfd01eec4554a8a5abc93 (patch)
treeb3d6469b683d5635eae1948be64942aeb9fc6612 /meta-oe/recipes-core
parent4685df1dddb38e73d30048bf866d8e36008d058d (diff)
downloadmeta-openembedded-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')
-rw-r--r--meta-oe/recipes-core/toybox/toybox/0001-Fix-TOYBOX_VERSION.patch29
-rw-r--r--meta-oe/recipes-core/toybox/toybox/0002-Fix-trimmed-printf-in-grep.patch34
-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 8af430511..000000000
--- a/meta-oe/recipes-core/toybox/toybox/0001-Fix-TOYBOX_VERSION.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 209fad8ebd17bf46d0431dafbb547f429a3cffdf Mon Sep 17 00:00:00 2001
2From: Paul Barker <paul@paulbarker.me.uk>
3Date: Sat, 4 Jun 2016 15:05:49 +0100
4Subject: [PATCH 1/2] Fix TOYBOX_VERSION
5
6The latest tagged version is 0.7.1.
7
8Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
9Upstream-status: Submitted
10---
11 main.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/main.c b/main.c
15index eeae2f3..bedb333 100644
16--- a/main.c
17+++ b/main.c
18@@ -6,7 +6,7 @@
19 #include "toys.h"
20
21 #ifndef TOYBOX_VERSION
22-#define TOYBOX_VERSION "0.7.0"
23+#define TOYBOX_VERSION "0.7.1"
24 #endif
25
26 // Populate toy_list[].
27--
282.1.4
29
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 37808d03b..000000000
--- a/meta-oe/recipes-core/toybox/toybox/0002-Fix-trimmed-printf-in-grep.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 9c51a0d7690fb3b08871dae2486af4032d8442fb Mon Sep 17 00:00:00 2001
2From: Paul Barker <paul@paulbarker.me.uk>
3Date: Sat, 4 Jun 2016 15:42:48 +0100
4Subject: [PATCH 2/2] Fix trimmed printf in grep
5
6Using a default trim value of INT_MAX/2 when printing a line causes nothing to
7be printed on a system built using OpenEmbedded for the qemux86 target. This may
8also affect other systems.
9
10Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
11Upstream-status: Submitted
12---
13 toys/posix/grep.c | 5 ++++-
14 1 file changed, 4 insertions(+), 1 deletion(-)
15
16diff --git a/toys/posix/grep.c b/toys/posix/grep.c
17index 2ca02d2..f38c538 100644
18--- a/toys/posix/grep.c
19+++ b/toys/posix/grep.c
20@@ -74,7 +74,10 @@ static void outline(char *line, char dash, char *name, long lcount, long bcount,
21 if (!line || (lcount && (toys.optflags&FLAG_n)))
22 printf("%ld%c", lcount, line ? dash : TT.outdelim);
23 if (bcount && (toys.optflags&FLAG_b)) printf("%ld%c", bcount-1, dash);
24- if (line) xprintf("%.*s%c", trim ? trim : INT_MAX/2, line, TT.outdelim);
25+ if (line) {
26+ if (trim) xprintf("%.*s%c", trim, line, TT.outdelim);
27+ else xprintf("%s%c", line, TT.outdelim);
28+ }
29 }
30
31 // Show matches in one file
32--
332.1.4
34
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 032b13855..93ef45bb5 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"
4 4
5SRC_URI = " \ 5SRC_URI = " \
6 http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ 6 http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \
7 file://0001-Fix-TOYBOX_VERSION.patch \
8 file://0002-Fix-trimmed-printf-in-grep.patch \
9" 7"
10 8
11SRC_URI[md5sum] = "e959e5ff8c6806781eb06e56f302a393" 9SRC_URI[md5sum] = "372d8fdf6ea3675edbf1f6a4109b6db6"
12SRC_URI[sha256sum] = "5bb3069f58faf12940d5cfde3209ac7f63210bebdd9023979b0c20cede126ea7" 10SRC_URI[sha256sum] = "79da71c7c39cef0a5f7b834f0b17d0d436e7994dd33e912f581b4c12d3b1681f"
13 11
14LICENSE = "BSD-0-Clause" 12LICENSE = "BSD-0-Clause"
15LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511" 13LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511"