Merge branch 'current' into T8193-better-build-type-arch-error

2 files changed, 20 insertions, 2 deletions

diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image
index 94af48e0..597d75be 100755
--- a/scripts/image-build/build-vyos-image
+++ b/scripts/image-build/build-vyos-image
@@ -140,6 +140,7 @@ def build():
     import raw_image
 
     from utils import cmd, rc_cmd
+    from utils import directories
 
     ## Check if there are missing build dependencies
     deps = {
@@ -580,7 +581,17 @@ DOCUMENTATION_URL="{build_config['documentation_url']}"
         ## Create includes
         if has_nonempty_key(build_config, "includes_chroot"):
             for i in build_config["includes_chroot"]:
-                file_path = os.path.join(chroot_includes_dir, i["path"])
+                check_path = i["path"]
+                # T8185: flavor definition files containing a default config
+                # under [[includes_chroot]] may need corrected install path
+                if check_path == 'opt/vyatta/etc/config.boot.default':
+                    file_path = os.path.join(
+                        chroot_includes_dir,
+                        directories['data'].lstrip(os.sep),
+                        'config.boot.default'
+                    )
+                else:
+                    file_path = os.path.join(chroot_includes_dir, check_path)
                 if debug:
                     print(f"D: Creating chroot include file: {file_path}")
                 os.makedirs(os.path.dirname(file_path), exist_ok=True)
@@ -600,7 +611,11 @@ DOCUMENTATION_URL="{build_config['documentation_url']}"
         ## Technically it's just another includes.chroot entry,
         ## but it's special enough to warrant making it easier for flavor writers
         if has_nonempty_key(build_config, "default_config"):
-            file_path = os.path.join(chroot_includes_dir, "opt/vyatta/etc/config.boot.default")
+            file_path = os.path.join(
+                chroot_includes_dir,
+                directories['data'].lstrip(os.sep),
+                'config.boot.default'
+            )
             os.makedirs(os.path.dirname(file_path), exist_ok=True)
             with open(file_path, 'w') as f:
                 f.write(build_config["default_config"])
diff --git a/scripts/image-build/utils.py b/scripts/image-build/utils.py
index 081327cd..9e6dc634 100644
--- a/scripts/image-build/utils.py
+++ b/scripts/image-build/utils.py
@@ -25,6 +25,9 @@ import shutil
 import defaults
 import vyos
 
+from vyos.defaults import directories
+
+
 def check_build_config():
     if not os.path.exists(defaults.BUILD_CONFIG):
         print("Build config file ({file}) does not exist".format(file=defaults.BUILD_CONFIG))