]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: Make sure we always boot our built from source kernel
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 5 Apr 2023 14:20:28 +0000 (16:20 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 5 Apr 2023 14:20:28 +0000 (16:20 +0200)
If we build a kernel from source, let's make sure it's always booted
by giving it a very high version number.

mkosi.build

index 24114af4ecf4c42543bb5355a0e6b35982fbab4d..7ad3371ee7887c2f7006ce486cb3206733362a65 100755 (executable)
@@ -178,14 +178,15 @@ if [ -d mkosi.kernel/ ]; then
             tools/testing/selftests/bpf/config.x86_64 \
             tools/testing/selftests/bpf/config
 
-    make O="$BUILDDIR" -j "$(nproc)"
+    # Make sure systemd-boot boots this kernel and not the distro provided one by overriding the version.
+    make O="$BUILDDIR" VERSION=99 -j "$(nproc)"
 
-    KERNEL_RELEASE=$(make O="$BUILDDIR" -s kernelrelease)
+    KERNEL_RELEASE=$(make O="$BUILDDIR" VERSION=99 -s kernelrelease)
     mkdir -p "$DESTDIR/usr/lib/modules/$KERNEL_RELEASE"
-    make O="$BUILDDIR" INSTALL_MOD_PATH="$DESTDIR/usr" modules_install
-    make O="$BUILDDIR" INSTALL_PATH="$DESTDIR/usr/lib/modules/$KERNEL_RELEASE" install
+    make O="$BUILDDIR" VERSION=99 INSTALL_MOD_PATH="$DESTDIR/usr" modules_install
+    make O="$BUILDDIR" VERSION=99 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" KSFT_INSTALL_PATH="$DESTDIR/usr/lib/kernel/selftests" SKIP_TARGETS="" install
+    make -C tools/testing/selftests -j "$(nproc)" O="$BUILDDIR" VERSION=99 KSFT_INSTALL_PATH="$DESTDIR/usr/lib/kernel/selftests" SKIP_TARGETS="" install
 
     ln -sf /usr/lib/kernel/selftests/bpf/bpftool "$DESTDIR/usr/bin/bpftool"
 fi