New CI image and fixes
cover New CI image and fixes
Hi all,
This series build a new CI image based on Ubuntu focal with LoongArch64 support, fixed various python scripts for python 3.12, fixed various problems popped up when testing againt latest software.
Last two commits are for demonstration purpose and not for commit into repo.
CI runs passed at azure [1].
Thanks
[1]: https://flygoat.visualstudio.com/u-boot/_build/results?buildId=64&view=results
---
Jiaxun Yang (18):
binman: Replace pkg_resources with importlib.resources
py: Replace distutils.core with setuptools doc/sphinx: Remove usage of six
py: Bump pylint version and clear warnings
binman: Workaround lz4 cli padding in test cases tests/test_event_dump: Relax match rule for output lib/charset & efi: Fix possible unaligned accesses
CI: Ensure pip install is always performed in venv
CI: Dockerfile: Set global git name & email config
CI: Dockerfile: Bump base OS version
CI: Dockerfile: Bump GRUB to 2.12
CI: Dockerfile: Bump QEMU to 9.0.1
CI: Dockerfile: Bump fiptool to 2.10.4
CI: Dockerfile: Bump genimage to 17
CI: Dockerfile: Use kernel.org upstream for trace-cmd
CI: Dockerfile: Bump coreboot to 24.05
CI: Dockerfile: Add LoongArch64 support [NFC] Use Jiaxun's CI Image
.azure-pipelines.yml | 22 ++++---- .gitlab-ci.yml | 19 ++++--- doc/develop/python_cq.rst | 4 +- doc/sphinx/kfigure.py | 3 +- lib/charset.c | 21 ++++---- lib/efi_loader/efi_device_path.c | 11 +--- test/py/tests/test_event_dump.py | 10 ++-- test/py/tests/test_ums.py | 1 + test/py/tests/test_usb.py | 1 + tools/binman/control.py | 18 +++---- tools/binman/etype/fdtmap.py | 1 + tools/binman/etype/fit.py | 1 + tools/binman/etype/image_header.py | 1 + tools/binman/etype/pre_load.py | 2 + tools/binman/etype/ti_board_config.py | 1 + tools/binman/etype/x509_cert.py | 1 + tools/binman/ftest.py | 8 ++- tools/binman/setup.py | 2 +- tools/binman/state.py | 1 + tools/binman/test/184_compress_section_size.dts | 1 + tools/buildman/builder.py | 2 + tools/buildman/requirements.txt | 1 + tools/docker/Dockerfile | 68 +++++++++++++++---------- tools/dtoc/setup.py | 2 +- tools/microcode-tool.py | 1 + tools/patman/test_checkpatch.py | 2 + tools/qconfig.py | 1 + 27 files changed, 123 insertions(+), 83 deletions(-)
---
base-commit: 902d8ee94ce29a088a325da6e69eeb1a25f1fec7
change-id: 20240610-docker-image-868126a1a929
Best regards,
Signature · 1 line
Jiaxun Yang <[email protected]>
PATCH 1/18 binman: Replace pkg_resources with importlib.resources
pkg_resources is deprecated long ago and being removed in python 3.12.
Reimplement functions with importlib.resources.
--- tools/binman/control.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
tools/binman/control.py +9 -9
@@ -8,12 +8,11 @@ from collections import OrderedDict import glob try: - import importlib.resources -except ImportError: # pragma: no cover + from importlib import resources +except ImportError: # for Python 3.6 - import importlib_resources + import importlib_resources as resources import os -import pkg_resources import re import sys
@@ -96,12 +95,12 @@ def _ReadMissingBlobHelp(): msg = '' return tag, msg - my_data = pkg_resources.resource_string(__name__, 'missing-blob-help') + my_data = resources.files(__package__).joinpath('missing-blob-help').read_text() re_tag = re.compile('^([-a-z0-9]+):$') result = {} tag = None msg = '' - for line in my_data.decode('utf-8').splitlines(): + for line in my_data.splitlines(): if not line.startswith('#'): m_tag = re_tag.match(line) if m_tag:
@@ -151,8 +150,9 @@ def GetEntryModules(include_testing=True): Returns: Set of paths to entry class filenames """ - glob_list = pkg_resources.resource_listdir(__name__, 'etype') - glob_list = [fname for fname in glob_list if fname.endswith('.py')] + directory = resources.files("binman.etype") + glob_list = [entry.name for entry in directory.iterdir() + if entry.name.endswith('.py')] return set([os.path.splitext(os.path.basename(item))[0] for item in glob_list if include_testing or '_testing' not in item])
@@ -735,7 +735,7 @@ def Binman(args): global state if args.full_help: - with importlib.resources.path('binman', 'README.rst') as readme: + with resources.path('binman', 'README.rst') as readme: tools.print_full_help(str(readme)) return 0
Signature · 1 line
2.45.2
Re: [PATCH 01/18] binman: Replace pkg_resources with importlib.resources
Quoted 10 lines · Jiaxun Yang
pkg_resourcesis deprecated long ago and being removed in python 3.12.Reimplement functions with importlib.resources.
Signed-off-by Jiaxun Yang <[email protected]>--- tools/binman/control.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
PATCH 2/18 py: Replace distutils.core with setuptools
In reply to Jiaxun Yangdistutils is deprecated long ago and being removed in python 3.12.
--- tools/binman/setup.py | 2 +- tools/buildman/requirements.txt | 1 + tools/dtoc/setup.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
tools/binman/setup.py +1 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0+ -from distutils.core import setup +from setuptools import setup setup(name='binman', version='1.0', license='GPL-2.0+',
tools/buildman/requirements.txt +1 -0
@@ -3,3 +3,4 @@ jsonschema==4.17.3 pycryptodome==3.20 pyyaml==6.0 yamllint==1.26.3 +setuptools==65.5.1
tools/dtoc/setup.py +1 -1
@@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0+ -from distutils.core import setup +from setuptools import setup setup(name='dtoc', version='1.0', license='GPL-2.0+',
Signature · 1 line
2.45.2
Re: [PATCH 02/18] py: Replace distutils.core with setuptools
Quoted 10 lines · Jiaxun Yang
distutils is deprecated long ago and being removed in python 3.12.
Signed-off-by Jiaxun Yang <[email protected]>--- tools/binman/setup.py | 2 +- tools/buildman/requirements.txt | 1 + tools/dtoc/setup.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
But please separate out the requirements update into a separate patch.
PATCH 3/18 doc/sphinx: Remove usage of six
In reply to Jiaxun YangWe don't support python2 any more so there is no point to use six here.
--- doc/sphinx/kfigure.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
doc/sphinx/kfigure.py +1 -2
@@ -58,7 +58,6 @@ from docutils.parsers.rst.directives import images import sphinx from sphinx.util.nodes import clean_astext -from six import iteritems import kernellog
@@ -540,7 +539,7 @@ def add_kernel_figure_to_std_domain(app, doctree): docname = app.env.docname labels = std.data["labels"] - for name, explicit in iteritems(doctree.nametypes): + for name, explicit in doctree.nametypes.items(): if not explicit: continue labelid = doctree.nameids[name]
Signature · 1 line
2.45.2
Re: [PATCH 03/18] doc/sphinx: Remove usage of six
Quoted 9 lines · Jiaxun Yang
We don't support python2 any more so there is no point to use six here.
Signed-off-by Jiaxun Yang <[email protected]>--- doc/sphinx/kfigure.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
PATCH 4/18 py: Bump pylint version and clear warnings
In reply to Jiaxun YangBump pylint to 3.2.3 as old versions are not working with python 3.12.
Clear warnings, mostly E0606: (possibly-used-before-assignment).
--- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- doc/develop/python_cq.rst | 4 ++-- test/py/tests/test_ums.py | 1 + test/py/tests/test_usb.py | 1 + tools/binman/etype/fdtmap.py | 1 + tools/binman/etype/fit.py | 1 + tools/binman/etype/image_header.py | 1 + tools/binman/etype/pre_load.py | 2 ++ tools/binman/etype/ti_board_config.py | 1 + tools/binman/etype/x509_cert.py | 1 + tools/binman/ftest.py | 1 + tools/binman/state.py | 1 + tools/buildman/builder.py | 2 ++ tools/microcode-tool.py | 1 + tools/patman/test_checkpatch.py | 2 ++ tools/qconfig.py | 1 + 17 files changed, 21 insertions(+), 4 deletions(-)
.azure-pipelines.yml +1 -1
@@ -163,7 +163,7 @@ stages: export USER=azure pip install -r test/py/requirements.txt pip install -r tools/buildman/requirements.txt - pip install asteval pylint==2.12.2 pyopenssl + pip install asteval pylint==3.2.3 pyopenssl export PATH=${PATH}:~/.local/bin echo "[MASTER]" >> .pylintrc echo "load-plugins=pylint.extensions.docparams" >> .pylintrc
.gitlab-ci.yml +1 -1
@@ -217,7 +217,7 @@ Run pylint: - git config --global --add safe.directory "${CI_PROJECT_DIR}" - pip install -r test/py/requirements.txt - pip install -r tools/buildman/requirements.txt - - pip install asteval pylint==2.12.2 pyopenssl + - pip install asteval pylint==3.2.3 pyopenssl - export PATH=${PATH}:~/.local/bin - echo "[MASTER]" >> .pylintrc - echo "load-plugins=pylint.extensions.docparams" >> .pylintrc
doc/develop/python_cq.rst +2 -2
@@ -23,7 +23,7 @@ regressions in any module. To run this locally you should use this version of pylint:: # pylint --version - pylint 2.11.1 + pylint 3.2.3 astroid 2.8.6 Python 3.8.10 (default, Sep 28 2021, 16:10:42) [GCC 9.3.0]
@@ -31,7 +31,7 @@ To run this locally you should use this version of pylint:: You should be able to select and this install other required tools with:: - pip install pylint==2.11.1 + pip install pylint==3.2.3 pip install -r test/py/requirements.txt pip install asteval pyopenssl
test/py/tests/test_ums.py +1 -0
@@ -118,6 +118,7 @@ def test_ums(u_boot_console, env__usb_dev_port, env__block_devs): test_f = u_boot_utils.PersistentRandomFile(u_boot_console, 'ums.bin', 1024 * 1024); + mounted_test_fn = None if have_writable_fs_partition: mounted_test_fn = mount_point + '/' + mount_subdir + test_f.fn
test/py/tests/test_usb.py +1 -0
@@ -564,6 +564,7 @@ def test_usb_load(u_boot_console): part_detect = 1 addr = u_boot_utils.find_ram_base(u_boot_console) + file, size = 0, 0 if fs == 'fat': file, size = test_usb_fatload_fatwrite(u_boot_console) elif fs == 'ext4':
tools/binman/etype/fdtmap.py +1 -0
@@ -106,6 +106,7 @@ class Entry_fdtmap(Entry): Returns: FDT map binary data """ + fsw = None def _AddNode(node): """Add a node to the FDT map""" for pname, prop in node.props.items():
tools/binman/etype/fit.py +1 -0
@@ -808,6 +808,7 @@ class Entry_fit(Entry_section): data_size = fdt_util.GetInt(node, "data-size") # Contents are inside the FIT + offset, size = 0, 0 if data_prop is not None: # GetOffset() returns offset of a fdt_property struct, # which has 3 fdt32_t members before the actual data.
tools/binman/etype/image_header.py +1 -0
@@ -62,6 +62,7 @@ class Entry_image_header(Entry): def _GetHeader(self): image_pos = self.GetSiblingImagePos('fdtmap') + offset = 0xffffffff if image_pos == False: self.Raise("'image_header' section must have an 'fdtmap' sibling") elif image_pos is None:
tools/binman/etype/pre_load.py +2 -0
@@ -112,6 +112,8 @@ class Entry_pre_load(Entry_collection): # Compute the signature if padding_name is None: padding_name = "pkcs-1.5" + + padding, padding_args = None, {} if padding_name == "pss": salt_len = key.size_in_bytes() - hash_image.digest_size - 2 padding = pss
tools/binman/etype/ti_board_config.py +1 -0
@@ -118,6 +118,7 @@ class Entry_ti_board_config(Entry_section): Returns: array of bytes representing value """ + br = None size = 0 if (data_type == '#/definitions/u8'): size = 1
tools/binman/etype/x509_cert.py +1 -0
@@ -83,6 +83,7 @@ class Entry_x509_cert(Entry_collection): output_fname = tools.get_output_filename('cert.%s' % uniq) input_fname = tools.get_output_filename('input.%s' % uniq) config_fname = tools.get_output_filename('config.%s' % uniq) + stdout = None tools.write_file(input_fname, input_data) if type == 'generic': stdout = self.openssl.x509_cert(
tools/binman/ftest.py +1 -0
@@ -6293,6 +6293,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap re_name = re.compile('_binman_(u_boot_(.*))_prop_(.*)') for name, sym in syms.items(): msg = 'test' + expect_val = None val = elf.GetSymbolValue(sym, edata, msg) entry_m = re_name.match(name) if entry_m:
tools/binman/state.py +1 -0
@@ -406,6 +406,7 @@ def CheckSetHashValue(node, get_data_func): hash_node = node.FindNode('hash') if hash_node: algo = hash_node.props.get('algo').value + data = None if algo == 'sha256': m = hashlib.sha256() m.update(get_data_func())
tools/buildman/builder.py +2 -0
@@ -1068,6 +1068,7 @@ class Builder: printed_target = False for name in sorted(result): diff = result[name] + color = None if name.startswith('_'): continue if diff != 0:
@@ -1328,6 +1329,7 @@ class Builder: for line in lines: if not line: continue + col = None if line[0] == '+': col = self.col.GREEN elif line[0] == '-':
tools/microcode-tool.py +1 -0
@@ -277,6 +277,7 @@ def MicrocodeTool(): if cmd not in commands: parser.error("Unknown command '%s'" % cmd) + date, license_text, microcodes = None, None, None if (not not options.mcfile) != (not not options.mcfile): parser.error("You must specify either header files or a microcode file, not both") if options.headerfile:
tools/patman/test_checkpatch.py +2 -0
@@ -530,4 +530,6 @@ index 0000000..2234c87 if __name__ == "__main__": unittest.main() + # pylint doesn't seem to find this + # pylint: disable=E1101 gitutil.RunTests()
tools/qconfig.py +1 -0
@@ -873,6 +873,7 @@ def read_database(): all_defconfigs = set() defconfig_db = collections.defaultdict(set) + defconfig = None for line in read_file(CONFIG_DATABASE): line = line.rstrip() if not line: # Separator between defconfigs
Signature · 1 line
2.45.2
PATCH 5/18 binman: Workaround lz4 cli padding in test cases
In reply to Jiaxun YangNewer lz4 util is not happy with any padding at end of file, it would abort with error message like:
Stream followed by undecodable data at position 43.
Workaround by skipping testCompUtilPadding test case and manually strip padding in testCompressSectionSize test case.
--- tools/binman/ftest.py | 7 +++++-- tools/binman/test/184_compress_section_size.dts | 1 + 2 files changed, 6 insertions(+), 2 deletions(-)
tools/binman/ftest.py +5 -2
@@ -4518,6 +4518,8 @@ class TestFunctional(unittest.TestCase): dtb.Scan() props = self._GetPropTree(dtb, ['offset', 'image-pos', 'size', 'uncomp-size']) + data = data[:0x30] + data = data.rstrip(b'\xff') orig = self._decompress(data) self.assertEqual(COMPRESS_DATA + U_BOOT_DATA, orig) expected = {
@@ -6118,8 +6120,9 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testCompUtilPadding(self): """Test padding of compression algorithms""" - # Skip zstd because it doesn't support padding - for bintool in [v for k,v in self.comp_bintools.items() if k != 'zstd']: + # Skip zstd and lz4 because they doesn't support padding + for bintool in [v for k,v in self.comp_bintools.items() + if not k in ['zstd', 'lz4']]: self._CheckBintool(bintool) data = bintool.compress(COMPRESS_DATA) self.assertNotEqual(COMPRESS_DATA, data)
tools/binman/test/184_compress_section_size.dts +1 -0
@@ -6,6 +6,7 @@ section { size = <0x30>; compress = "lz4"; + pad-byte = <0xff>; blob { filename = "compress"; };
Signature · 1 line
2.45.2
Re: [PATCH 05/18] binman: Workaround lz4 cli padding in test cases
Quoted 6 lines · Jiaxun Yang
Newer lz4 util is not happy with any padding at end of file, it would abort with error message like:
Stream followed by undecodable data at position 43.
Quoted 8 lines
Workaround by skipping testCompUtilPadding test case and manually strip padding in testCompressSectionSize test case.
Signed-off-by Jiaxun Yang <[email protected]>--- tools/binman/ftest.py | 7 +++++-- tools/binman/test/184_compress_section_size.dts | 1 + 2 files changed, 6 insertions(+), 2 deletions(-)
Quoted 42 lines
tools/binman/ftest.py +5
-2@@ -4518,6 +4518,8 @@ class TestFunctional(unittest.TestCase): dtb.Scan() props = self._GetPropTree(dtb, ['offset', 'image-pos', 'size', 'uncomp-size']) + data = data[:0x30] + data = data.rstrip(b'\xff') orig = self._decompress(data) self.assertEqual(COMPRESS_DATA + U_BOOT_DATA, orig) expected = {@@ -6118,8 +6120,9 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testCompUtilPadding(self): """Test padding of compression algorithms""" - # Skip zstd because it doesn't support padding - for bintool in [v for k,v in self.comp_bintools.items() if k != 'zstd']: + # Skip zstd and lz4 because they doesn't support padding + for bintool in [v for k,v in self.comp_bintools.items() + if not k in ['zstd', 'lz4']]: self._CheckBintool(bintool) data = bintool.compress(COMPRESS_DATA) self.assertNotEqual(COMPRESS_DATA, data)tools/binman/test/184_compress_section_size.dts +1
-1@@ -6,6 +6,7 @@ section { size = <0x30>; compress = "lz4"; + pad-byte = <0xff>; blob { filename = "compress"; }; --2.45.2
PATCH 6/18 tests/test_event_dump: Relax match rule for output
In reply to Jiaxun Yangevent_dump.py relies on addr2line to obtain source location information, however newer addr2line is unable to determine line numbers for some functions.
With addr2line from binutils 2.34 we got:
Event type Id Source location -------------------- ------------------------------ ------------------------------ EVT_FT_FIXUP bootmeth_vbe_ft_fixup :? EVT_FT_FIXUP bootmeth_vbe_simple_ft_fixup :? EVT_LAST_STAGE_INIT install_smbios_table :? EVT_MISC_INIT_F sandbox_early_getopt_check arch/sandbox/cpu/start.c:61 EVT_TEST h_adder_simple :?
Which will fail the test.
Relax the source location regex to .*:.*, this is sufficent to show that addr2line is being called and returned a possible line number.
--- test/py/tests/test_event_dump.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
test/py/tests/test_event_dump.py +5 -5
@@ -16,9 +16,9 @@ def test_event_dump(u_boot_console): out = util.run_and_log(cons, ['scripts/event_dump.py', sandbox]) expect = '''.*Event type Id Source location -------------------- ------------------------------ ------------------------------ -EVT_FT_FIXUP bootmeth_vbe_ft_fixup .*boot/vbe_request.c:.* -EVT_FT_FIXUP bootmeth_vbe_simple_ft_fixup .*boot/vbe_simple_os.c:.* -EVT_LAST_STAGE_INIT install_smbios_table .*lib/efi_loader/efi_smbios.c:.* -EVT_MISC_INIT_F sandbox_early_getopt_check .*arch/sandbox/cpu/start.c:.* -EVT_TEST h_adder_simple .*test/common/event.c:''' +EVT_FT_FIXUP bootmeth_vbe_ft_fixup .*:.* +EVT_FT_FIXUP bootmeth_vbe_simple_ft_fixup .*:.* +EVT_LAST_STAGE_INIT install_smbios_table .*:.* +EVT_MISC_INIT_F sandbox_early_getopt_check .*:.* +EVT_TEST h_adder_simple .*:''' assert re.match(expect, out, re.MULTILINE) is not None
Signature · 1 line
2.45.2
Re: [PATCH 06/18] tests/test_event_dump: Relax match rule for output
Hi Jiaxun,
Quoted 4 lines · Jiaxun Yang
event_dump.pyrelies on addr2line to obtain source location information, however newer addr2line is unable to determine line numbers for some functions.
Is this a bug in the tool?
Quoted 13 lines
With addr2line from binutils 2.34 we got:
Event type Id Source location -------------------- ------------------------------ ------------------------------ EVT_FT_FIXUP bootmeth_vbe_ft_fixup :? EVT_FT_FIXUP bootmeth_vbe_simple_ft_fixup :? EVT_LAST_STAGE_INIT install_smbios_table :? EVT_MISC_INIT_F sandbox_early_getopt_check arch/sandbox/cpu/start.c:61 EVT_TEST h_adder_simple :?Which will fail the test.
Quoted 8 lines
Relax the source location regex to .*:.*, this is sufficent to show that addr2line is being called and returned a possible line number.
Signed-off-by Jiaxun Yang <[email protected]>--- test/py/tests/test_event_dump.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Quoted 22 lines
test/py/tests/test_event_dump.py +5
-6@@ -16,9 +16,9 @@ def test_event_dump(u_boot_console): out = util.run_and_log(cons, ['scripts/event_dump.py', sandbox]) expect = '''.*Event type Id Source location -------------------- ------------------------------ ------------------------------ -EVT_FT_FIXUP bootmeth_vbe_ft_fixup .*boot/vbe_request.c:.* -EVT_FT_FIXUP bootmeth_vbe_simple_ft_fixup .*boot/vbe_simple_os.c:.* -EVT_LAST_STAGE_INIT install_smbios_table .*lib/efi_loader/efi_smbios.c:.* -EVT_MISC_INIT_F sandbox_early_getopt_check .*arch/sandbox/cpu/start.c:.* -EVT_TEST h_adder_simple .*test/common/event.c:''' +EVT_FT_FIXUP bootmeth_vbe_ft_fixup .*:.* +EVT_FT_FIXUP bootmeth_vbe_simple_ft_fixup .*:.* +EVT_LAST_STAGE_INIT install_smbios_table .*:.* +EVT_MISC_INIT_F sandbox_early_getopt_check .*:.* +EVT_TEST h_adder_simple .*:''' assert re.match(expect, out, re.MULTILINE) is not None --
Quoted 2 lines
2.45.2
Regards,
Simon
PATCH 7/18 lib/charset & efi: Fix possible unaligned accesses
In reply to Jiaxun YangAs per armv7 arch spec, for A-profile CPU if translation is disabled, then the default memory type is Device(-nGnRnE) instead of Normal, which requires that alignment be enforced.
This means in some cases we can't perform unaligned access even after allow_unaligned is called.
We do have many platforms that didn't have translation enabled in U-Boot, and QEMU started to enforce this since 9.0.
Fix by using unaligned access helper for UTF-16 memory read/write to ensure we don't do any unaligned access in U-Boot.
--- lib/charset.c | 21 ++++++++++++--------- lib/efi_loader/efi_device_path.c | 11 ++--------- 2 files changed, 14 insertions(+), 18 deletions(-)
lib/charset.c +12 -9
@@ -11,6 +11,7 @@#include <efi_loader.h> #include <errno.h> #include <malloc.h> +#include <asm/unaligned.h> /** * codepage_437 - Unicode to codepage 437 translation table
@@ -215,7 +216,7 @@ s32 utf16_get(const u16 **src)return -1 ;if (!**src)return 0 ; - code = **src; + code =get_unaligned_le16 (*src); ++*src;if (code >=0xDC00 && code <=0xDFFF )return -1 ;
@@ -242,12 +243,12 @@ int utf16_put(s32 code, u16 **dst)if ((code >=0xD800 && code <=0xDFFF ) || code >=0x110000 )return -1 ;if (code <0x10000 ) { - **dst = code; +put_unaligned_le16 (code, *dst); }else { code -=0x10000 ; - **dst = code >>10 |0xD800 ; +put_unaligned_le16 (code >>10 |0xD800 , *dst); ++*dst; - **dst = (code &0x3ff ) |0xDC00 ; +put_unaligned_le16 ((code &0x3ff ) |0xDC00 , *dst); } ++*dst;return 0 ;
@@ -392,7 +393,7 @@ int __efi_runtime u16_strncmp(const u16 *s1, const u16 *s2, size_t n)int ret =0 ;for (; n; --n, ++s1, ++s2) { - ret = *s1 - *s2; + ret =get_unaligned_le16 (s1) -get_unaligned_le16 (s2);if (ret || !*s1)break ; }
@@ -403,7 +404,7 @@ int __efi_runtime u16_strncmp(const u16 *s1, const u16 *s2, size_t n) size_t __efi_runtime u16_strnlen(const u16 *in, size_t count) {size_t i; -for (i =0 ; count-- && in[i]; i++); +for (i =0 ; count-- &&get_unaligned_le16 (in + i); i++);return i; }
@@ -417,8 +418,10 @@ u16 *u16_strcpy(u16 *dest, const u16 *src)u16 *tmp = dest;for (;; dest++, src++) { - *dest = *src; -if (!*src) +u16 code =get_unaligned_le16 (src); + +put_unaligned_le16 (code, dest); +if (!code)break ; }
@@ -463,7 +466,7 @@ uint8_t *utf16_to_utf8(uint8_t *dest, const uint16_t *src, size_t size)uint32_t code_high =0 ;while (size--) { -uint32_t code = *src++; +uint32_t code =get_unaligned_le16 (src++);if (code_high) {if (code >=0xDC00 && code <=0xDFFF ) {
lib/efi_loader/efi_device_path.c +2 -9
@@ -18,7 +18,7 @@#include <efi_loader.h> #include <part.h> #include <uuid.h> -#include <asm-generic/unaligned.h> +#include <asm/unaligned.h> #include <linux/compat.h> /* U16_MAX */ /* template END node: */
@@ -873,13 +873,6 @@ static void path_to_uefi(void *uefi, const char *src) {u16 *pos = uefi; -/* -* efi_set_bootdev() calls this routine indirectly before the UEFI -* subsystem is initialized. So we cannot assume unaligned access to be -* enabled. -*/ -allow_unaligned (); -while (*src) {s32 code =utf8_get (&src);
@@ -889,7 +882,7 @@ static void path_to_uefi(void *uefi, const char *src) code ='\\' ;utf16_put (code, &pos); } - *pos =0 ; +put_unaligned_le16 (0 , pos); }/**
Signature · 1 line
2.45.2
PATCH 8/18 CI: Ensure pip install is always performed in venv
In reply to Jiaxun YangSince Ubuntu focal it's nolonger permitted to perform global pip install.
Ensure that pip install is always performed in venv. For buildman alone, all dependencies are already in docker so there is no need to perform pip install.
--- .azure-pipelines.yml | 16 ++++++++++------ .gitlab-ci.yml | 13 ++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-)
.azure-pipelines.yml +10 -6
@@ -161,6 +161,8 @@ stages: - script: | git config --global --add safe.directory $(work_dir) export USER=azure + virtualenv -p /usr/bin/python3 /tmp/venv + . /tmp/venv/bin/activate pip install -r test/py/requirements.txt pip install -r tools/buildman/requirements.txt pip install asteval pylint==3.2.3 pyopenssl
@@ -194,7 +196,10 @@ stages: image: $(ci_runner_image) options: $(container_option) steps: - - script: make pip + - script: | + virtualenv -p /usr/bin/python3 /tmp/venv + . /tmp/venv/bin/activate + make pip - job: count_built_machines displayName: 'Ensure we build all possible machines'
@@ -256,7 +261,11 @@ stages: if [ -n "\${BUILD_ENV}" ]; then export \${BUILD_ENV}; fi + virtualenv -p /usr/bin/python3 /tmp/venv + . /tmp/venv/bin/activate pip install -r tools/buildman/requirements.txt + pip install -r test/py/requirements.txt + pip install pytest-azurepipelines tools/buildman/buildman -o \${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e --board \${TEST_PY_BD} \${OVERRIDE} cp ~/grub_x86.efi \${UBOOT_TRAVIS_BUILD_DIR}/ cp ~/grub_x64.efi \${UBOOT_TRAVIS_BUILD_DIR}/
@@ -280,10 +289,6 @@ stages: /opt/coreboot/cbfstool \${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom remove -n fallback/payload; /opt/coreboot/cbfstool \${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom add-flat-binary -f \${UBOOT_TRAVIS_BUILD_DIR}/u-boot.bin -n fallback/payload -c LZMA -l 0x1110000 -e 0x1110000; fi - virtualenv -p /usr/bin/python3 /tmp/venv - . /tmp/venv/bin/activate - pip install -r test/py/requirements.txt - pip install pytest-azurepipelines export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:\${PATH} export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci # "\${var:+"-k \$var"}" expands to "" if \$var is empty, "-k \$var" if not
@@ -556,7 +561,6 @@ stages: # make environment variables available as tests are running inside a container export BUILDMAN="${BUILDMAN}" git config --global --add safe.directory ${WORK_DIR} - pip install -r tools/buildman/requirements.txt EOF cat << "EOF" >> build.sh if [[ "${BUILDMAN}" != "" ]]; then
.gitlab-ci.yml +8 -5
@@ -50,6 +50,10 @@ stages: - if [ -n "${BUILD_ENV}" ]; then export ${BUILD_ENV}; fi + - virtualenv -p /usr/bin/python3 /tmp/venv + - . /tmp/venv/bin/activate + - pip install -r tools/buildman/requirements.txt + - pip install -r test/py/requirements.txt - tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e --board ${TEST_PY_BD} ${OVERRIDE} - cp ~/grub_x86.efi $UBOOT_TRAVIS_BUILD_DIR/
@@ -74,9 +78,6 @@ stages: /opt/coreboot/cbfstool ${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom remove -n fallback/payload; /opt/coreboot/cbfstool ${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom add-flat-binary -f ${UBOOT_TRAVIS_BUILD_DIR}/u-boot.bin -n fallback/payload -c LZMA -l 0x1110000 -e 0x1110000; fi - - virtualenv -p /usr/bin/python3 /tmp/venv - - . /tmp/venv/bin/activate - - pip install -r test/py/requirements.txt # "${var:+"-k $var"}" expands to "" if $var is empty, "-k $var" if not - export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH}; export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci;
@@ -103,7 +104,6 @@ build all 32bit ARM platforms: script: - ret=0; git config --global --add safe.directory "${CI_PROJECT_DIR}"; - pip install -r tools/buildman/requirements.txt; ./tools/buildman/buildman -o /tmp -PEWM arm -x aarch64 || ret=$?; if [[ $ret -ne 0 ]]; then ./tools/buildman/buildman -o /tmp -seP;
@@ -117,7 +117,6 @@ build all 64bit ARM platforms: - . /tmp/venv/bin/activate - ret=0; git config --global --add safe.directory "${CI_PROJECT_DIR}"; - pip install -r tools/buildman/requirements.txt; ./tools/buildman/buildman -o /tmp -PEWM aarch64 || ret=$?; if [[ $ret -ne 0 ]]; then ./tools/buildman/buildman -o /tmp -seP;
@@ -215,6 +214,8 @@ Run pylint: extends: .testsuites script: - git config --global --add safe.directory "${CI_PROJECT_DIR}" + - virtualenv -p /usr/bin/python3 /tmp/venv; + - . /tmp/venv/bin/activate; - pip install -r test/py/requirements.txt - pip install -r tools/buildman/requirements.txt - pip install asteval pylint==3.2.3 pyopenssl
@@ -243,6 +244,8 @@ Check for pre-schema tags: Check packing of Python tools: extends: .testsuites script: + - virtualenv -p /usr/bin/python3 /tmp/venv; + - . /tmp/venv/bin/activate; - make pip # Test sandbox with test.py
Signature · 1 line
2.45.2
PATCH 9/18 CI: Dockerfile: Set global git name & email config
In reply to Jiaxun YangSet global git name & email config so we don't have to setup it for every project.
--- tools/docker/Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
tools/docker/Dockerfile +4 -5
@@ -121,6 +121,10 @@ RUN apt-get update && apt-get install -y \ zip \ && rm -rf /var/lib/apt/lists/* +# Setup Git +RUN git config --global user.name "U-Boot CI" && \ + git config --global user.email [email protected] + # Make kernels readable for libguestfs tools to work correctly RUN chmod +r /boot/vmlinu*
@@ -128,8 +132,6 @@ RUN chmod +r /boot/vmlinu* RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ cd /tmp/grub && \ git checkout grub-2.06 && \ - git config --global user.name "GitLab CI Runner" && \ - git config --global user.email [email protected] && \ git cherry-pick 049efdd72eb7baa7b2bf8884391ee7fe650da5a0 && \ git cherry-pick 403d6540cd608b2706cfa0cb4713f7e4b490ff45 && \ ./bootstrap && \
@@ -180,9 +182,6 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ cd /tmp/qemu && \ git checkout v8.2.0 && \ - # config user.name and user.email to make 'git am' happy - git config user.name u-boot && \ - git config user.email [email protected] && \ git format-patch 0c7ffc977195~..0c7ffc977195 && \ git am 0001-hw-net-cadence_gem-Fix-MDIO_OP_xxx-values.patch && \ git cherry-pick d3c79c3974 && \
Signature · 1 line
2.45.2
PATCH 10/18 CI: Dockerfile: Bump base OS version
In reply to Jiaxun YangBump base os to latest jammy release and install more required dependencies.
--- tools/docker/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
tools/docker/Dockerfile +6 -1
@@ -2,7 +2,7 @@ # This Dockerfile is used to build an image containing basic stuff to be used # to build U-Boot and run our test suites. -FROM ubuntu:jammy-20240227 +FROM ubuntu:jammy-20240627.1 MAINTAINER Tom Rini <[email protected]> LABEL Description=" This image is for building U-Boot inside a container"
@@ -55,6 +55,7 @@ RUN apt-get update && apt-get install -y \ gawk \ gdisk \ git \ + gnat \ gnu-efi \ gnutls-dev \ graphviz \
@@ -98,10 +99,13 @@ RUN apt-get update && apt-get install -y \ python2.7 \ python3 \ python3-dev \ + python3-jsonschema \ python3-pip \ python3-pyelftools \ python3-sphinx \ + python3-venv \ python3-virtualenv \ + python3-yaml \ rpm2cpio \ sbsigntool \ socat \
@@ -118,6 +122,7 @@ RUN apt-get update && apt-get install -y \ vboot-utils \ xilinx-bootgen \ xxd \ + yamllint \ zip \ && rm -rf /var/lib/apt/lists/*
Signature · 1 line
2.45.2
PATCH 11/18 CI: Dockerfile: Bump GRUB to 2.12
In reply to Jiaxun Yang--- tools/docker/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
tools/docker/Dockerfile +1 -3
@@ -136,9 +136,7 @@ RUN chmod +r /boot/vmlinu* # Build GRUB UEFI targets for ARM & RISC-V, 32-bit and 64-bit RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ cd /tmp/grub && \ - git checkout grub-2.06 && \ - git cherry-pick 049efdd72eb7baa7b2bf8884391ee7fe650da5a0 && \ - git cherry-pick 403d6540cd608b2706cfa0cb4713f7e4b490ff45 && \ + git checkout grub-2.12 && \ ./bootstrap && \ mkdir -p /opt/grub && \ ./configure --target=aarch64 --with-platform=efi \
Signature · 1 line
2.45.2
PATCH 12/18 CI: Dockerfile: Bump QEMU to 9.0.1
In reply to Jiaxun YangPrevious patches had been applied in 9.0.1 so remove cherry-picks as well.
--- tools/docker/Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
tools/docker/Dockerfile +1 -4
@@ -184,10 +184,7 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ cd /tmp/qemu && \ - git checkout v8.2.0 && \ - git format-patch 0c7ffc977195~..0c7ffc977195 && \ - git am 0001-hw-net-cadence_gem-Fix-MDIO_OP_xxx-values.patch && \ - git cherry-pick d3c79c3974 && \ + git checkout v9.0.1 && \ ./configure --prefix=/opt/qemu --target-list="aarch64-softmmu,arm-softmmu,i386-softmmu,m68k-softmmu,mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,ppc-softmmu,riscv32-softmmu,riscv64-softmmu,sh4-softmmu,x86_64-softmmu,xtensa-softmmu" && \ make -j$(nproc) all install && \ rm -rf /tmp/qemu
Signature · 1 line
2.45.2
PATCH 13/18 CI: Dockerfile: Bump fiptool to 2.10.4
In reply to Jiaxun Yang--- tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/docker/Dockerfile +1 -1
@@ -192,7 +192,7 @@ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ # Build fiptool RUN git clone https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git /tmp/tf-a && \ cd /tmp/tf-a/ && \ - git checkout v2.10.0 && \ + git checkout lts-v2.10.4 && \ cd tools/fiptool && \ make && \ mkdir -p /usr/local/bin && \
Signature · 1 line
2.45.2
PATCH 14/18 CI: Dockerfile: Bump genimage to 17
In reply to Jiaxun Yang--- tools/docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/docker/Dockerfile +3 -3
@@ -200,12 +200,12 @@ RUN git clone https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git /tmp/t rm -rf /tmp/tf-a # Build genimage (required by some targets to generate disk images) -RUN wget -O - https://github.com/pengutronix/genimage/releases/download/v14/genimage-14.tar.xz | tar -C /tmp -xJ && \ - cd /tmp/genimage-14 && \ +RUN wget -O - https://github.com/pengutronix/genimage/releases/download/v17/genimage-17.tar.xz | tar -C /tmp -xJ && \ + cd /tmp/genimage-17 && \ ./configure && \ make -j$(nproc) && \ make install && \ - rm -rf /tmp/genimage-14 + rm -rf /tmp/genimage-17 # Build libtpms RUN git clone https://github.com/stefanberger/libtpms /tmp/libtpms && \
Signature · 1 line
2.45.2
PATCH 15/18 CI: Dockerfile: Use kernel.org upstream for trace-cmd
In reply to Jiaxun YangThis is project's upstream URL.
--- tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/docker/Dockerfile +1 -1
@@ -236,7 +236,7 @@ RUN mkdir /tmp/trace && \ cd /tmp/trace/libtracefs && \ make -j$(nproc) && \ sudo make install && \ - git clone https://github.com/rostedt/trace-cmd.git /tmp/trace/trace-cmd && \ + git clone https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git /tmp/trace/trace-cmd && \ cd /tmp/trace/trace-cmd && \ make -j$(nproc) && \ sudo make install && \
Signature · 1 line
2.45.2
PATCH 16/18 CI: Dockerfile: Bump coreboot to 24.05
In reply to Jiaxun Yang--- tools/docker/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
tools/docker/Dockerfile +5 -3
@@ -243,15 +243,17 @@ RUN mkdir /tmp/trace && \ rm -rf /tmp/trace # Build coreboot -RUN wget -O - https://coreboot.org/releases/coreboot-4.22.01.tar.xz | tar -C /tmp -xJ && \ - cd /tmp/coreboot-4.22.01 && \ +RUN wget -O - https://coreboot.org/releases/coreboot-24.05.tar.xz | tar -C /tmp -xJ && \ + cd /tmp/coreboot-24.05 && \ make crossgcc-i386 CPUS=$(nproc) && \ make -C payloads/coreinfo olddefconfig && \ make -C payloads/coreinfo && \ make olddefconfig && \ make -j $(nproc) && \ sudo mkdir /opt/coreboot && \ - sudo cp build/coreboot.rom build/cbfstool /opt/coreboot/ + sudo cp build/coreboot.rom build/cbfstool /opt/coreboot/ && \ + rm -rf /tmp/coreboot-24.05 + # Create our user/group RUN echo uboot ALL=NOPASSWD: ALL > /etc/sudoers.d/uboot
Signature · 1 line
2.45.2
PATCH 17/18 CI: Dockerfile: Add LoongArch64 support
In reply to Jiaxun YangInstall LoongArch64 toolchains, build LoongArch64 QEMU, build LoongArch64 GRUB.
--- tools/docker/Dockerfile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
tools/docker/Dockerfile +17 -2
@@ -19,6 +19,7 @@ RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_ RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.2.0/x86_64-gcc-13.2.0-nolibc-arc-linux.tar.xz | tar -C /opt -xJ RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.2.0/x86_64-gcc-13.2.0-nolibc-arm-linux-gnueabi.tar.xz | tar -C /opt -xJ RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.2.0/x86_64-gcc-13.2.0-nolibc-i386-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.2.0/x86_64-gcc-13.2.0-nolibc-loongarch64-linux.tar.xz | tar -C /opt -xJ RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.2.0/x86_64-gcc-13.2.0-nolibc-m68k-linux.tar.xz | tar -C /opt -xJ RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.2.0/x86_64-gcc-13.2.0-nolibc-mips-linux.tar.xz | tar -C /opt -xJ RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.2.0/x86_64-gcc-13.2.0-nolibc-microblaze-linux.tar.xz | tar -C /opt -xJ
@@ -133,7 +134,7 @@ RUN git config --global user.name "U-Boot CI" && \ # Make kernels readable for libguestfs tools to work correctly RUN chmod +r /boot/vmlinu* -# Build GRUB UEFI targets for ARM & RISC-V, 32-bit and 64-bit +# Build GRUB UEFI targets for ARM & LoongArch64 & RISC-V, 32-bit and 64-bit RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ cd /tmp/grub && \ git checkout grub-2.12 && \
@@ -167,6 +168,20 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ search search_fs_file search_fs_uuid search_label serial sleep test \ true && \ make clean && \ + ./configure --target=loongarch64 --with-platform=efi \ + CC=gcc \ + TARGET_CC=/opt/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-gcc \ + TARGET_OBJCOPY=/opt/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-objcopy \ + TARGET_STRIP=/opt/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-strip \ + TARGET_NM=/opt/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-nm \ + TARGET_RANLIB=/opt/gcc-13.2.0-nolibc/loongarch64-linux/bin/loongarch64-linux-ranlib && \ + make && \ + ./grub-mkimage -O loongarch64-efi -o /opt/grub/grubloongarch64.efi --prefix= -d \ + grub-core cat chain configfile echo efinet ext2 fat halt help linux \ + lsefisystab loadenv lvm minicmd normal part_msdos part_gpt reboot \ + search search_fs_file search_fs_uuid search_label serial sleep test \ + true && \ + make clean && \ ./configure --target=riscv64 --with-platform=efi \ CC=gcc \ TARGET_CC=/opt/gcc-13.2.0-nolibc/riscv64-linux/bin/riscv64-linux-gcc \
@@ -185,7 +200,7 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ cd /tmp/qemu && \ git checkout v9.0.1 && \ - ./configure --prefix=/opt/qemu --target-list="aarch64-softmmu,arm-softmmu,i386-softmmu,m68k-softmmu,mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,ppc-softmmu,riscv32-softmmu,riscv64-softmmu,sh4-softmmu,x86_64-softmmu,xtensa-softmmu" && \ + ./configure --prefix=/opt/qemu --target-list="aarch64-softmmu,arm-softmmu,i386-softmmu,loongarch64-softmmu,m68k-softmmu,mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,ppc-softmmu,riscv32-softmmu,riscv64-softmmu,sh4-softmmu,x86_64-softmmu,xtensa-softmmu" && \ make -j$(nproc) all install && \ rm -rf /tmp/qemu
Signature · 1 line
2.45.2
PATCH 18/18 Use Jiaxun's CI Image
In reply to Jiaxun YangUse Jiaxun's CI Image for demonstration.
NOT FOR COMMIT!
--- .azure-pipelines.yml | 4 ++-- .gitlab-ci.yml | 4 ++-- tools/docker/Dockerfile | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)
.azure-pipelines.yml +2 -2
@@ -2,7 +2,7 @@ variables: windows_vm: windows-2019 ubuntu_vm: ubuntu-22.04 macos_vm: macOS-12 - ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20240227-14Mar2024 + ci_runner_image: ghcr.io/flygoat/u-boot-ci-docker:main # Add '-u 0' options for Azure pipelines, otherwise we get "permission # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer", # since our $(ci_runner_image) user is not root.
@@ -242,7 +242,7 @@ stages: # the below corresponds to .gitlab-ci.yml "before_script" cd \${WORK_DIR} git config --global --add safe.directory \${WORK_DIR} - git clone --depth=1 https://source.denx.de/u-boot/u-boot-test-hooks /tmp/uboot-test-hooks + git clone --depth=1 https://github.com/FlyGoat/u-boot-test-hooks.git /tmp/uboot-test-hooks ln -s travis-ci /tmp/uboot-test-hooks/bin/\`hostname\` ln -s travis-ci /tmp/uboot-test-hooks/py/\`hostname\` grub-mkimage --prefix=\"\" -o ~/grub_x86.efi -O i386-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd
.gitlab-ci.yml +2 -2
@@ -10,7 +10,7 @@ default: # Grab our configured image. The source for this is found # in the u-boot tree at tools/docker/Dockerfile -image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20240227-14Mar2024 +image: ghcr.io/flygoat/u-boot-ci-docker:main # We run some tests in different order, to catch some failures quicker. stages:
@@ -26,7 +26,7 @@ stages: before_script: # Clone uboot-test-hooks - git config --global --add safe.directory "${CI_PROJECT_DIR}" - - git clone --depth=1 https://source.denx.de/u-boot/u-boot-test-hooks /tmp/uboot-test-hooks + - git clone --depth=1 https://github.com/FlyGoat/u-boot-test-hooks.git /tmp/uboot-test-hooks - ln -s travis-ci /tmp/uboot-test-hooks/bin/`hostname` - ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname` - grub-mkimage --prefix="" -o ~/grub_x86.efi -O i386-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd
tools/docker/Dockerfile +3 -3
@@ -277,9 +277,9 @@ USER uboot:uboot # Populate the cache for pip to use. Get these via wget as the # COPY / ADD directives don't work as we need them to. -RUN wget -O /tmp/pytest-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/test/py/requirements.txt -RUN wget -O /tmp/sphinx-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/doc/sphinx/requirements.txt -RUN wget -O /tmp/buildman-requirements.txt https://source.denx.de/u-boot/u-boot/-/raw/master/tools/buildman/requirements.txt +RUN wget -O /tmp/pytest-requirements.txt https://gitlab.com/FlyGoat/u-boot/-/raw/b4/docker-image/test/py/requirements.txt +RUN wget -O /tmp/sphinx-requirements.txt https://gitlab.com/FlyGoat/u-boot/-/raw/b4/docker-image/doc/sphinx/requirements.txt +RUN wget -O /tmp/buildman-requirements.txt https://gitlab.com/FlyGoat/u-boot/-/raw/b4/docker-image/tools/buildman/requirements.txt RUN virtualenv -p /usr/bin/python3 /tmp/venv && \ . /tmp/venv/bin/activate && \ pip install -r /tmp/pytest-requirements.txt \
Signature · 1 line
2.45.2
Quoted 9 lines · Jiaxun Yang
Hi all,
This series build a new CI image based on Ubuntu focal with LoongArch64 support, fixed various python scripts for python 3.12, fixed various problems popped up when testing againt latest software.
Last two commits are for demonstration purpose and not for commit into repo.
Quoted 6 lines
CI runs passed at azure [1].
Thanks
[1]: https://flygoat.visualstudio.com/u-boot/_build/results?buildId=64&view=resultsSigned-off-by Jiaxun Yang <[email protected]>
Overall this looks good but please split this up as:
Quoted 9 lines
---
Jiaxun Yang (18):
binman: Replacepkg_resourceswith importlib.resources
py: Replace distutils.core with setuptools doc/sphinx: Remove usage of six
py: Bump pylint version and clear warnings
binman: Workaround lz4 cli padding in test cases tests/test_event_dump: Relax match rule for output lib/charset & efi: Fix possible unaligned accesses
The binman patches (and change py: Replace.. to tool: Replace..). The doc/sphinx patch, standalone.
Break the pylint patch up in to chunks fixing various tools, and then standalone bump the version.
The dump test change by itself.
The unaligned access change by itself.
Quoted 10 lines
CI: Ensure pip install is always performed in venv
CI: Dockerfile: Set global git name & email config
CI: Dockerfile: Bump base OS version
CI: Dockerfile: Bump GRUB to 2.12
CI: Dockerfile: Bump QEMU to 9.0.1
CI: Dockerfile: Bump fiptool to 2.10.4
CI: Dockerfile: Bump genimage to 17
CI: Dockerfile: Use kernel.org upstream for trace-cmd
CI: Dockerfile: Bump coreboot to 24.05
CI: Dockerfile: Add LoongArch64 support
These are their own series.
Quoted 1 line
[NFC] Use Jiaxun's CI Image
Just don't send this part next time.
Thanks!
Signature · 1 line
Tom