From 84a4af2c81c555a60127ef05a9c0b4762c5d9418 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sun, 29 Jan 2023 15:04:13 +0100 Subject: mkosi: Don't modify rootfs in build script When unprivileged mkosi becomes available, builds will be executed as an unprivileged user, so we won't be able to modify the rootfs anymore. Let's update the build script to account for this. --- mkosi.build | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'mkosi.build') diff --git a/mkosi.build b/mkosi.build index b67ee62e22..ecd233ed5b 100755 --- a/mkosi.build +++ b/mkosi.build @@ -22,7 +22,11 @@ fi # If mkosi.builddir/ exists mkosi will set $BUILDDIR to it, let's then use it # as out-of-tree build dir. Otherwise, let's make up our own builddir. -[ -z "$BUILDDIR" ] && BUILDDIR=build +[ -z "$BUILDDIR" ] && BUILDDIR="$PWD"/build + +# Let's make sure we're using stuff from the build directory first if available there. +PATH="$BUILDDIR:$PATH" +export PATH # Meson uses Python 3 and requires a locale with an UTF-8 character map. # Not running under UTF-8 makes the `ninja test` step break with a CodecError. @@ -52,7 +56,7 @@ fi # the ubuntu script with a symlink to the first bpftool program we can find. for bpftool in /usr/lib/linux-tools/*/bpftool; do [ -x "$bpftool" ] || continue - ln -sf "$bpftool" /usr/sbin/bpftool + ln -sf "$bpftool" "$BUILDDIR"/bpftool break done @@ -60,16 +64,15 @@ done # specific feature we need ("gen skeleton") to this version, so we replace bpftool with a script that reports # version 5.6.0 to satisfy meson which makes bpf work on CentOS Stream 8 as well. if [ "$(grep '^ID=' /etc/os-release)" = "ID=\"centos\"" ] && [ "$(grep '^VERSION=' /etc/os-release)" = "VERSION=\"8\"" ]; then - cp /usr/sbin/bpftool /usr/sbin/bpftool.real - cat >/usr/sbin/bpftool <"$BUILDDIR"/bpftool <