diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-02-21 15:19:06 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-02-21 15:20:20 +0100 |
| commit | d2a0ca2440f26e8511c7055a6fe73430d22579a1 (patch) | |
| tree | 7473e99dd21e27dfdf907e8f291c6eff36f5dc13 /mkosi.build | |
| parent | 01a0756427c847b26402ceffe508d726ffb42882 (diff) | |
| download | systemd-d2a0ca2440f26e8511c7055a6fe73430d22579a1.tar.gz | |
mkosi: Simplify BUILDDIR/SRCDIR handling a bit
Diffstat (limited to 'mkosi.build')
| -rwxr-xr-x | mkosi.build | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mkosi.build b/mkosi.build index 7b50a60db7..7968051289 100755 --- a/mkosi.build +++ b/mkosi.build @@ -146,8 +146,7 @@ if [ ! -f "$BUILDDIR"/build.ninja ] ; then -D ukify=true fi -cd "$BUILDDIR" -ninja "$@" +ninja -C "$BUILDDIR" "$@" if [ "$WITH_TESTS" = 1 ] ; then if [ -n "$SANITIZERS" ]; then export ASAN_OPTIONS="$MKOSI_ASAN_OPTIONS" @@ -157,33 +156,34 @@ if [ "$WITH_TESTS" = 1 ] ; then TIMEOUT_MULTIPLIER=1 fi - meson test --print-errorlogs --timeout-multiplier=$TIMEOUT_MULTIPLIER + meson test -C "$BUILDDIR" --print-errorlogs --timeout-multiplier=$TIMEOUT_MULTIPLIER fi -cd "$SRCDIR" meson install -C "$BUILDDIR" --quiet --no-rebuild --only-changed if [ -d mkosi.kernel/ ]; then - cd "$SRCDIR/mkosi.kernel" - mkdir -p "$BUILDDIR/mkosi.kernel" + SRCDIR="$SRCDIR/mkosi.kernel" + BUILDDIR="$BUILDDIR/mkosi.kernel" + cd "$SRCDIR" + mkdir -p "$BUILDDIR" # Ensure fast incremental builds by fixating these values which usually change for each build. export KBUILD_BUILD_TIMESTAMP="Fri Jun 5 15:58:00 CEST 2015" export KBUILD_BUILD_HOST="mkosi" - scripts/kconfig/merge_config.sh -O "$BUILDDIR/mkosi.kernel" \ + scripts/kconfig/merge_config.sh -O "$BUILDDIR" \ ../mkosi.kernel.config \ tools/testing/selftests/bpf/config.x86_64 \ tools/testing/selftests/bpf/config - make O="$BUILDDIR/mkosi.kernel" -j "$(nproc)" + make O="$BUILDDIR" -j "$(nproc)" - KERNEL_RELEASE=$(make O="$BUILDDIR"/mkosi.kernel -s kernelrelease) + KERNEL_RELEASE=$(make O="$BUILDDIR" -s kernelrelease) mkdir -p "$DESTDIR/usr/lib/modules/$KERNEL_RELEASE" - make O="$BUILDDIR/mkosi.kernel" INSTALL_MOD_PATH="$DESTDIR/usr" modules_install - make O="$BUILDDIR/mkosi.kernel" INSTALL_PATH="$DESTDIR/usr/lib/modules/$KERNEL_RELEASE" install + make O="$BUILDDIR" INSTALL_MOD_PATH="$DESTDIR/usr" modules_install + make O="$BUILDDIR" INSTALL_PATH="$DESTDIR/usr/lib/modules/$KERNEL_RELEASE" install mkdir -p "$DESTDIR/usr/lib/kernel/selftests" - make -C tools/testing/selftests -j "$(nproc)" O="$BUILDDIR/mkosi.kernel" KSFT_INSTALL_PATH="$DESTDIR/usr/lib/kernel/selftests" SKIP_TARGETS="" install + make -C tools/testing/selftests -j "$(nproc)" O="$BUILDDIR" KSFT_INSTALL_PATH="$DESTDIR/usr/lib/kernel/selftests" SKIP_TARGETS="" install ln -sf /usr/lib/kernel/selftests/bpf/bpftool "$DESTDIR/usr/bin/bpftool" fi |