Update buildroot & docker (#25)
* Update docker & buildroot * Fix * fix versions
This commit is contained in:
@@ -0,0 +1,52 @@
|
||||
From ae32d292ca641c08b6db8d2f7cfcce2a54d00835 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Tue, 20 Feb 2018 23:09:24 +0100
|
||||
Subject: [PATCH] MetersPanel: remove 0xe2 from MetersPanel.c
|
||||
|
||||
This non ascii character trigger an issue with MakeHeader.py.
|
||||
|
||||
./scripts/MakeHeader.py MetersPanel.c
|
||||
Traceback (most recent call last):
|
||||
File "./scripts/MakeHeader.py", line 32, in <module>
|
||||
for line in file.readlines():
|
||||
File "[...]/output/host/lib/python3.6/encodings/ascii.py", line 26, in decode
|
||||
return codecs.ascii_decode(input, self.errors)[0]
|
||||
UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 956: ordinal not in range(128)
|
||||
|
||||
http://autobuild.buildroot.net/results/8ed/8edb78b054a265447fd0e83f67cba5f978be4ed6/build-end.log
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
MetersPanel.c | 2 +-
|
||||
MetersPanel.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/MetersPanel.c b/MetersPanel.c
|
||||
index 3cf3e07..47296a4 100644
|
||||
--- a/MetersPanel.c
|
||||
+++ b/MetersPanel.c
|
||||
@@ -37,7 +37,7 @@ static const char* const MetersFunctions[] = {"Style ", "Move ", "
|
||||
static const char* const MetersKeys[] = {"Space", "Enter", " ", "Del", "F10"};
|
||||
static int MetersEvents[] = {' ', 13, ERR, KEY_DC, KEY_F(10)};
|
||||
|
||||
-// We avoid UTF-8 arrows ← → here as they might display full-width on Chinese
|
||||
+// We avoid UTF-8 arrows <- -> here as they might display full-width on Chinese
|
||||
// terminals, breaking our aligning.
|
||||
// In <http://unicode.org/reports/tr11/>, arrows (U+2019..U+2199) are
|
||||
// considered "Ambiguous characters".
|
||||
diff --git a/MetersPanel.h b/MetersPanel.h
|
||||
index e00169c..e80754a 100644
|
||||
--- a/MetersPanel.h
|
||||
+++ b/MetersPanel.h
|
||||
@@ -29,7 +29,7 @@ struct MetersPanel_ {
|
||||
|
||||
// Note: In code the meters are known to have bar/text/graph "Modes", but in UI
|
||||
// we call them "Styles".
|
||||
-// We avoid UTF-8 arrows ← → here as they might display full-width on Chinese
|
||||
+// We avoid UTF-8 arrows <- -> here as they might display full-width on Chinese
|
||||
// terminals, breaking our aligning.
|
||||
// In <http://unicode.org/reports/tr11/>, arrows (U+2019..U+2199) are
|
||||
// considered "Ambiguous characters".
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
From 1a83a3e6ae0841a0dc4c7eb08a1a71930e99666c Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Sun, 18 Mar 2018 21:57:54 +0100
|
||||
Subject: [PATCH] MakeHeader: open files using binary mode
|
||||
|
||||
By default, open(sys.argv[1]) use Unicode mode.
|
||||
The readlines() will try to convert with the default codec
|
||||
(which depends on the i18n settings, so 'ascii' under
|
||||
LC_ALL=C)
|
||||
|
||||
Open files using binary mode so no conversion will be done
|
||||
by readlines(). But then, normal strings can't be used in
|
||||
the rest of the code; either all strings have to be prefixed
|
||||
with b'' or (simpler) the read line has to be converted to
|
||||
a unicode string by calling decode() on it.
|
||||
|
||||
http://lists.busybox.net/pipermail/buildroot/2018-February/214373.html
|
||||
|
||||
Fixes:
|
||||
http://autobuild.buildroot.net/results/9ce/9ce2ef5ef694253b9759016c9702c5c6be7849a1
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
scripts/MakeHeader.py | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py
|
||||
index 4841bda..dd0798c 100755
|
||||
--- a/scripts/MakeHeader.py
|
||||
+++ b/scripts/MakeHeader.py
|
||||
@@ -16,7 +16,7 @@ SKIPONE=4
|
||||
state = ANY
|
||||
static = 0
|
||||
|
||||
-file = open(sys.argv[1])
|
||||
+file = open(sys.argv[1], 'rb')
|
||||
name = sys.argv[1][:-2]
|
||||
|
||||
out = StringIO()
|
||||
@@ -31,6 +31,7 @@ out.write( "#define HEADER_" + os.path.basename(name) + "\n")
|
||||
is_blank = False
|
||||
for line in file.readlines():
|
||||
line = line[:-1]
|
||||
+ line = line.decode('utf-8')
|
||||
if state == ANY:
|
||||
if line == '/*{':
|
||||
state = COPY
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Hashes from: http://www.freelists.org/post/htop/ANN-htop-202
|
||||
md5 7d354d904bad591a931ad57e99fea84a htop-2.0.2.tar.gz
|
||||
sha1 201f793f13dce2448e36047079875b9bd5bba75a htop-2.0.2.tar.gz
|
||||
# Locally calculated
|
||||
sha256 3260be990d26e25b6b49fc9d96dbc935ad46e61083c0b7f6df413e513bf80748 htop-2.1.0.tar.gz
|
||||
sha256 70466e76443cb5b68144d9fcedca9584e7bfdb6c50859daa5a0290ea27c58aad COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
HTOP_VERSION = 2.0.2
|
||||
HTOP_VERSION = 2.1.0
|
||||
HTOP_SITE = http://hisham.hm/htop/releases/$(HTOP_VERSION)
|
||||
HTOP_DEPENDENCIES = ncurses
|
||||
# Prevent htop build system from searching the host paths
|
||||
|
||||
Reference in New Issue
Block a user