mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-02-19 16:00:26 +00:00
Code Issues Projects Releases Wiki Activity

toybox: Upgrade to 0.7.2

Browse Source 
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>
This commit is contained in:
Paul Barker
2016-12-04 10:42:25 +00:00
committed by Martin Jansa
parent 4685df1ddd
commit efa72fe956
3 changed files with 2 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
meta-oe/recipes-core/toybox/toybox/0001-Fix-TOYBOX_VERSION.patch
View File

@@ -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

34
meta-oe/recipes-core/toybox/toybox/0002-Fix-trimmed-printf-in-grep.patch
View File

@@ -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

6
meta-oe/recipes-core/toybox/toybox_0.7.1.bb → meta-oe/recipes-core/toybox/toybox_0.7.2.bb
View File

@@ -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"