diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-09-30 18:00:12 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-09-30 18:00:12 +0200 |
| commit | 3b18c8321ca73dd07ac22db2be98f53580598cd6 (patch) | |
| tree | ec756591561afbf248c322a8d3858a5d8919be18 | |
| parent | 1d7e6c42cb92dfbf57e9504f1648867b2264bc9c (diff) | |
| parent | a0deb45ac8367ea611b5b97df3eec4888785d10f (diff) | |
| download | vyos-build-3b18c8321ca73dd07ac22db2be98f53580598cd6.tar.gz vyos-build-3b18c8321ca73dd07ac22db2be98f53580598cd6.zip | |
Merge branch 'vyos:current' into current
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 9b937925..64a3040f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -154,7 +154,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ # Build VyConf which is required to build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ - opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#fc327ecd76 -y + opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#d7260e772e39bc6a3a2d76d629567e03bbad16b5 -y # Packages needed for libvyosconfig RUN apt-get update && apt-get install -y \ diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index a783a2d4..b1e6b6f3 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -432,11 +432,6 @@ if __name__ == "__main__": # Release build, use the version from ./configure arguments version = build_config['version'] - if build_config['build_type'] == 'development': - lts_build = False - else: - lts_build = True - version_data = { 'version': version, 'flavor': build_config["build_flavor"], @@ -447,7 +442,7 @@ if __name__ == "__main__": 'build_branch': git_branch, 'release_train': build_config['release_train'], 'architecture': build_config['architecture'], - 'lts_build': lts_build, + 'build_type': build_config['build_type'], 'build_comment': build_config['build_comment'], 'bugtracker_url': build_config['bugtracker_url'], 'documentation_url': build_config['documentation_url'], |