Help with "vendoring"

[MikeOpenHWGroup]

Hi @zarubaf I need your help with one of the files we 'vendor' from https://github.com/pulp-platform/axi. This is affecting pull-requests #223 and #228.

The file in question is rtl/vendor/pulp_platform_axi/src/axi_burst_splitter.sv. This file has been changed, but I am too thick to figure out how to "revendor" it. The command I tried:

$ ./util/vendor.py rtl/vendor/pulp_platform_axi.vendor.hjson --verbose --update
INFO: Cloning upstream repository https://github.com/pulp-platform/axi.git @ master
Cloning into '/tmp/tmpa2k1yulc'...
remote: Enumerating objects: 8761, done.
remote: Counting objects: 100% (2090/2090), done.
remote: Compressing objects: 100% (657/657), done.
remote: Total 8761 (delta 1457), reused 1957 (delta 1387), pack-reused 6671
Receiving objects: 100% (8761/8761), 5.55 MiB | 21.93 MiB/s, done.
Resolving deltas: 100% (6195/6195), done.
Already on 'master'
Your branch is up to date with 'origin/master'.
INFO: Cloned at revision f700e1db56226f2e932715dda0db0e49c37feb9c
INFO: Copying upstream sources to rtl/vendor/pulp_platform_axi
INFO: Applying patch rtl/vendor/patches/pulp_platform_axi/0001-Adapt-for-local-usage.patch at rtl/vendor/pulp_platform_axi
Checking patch rtl/vendor/pulp_platform_axi/src_files.yml...
Applied patch rtl/vendor/pulp_platform_axi/src_files.yml cleanly.
INFO: Applying patch rtl/vendor/patches/pulp_platform_axi/0002-Add-fuseSoC-core-files.patch at rtl/vendor/pulp_platform_axi
Checking patch rtl/vendor/pulp_platform_axi/axi.core...
error: while searching for:
CAPI=2:

name : pulp-platform.org::axi:0.28.0-dev

filesets:
  rtl:

error: patch failed: rtl/vendor/pulp_platform_axi/axi.core:1
error: rtl/vendor/pulp_platform_axi/axi.core: patch does not apply
CRITICAL: Called program 'git apply --directory rtl/vendor/pulp_platform_axi -p1 rtl/vendor/patches/pulp_platform_axi/0002-Add-fuseSoC-core-files.patch --verbose' returned with 1.
STDOUT:
None
STDERR:
None

Traceback (most recent call last):
  File "./util/vendor.py", line 773, in <module>
    main(sys.argv)
  File "./util/vendor.py", line 699, in main
    desc.import_from_upstream(clone_subdir)
  File "./util/vendor.py", line 460, in import_from_upstream
    map1.import_from_upstream(upstream_path,
  File "./util/vendor.py", line 313, in import_from_upstream
    Mapping1.apply_patch(to_path, patch)
  File "./util/vendor.py", line 287, in apply_patch
    subprocess.run(cmd, check=True)
  File "/usr/lib/python3.8/subprocess.py", line 516, in run
    raise CalledProcessError(retcode, process.args,
subprocess.CalledProcessError: Command '['git', 'apply', '--directory', 'rtl/vendor/pulp_platform_axi', '-p1', 'rtl/vendor/patches/pulp_platform_axi/0002-Add-fuseSoC-core-files.patch', '--verbose']' returned non-zero exit status 1.
$