Skip to content

[sonic_debian_extension] fix packages.json generation and make the build fail when packages.json is not generated #8044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lguohan merged 3 commits into from
Jul 9, 2021
Merged

[sonic_debian_extension] fix packages.json generation and make the build fail when packages.json is not generated #8044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40b1cc7
[sonic_debian_extension] fix packages.json generation and make the bu…
stepanblyschak Jun 25, 2021
8762d74
Merge branch 'master' of github.com:azure/sonic-buildimage into fix-p…
stepanblyschak Jun 30, 2021
cee1678
account for machine variable
stepanblyschak Jul 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions files/build_templates/packages.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{%- set docker_installation_targets = [] -%}
{%- for docker_installation_target in installer_images.strip().split() -%}
{%- set pkgname, docker_build_path, machine, image = docker_installation_target.split('|') -%}
{%- if not machine or (machine and machine == target_machine) -%}
{%- set _ = docker_installation_targets.append((pkgname, image)) -%}
{%- endif -%}
{%- endfor -%}
{
{% for docker_installation_target in installer_images.strip().split() -%}
{% set pkgname, docker_build_path, image = docker_installation_target.split('|') -%}
{% for pkgname, image in docker_installation_targets -%}
{% set imagefilepath = image.split(':')|first -%}
{% set imageversion = image.split(':')|last -%}
{% set imagefilename = imagefilepath.split('/')|last -%}
Expand Down
6 changes: 5 additions & 1 deletion files/build_templates/sonic_debian_extension.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,11 @@ fi

SONIC_PACKAGE_MANAGER_FOLDER="/var/lib/sonic-package-manager/"
sudo mkdir -p $FILESYSTEM_ROOT/$SONIC_PACKAGE_MANAGER_FOLDER
j2 $BUILD_TEMPLATES/packages.json.j2 | sudo tee $FILESYSTEM_ROOT/$SONIC_PACKAGE_MANAGER_FOLDER/packages.json
target_machine="$TARGET_MACHINE" j2 $BUILD_TEMPLATES/packages.json.j2 | sudo tee $FILESYSTEM_ROOT/$SONIC_PACKAGE_MANAGER_FOLDER/packages.json
if [ "${PIPESTATUS[0]}" != "0" ]; then
echo "Failed to generate packages.json" >&2
exit 1
fi

# Copy docker_image_ctl.j2 for SONiC Package Manager
sudo cp $BUILD_TEMPLATES/docker_image_ctl.j2 $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/docker_image_ctl.j2
Expand Down