shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-10 05:18:17 +03:00
Code

mkosi: Check for configured build directory if WIPE=1

Browse Source 
Otherwise trying to use --wipe might fail if the build directory
has not been configured but is not empty either.

(cherry picked from commit 73b3179a53)
This commit is contained in:
Daan De Meyer 2024-07-09 20:02:47 +02:00
parent 880c32b7e3
commit 0bdb879b3c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkosi.conf.d/10-arch/mkosi.build.chroot
View File

@ -33,7 +33,7 @@ if ((LLVM)) && [[ -n "$SANITIZERS" ]]; then
fi
MKOSI_MESON_OPTIONS="-D mode=developer -D b_sanitize=${SANITIZERS:-none}"
if ((WIPE)); then
if ((WIPE)) && [[ -d "$BUILDDIR/meson-private" ]]; then
MKOSI_MESON_OPTIONS="$MKOSI_MESON_OPTIONS --wipe"
fi

2
mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
View File

@ -62,7 +62,7 @@ if ((LLVM)) && [[ -n "$SANITIZERS" ]]; then
fi
MKOSI_MESON_OPTIONS="-D mode=developer -D b_sanitize=${SANITIZERS:-none}"
if ((WIPE)); then
if ((WIPE)) && [[ -d "$BUILDDIR/meson-private" ]]; then
MKOSI_MESON_OPTIONS="$MKOSI_MESON_OPTIONS --wipe"
fi

2
mkosi.conf.d/10-debian-ubuntu/mkosi.build.chroot
View File

@ -56,7 +56,7 @@ if ((LLVM)) && [[ -n "$SANITIZERS" ]]; then
fi
MKOSI_MESON_OPTIONS="-D mode=developer -D b_sanitize=${SANITIZERS:-none}"
if ((WIPE)); then
if ((WIPE)) && [[ -d "$BUILDDIR/meson-private" ]]; then
MKOSI_MESON_OPTIONS="$MKOSI_MESON_OPTIONS --wipe"
fi

2
mkosi.conf.d/10-opensuse/mkosi.build.chroot
View File

@ -63,7 +63,7 @@ if [[ -z "${MKOSI_LDFLAGS// }" ]]; then
fi
MKOSI_MESON_OPTIONS="-D mode=developer -D b_sanitize=${SANITIZERS:-none}"
if ((WIPE)); then
if ((WIPE)) && [[ -d "$BUILDDIR/meson-private" ]]; then
MKOSI_MESON_OPTIONS="$MKOSI_MESON_OPTIONS --wipe"
fi