From bda54ae03f3b7a38f91ac813a350b5a466b0424a Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 6 May 2024 14:11:13 +0200 Subject: [PATCH] mkosi: Skip build if NO_BUILD is set This allows running the integration tests against the distro's packaged version of systemd. --- mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot | 4 ++++ .../system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot | 4 ++++ .../system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot | 4 ++++ .../system/mkosi.conf.d/10-opensuse/mkosi.build.chroot | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot index 33a64cb1d55..7df218823e9 100755 --- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot +++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot @@ -2,6 +2,10 @@ # SPDX-License-Identifier: LGPL-2.1-or-later set -e +if ((NO_BUILD)); then + exit 0 +fi + # shellcheck source=/dev/null . /usr/lib/os-release diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot index 498c52e0114..a8e4e7e90fb 100755 --- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot +++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot @@ -2,6 +2,10 @@ # SPDX-License-Identifier: LGPL-2.1-or-later set -e +if ((NO_BUILD)); then + exit 0 +fi + # shellcheck source=/dev/null . /usr/lib/os-release diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot index 52a23a53b59..2015a4b46c1 100755 --- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot +++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot @@ -2,6 +2,10 @@ # SPDX-License-Identifier: LGPL-2.1-or-later set -e +if ((NO_BUILD)); then + exit 0 +fi + # shellcheck source=/dev/null . /usr/lib/os-release diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot index 83b5a7e6664..2fe3d9464c4 100755 --- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot +++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot @@ -2,6 +2,10 @@ # SPDX-License-Identifier: LGPL-2.1-or-later set -e +if ((NO_BUILD)); then + exit 0 +fi + # shellcheck source=/dev/null . /usr/lib/os-release ID="${ID%-*}" -- 2.47.3