From 2f19f12b7d8e1616249acf2fcb40d904ed433620 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sat, 15 Mar 2025 21:15:35 +0100 Subject: T5400: initialize OPAM environment where it's really needed Instead of trying to fix - what we call - "Schroedingers build environment" in the outside world calling this package build, we should rather fix the Makefile/build system.. --- .github/workflows/package-smoketest.yml | 1 - Makefile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/package-smoketest.yml b/.github/workflows/package-smoketest.yml index 6ab04ac9d..2c90fed39 100644 --- a/.github/workflows/package-smoketest.yml +++ b/.github/workflows/package-smoketest.yml @@ -44,7 +44,6 @@ jobs: repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Build vyos-1x package run: | - eval $(opam env --root=/opt/opam --set-root) cd packages/vyos-1x; dpkg-buildpackage -uc -us -tc -b - name: Generate ISO version string id: version diff --git a/Makefile b/Makefile index 3f3ba5ba7..3ec5ed73f 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ libvyosconfig: git clone https://github.com/vyos/libvyosconfig.git /tmp/libvyosconfig || exit 1 cd /tmp/libvyosconfig && \ git checkout 677d1e2bf8109b9fd4da60e20376f992b747e384 || exit 1 - ./build.sh + eval $$(opam env --root=/opt/opam --set-root) && ./build.sh fi .PHONY: interface_definitions -- cgit v1.2.3