vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

T4034: Fix package list for xcp-ng-iso build

Browse Source 
prepare target is running before xcp-ng-iso which copies ./data/package-lists/vyos-x86.list.chroot to $(build_dir)/config/package-lists/vyos-x86.list.chroot.
During the build step, this is too late and therefore we need to patch the package list inside the build directory.
This commit is contained in:
Matthias Fetzer 2021-12-02 19:56:22 +01:00 committed by GitHub
parent 67fc0f0feb
commit 8bef001fe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -242,7 +242,7 @@ edgecore: check_build_config clean prepare
xcp-ng-iso: check_build_config clean prepare xcp-ng-iso: check_build_config clean prepare
@set -e @set -e
@echo "It's not like I'm building this specially for you or anything!" @echo "It's not like I'm building this specially for you or anything!"
sed -i 's/vyos-xe-guest-utilities/xe-guest-utilities/g' data/package-lists/vyos-x86.list.chroot sed -i 's/vyos-xe-guest-utilities/xe-guest-utilities/g' $(build_dir)/package-lists/vyos-x86.list.chroot
cd $(build_dir) cd $(build_dir)
set -o pipefail set -o pipefail
lb build 2>&1 | tee build.log; if [ $$? -ne 0 ]; then exit 1; fi lb build 2>&1 | tee build.log; if [ $$? -ne 0 ]; then exit 1; fi