From bb1bb370a6b575fd1bb0166e92b515351971b168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciro=20Santilli=20=E5=85=AD=E5=9B=9B=E4=BA=8B=E4=BB=B6=20?= =?UTF-8?q?=E6=B3=95=E8=BD=AE=E5=8A=9F?= Date: Fri, 26 Oct 2018 00:00:01 +0000 Subject: [PATCH] build-gem5: factor dtb copy with copy_dir_if_update_non_recursive Less code, less boring + cp prints, only copy if modified. --- build-gem5 | 9 +++++---- common.py | 1 + run-gdbserver | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build-gem5 b/build-gem5 index 55ebbb8..c1b9d46 100755 --- a/build-gem5 +++ b/build-gem5 @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -import glob import os import pathlib import subprocess @@ -55,9 +54,11 @@ class Gem5Component(common.Component): dt_src_dir = os.path.join(gem5_system_src_dir, 'arm', 'dt') dt_build_dir = os.path.join(common.gem5_system_dir, 'arm', 'dt') common.run_cmd(['make', '-C', dt_src_dir]) - os.makedirs(dt_build_dir, exist_ok=True) - for dt in glob.glob(os.path.join(dt_src_dir, '*.dtb')): - common.cp(dt, dt_build_dir) + common.copy_dir_if_update_non_recursive( + srcdir=dt_src_dir, + destdir=dt_build_dir, + filter_ext='.dtb', + ) # Bootloader 32. bootloader32_dir = os.path.join(gem5_system_src_dir, 'arm', 'simple_bootloader') diff --git a/common.py b/common.py index eca178d..5272089 100644 --- a/common.py +++ b/common.py @@ -170,6 +170,7 @@ def write_string_to_file(path, string, mode='w'): f.write(string) def copy_dir_if_update_non_recursive(srcdir, destdir, filter_ext=None): + # TODO print rsync equivalent. os.makedirs(destdir, exist_ok=True) for basename in os.listdir(srcdir): src = os.path.join(srcdir, basename) diff --git a/run-gdbserver b/run-gdbserver index 500e018..ed5b1ff 100755 --- a/run-gdbserver +++ b/run-gdbserver @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -import glob import os import subprocess import sys