diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-11-04 08:22:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-04 08:22:51 +0100 |
| commit | 74b06c308bb6316704d58a5a4386c8dda3c363f2 (patch) | |
| tree | d54a02aea8be9d06647dc75489524c4de6701299 | |
| parent | 12479ef8599c815dbb2b07cc5b4327395764d21c (diff) | |
| parent | f31701f1b48b696ed4176b8ae413aa956ff15c5c (diff) | |
| download | vyos-build-74b06c308bb6316704d58a5a4386c8dda3c363f2.tar.gz vyos-build-74b06c308bb6316704d58a5a4386c8dda3c363f2.zip | |
Merge pull request #452 from dmbaturin/iso-version-json
build script: T5711: copy version.json to the ISO image in addition to the SquashFS image
| -rwxr-xr-x | scripts/build-vyos-image | 3 | ||||
| -rw-r--r-- | scripts/vyos_build_defaults.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/scripts/build-vyos-image b/scripts/build-vyos-image index afeed480..94ce417d 100755 --- a/scripts/build-vyos-image +++ b/scripts/build-vyos-image @@ -332,10 +332,13 @@ if __name__ == "__main__": """ chroot_includes_dir = os.path.join(defaults.BUILD_DIR, defaults.CHROOT_INCLUDES_DIR) + binary_includes_dir = os.path.join(defaults.BUILD_DIR, defaults.BINARY_INCLUDES_DIR) vyos_data_dir = os.path.join(chroot_includes_dir, "usr/share/vyos") os.makedirs(vyos_data_dir, exist_ok=True) with open(os.path.join(vyos_data_dir, 'version.json'), 'w') as f: json.dump(version_data, f) + with open(os.path.join(binary_includes_dir, 'version.json'), 'w') as f: + json.dump(version_data, f) # For backwards compatibility with 'add system image' script from older versions # we need a file in the old format so that script can find out the version of the image diff --git a/scripts/vyos_build_defaults.py b/scripts/vyos_build_defaults.py index 975fcb71..1e153f4b 100644 --- a/scripts/vyos_build_defaults.py +++ b/scripts/vyos_build_defaults.py @@ -37,6 +37,7 @@ PBUILDER_DIR = 'pbuilder' LB_CONFIG_DIR = 'config' CHROOT_INCLUDES_DIR = 'config/includes.chroot' +BINARY_INCLUDES_DIR = 'config/includes.binary' ARCHIVES_DIR = 'config/archives/' VYOS_REPO_FILE = 'config/archives/vyos.list.chroot' |