osmith has uploaded this change for review.

View Change

gen_makefile: fix path to _update_src_copy.sh

The directory structure looks like this:

  osmo-dev
  ├── gen_makefile.py
  └── src
      └── _update_src_copy.sh

Fix that _update_src_copy.sh cannot be found if src != args.src_dir.

Fixes: OS#6712
Change-Id: I05daf5e008648d9cb1c272539e97efbf2b9043fc
---
M gen_makefile.py
1 file changed, 5 insertions(+), 1 deletion(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/22/39422/1

diff --git a/gen_makefile.py b/gen_makefile.py
index 3130940..548137d 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -424,8 +424,12 @@
 def gen_update_src_copy_cmd(proj, src_dir, make_dir):
   if not is_src_copy_needed(proj):
     return ""
+
+  src_dir_script = os.path.join(topdir, "src")
+  src_dir_script = os.path.relpath(src_dir_script, make_dir)
+
   ret = "@sh -e "
-  ret += os.path.join(os.path.relpath(args.src_dir, make_dir), "_update_src_copy.sh")
+  ret += os.path.join(src_dir_script, "_update_src_copy.sh")
   ret += f" {shlex.quote(src_dir)}"
   ret += f" {shlex.quote(proj)}"
   ret += " $(TIME_START)"

To view, visit change 39422. To unsubscribe, or for help writing mail filters, visit settings.