Merge "Make dir work on multiple paths"
diff --git a/core/product_config.rbc b/core/product_config.rbc
index c69dbe7..81f9689 100644
--- a/core/product_config.rbc
+++ b/core/product_config.rbc
@@ -439,10 +439,6 @@
"""Returns basename."""
return path.rsplit("/",1)[-1]
-def __dir(path):
- """Returns dirname."""
- return path.rsplit("/",1)[0]
-
def _board_platform_in(g, string_or_list):
"""Returns true if board is in the list."""
board = g.get("TARGET_BOARD_PLATFORM","")
@@ -533,6 +529,13 @@
break
return res
+def _dir(paths):
+ """Equivalent to the GNU make function $(dir).
+
+ Returns the folder of the file for each path in paths.
+ """
+ return " ".join([w.rsplit("/",1)[0] for w in __words(paths)])
+
def _notdir(paths):
"""Equivalent to the GNU make function $(notdir).
@@ -756,7 +759,7 @@
copy_files = _copy_files,
copy_if_exists = _copy_if_exists,
cfg = __h_cfg,
- dir = __dir,
+ dir = _dir,
enforce_product_packages_exist = _enforce_product_packages_exist,
expand_wildcard = _expand_wildcard,
file_exists = rblf_file_exists,