summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Fetzer <fetzerms@users.noreply.github.com>2021-12-03 10:20:45 +0100
committerGitHub <noreply@github.com>2021-12-03 10:20:45 +0100
commitb36c7ee57dee70e1e1f65dee404993408f6b34b3 (patch)
tree0612d91e9e392b69c73ac978fba497f060b9f0ca
parent5c7925cbd941f93d74046f3708474b1851b60dbc (diff)
downloadvyos-build-b36c7ee57dee70e1e1f65dee404993408f6b34b3.tar.gz
vyos-build-b36c7ee57dee70e1e1f65dee404993408f6b34b3.zip
T4034: Fix package list for xcp-ng-iso build
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.
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7a4850be..ede81a6f 100644
--- a/Makefile
+++ b/Makefile
@@ -243,7 +243,7 @@ lanner_nca25xx: check_build_config clean prepare
xcp-ng-iso: check_build_config clean prepare
@set -e
@echo $(init_msg)
- 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
sed -i 's/vyos-xe-guest-utilities/xe-guest-utilities/g' scripts/build-submodules
cd $(build_dir)
lb build 2>&1 | tee build.log