summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Fetzer <fetzerms@users.noreply.github.com>2021-12-02 19:56:22 +0100
committerGitHub <noreply@github.com>2021-12-02 19:56:22 +0100
commit8bef001fe976de2a269c7984da618936e9a0c697 (patch)
tree5ac14a78265bc94699ec5a96b2d36913a132c21a
parent67fc0f0febf064f64120f21e8c8cdc61a66661e7 (diff)
downloadvyos-build-8bef001fe976de2a269c7984da618936e9a0c697.tar.gz
vyos-build-8bef001fe976de2a269c7984da618936e9a0c697.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 39fd6f88..54c5c5e1 100644
--- a/Makefile
+++ b/Makefile
@@ -242,7 +242,7 @@ edgecore: check_build_config clean prepare
xcp-ng-iso: check_build_config clean prepare
@set -e
@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)
set -o pipefail
lb build 2>&1 | tee build.log; if [ $$? -ne 0 ]; then exit 1; fi