diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-15 19:44:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-15 19:44:19 +0000 |
| commit | 2e7444a7d11def437c418ef78baafedb475ae390 (patch) | |
| tree | d8d31b53d211ebbc2448c21e235bf8543a91b5de | |
| parent | 1f9e009223307ec0f7581b078826712c06f42329 (diff) | |
| parent | ab8bce162c7f2a20d9761e3084ebbd2007dd59d3 (diff) | |
| download | libufdt-2e7444a7d11def437c418ef78baafedb475ae390.tar.gz | |
Merge "mkdtboimg: Allow specifying full path for dtb" am: 839abd7f3f am: 103fb51f57 am: ab8bce162c
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1410170
Change-Id: Ifce0556015c03937da509f30aeb3de3494837ac8
| -rwxr-xr-x | utils/src/mkdtboimg.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/utils/src/mkdtboimg.py b/utils/src/mkdtboimg.py index 056fb11..136543f 100755 --- a/utils/src/mkdtboimg.py +++ b/utils/src/mkdtboimg.py @@ -897,10 +897,11 @@ def create_dtbo_image_from_config(fout, argv): params['version'] = version dt_entries = [] for dt_arg in dt_args: - filepath = None - for root, dirnames, filenames in os.walk(args.dtbdir): - for filename in fnmatch.filter(filenames, dt_arg['filename']): - filepath = os.path.join(root, filename) + filepath = dt_arg['filename'] + if not os.path.isabs(filepath): + for root, dirnames, filenames in os.walk(args.dtbdir): + for filename in fnmatch.filter(filenames, filepath): + filepath = os.path.join(root, filename) params['dt_file'] = open(filepath, 'rb') params['dt_offset'] = 0 params['dt_size'] = os.fstat(params['dt_file'].fileno()).st_size |