Skip to contentSkip to conversation

moveconfig.py: Fix more Python3 UTF issues

PATCH New Tom Rini 1 participant 2 messages Nov 11, 2019 – Nov 24, 2019

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 moveconfig.py: Fix more Python3 UTF issues

With the move to using Python 3 for real, we encounter two different issues. First, the file include/video_font_data.h includes at least one UTF-16 character. Given that it does not include any CONFIG symbols it is easiest to just ignore this file. Next, we encounter similar problems with some dts/dtsi files that come from Linux. In this case it's easiest to simply ignore all dts/dtsi files as there will not be CONFIG symbols for us to migrate in them.

Cc Masahiro Yamada <[email protected]>
---
 tools/moveconfig.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
tools/moveconfig.py +4 -1
index e2ff4cfc88b2..36160a397726 100755
@@ -667,8 +667,11 @@ def cleanup_headers(configs, options):
             if dirpath == os.path.join('include', 'generated'):
                 continue
             for filename in filenames:
-                if not fnmatch.fnmatch(filename, '*~'):
+                if not filename.endswith(('~', '.dts', '.dtsi')):
                     header_path = os.path.join(dirpath, filename)
+                    # This file contains UTF-16 data and no CONFIG symbols
+                    if header_path == 'include/video_font_data.h':
+                        continue
                     cleanup_one_header(header_path, patterns, options)
                     cleanup_empty_blocks(header_path, options)
 
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/1 moveconfig.py: Fix more Python3 UTF issues

Quoted 10 lines · Tom Rini

With the move to using Python 3 for real, we encounter two different issues. First, the file include/video_font_data.h includes at least one UTF-16 character. Given that it does not include any CONFIG symbols it is easiest to just ignore this file. Next, we encounter similar problems with some dts/dtsi files that come from Linux. In this case it's easiest to simply ignore all dts/dtsi files as there will not be CONFIG symbols for us to migrate in them.

Cc Masahiro Yamada <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191124/6a4ba524/attachment.sig>