richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
ac3a84
From 812e979fe66e9c1a768fbcee3f568234fec2cded Mon Sep 17 00:00:00 2001
ac3a84
From: Franck Bui <fbui@suse.com>
ac3a84
Date: Tue, 15 Nov 2022 09:04:42 +0100
ac3a84
Subject: [PATCH] meson: install test-kernel-install only when
ac3a84
 -Dkernel-install=true
ac3a84
ac3a84
This patch fixes the following build failure:
ac3a84
ac3a84
  meson.build:3853:8: ERROR: Unknown variable "test_kernel_install_sh".
ac3a84
ac3a84
Fixes #25432.
ac3a84
ac3a84
(cherry picked from commit cc77a56532ddb59770e8312fc1b9954b0b135e72)
ac3a84
ac3a84
Related: #2138081
ac3a84
---
ac3a84
 meson.build | 2 +-
ac3a84
 1 file changed, 1 insertion(+), 1 deletion(-)
ac3a84
ac3a84
diff --git a/meson.build b/meson.build
ac3a84
index 015849af49..35704947e3 100644
ac3a84
--- a/meson.build
ac3a84
+++ b/meson.build
ac3a84
@@ -3841,7 +3841,7 @@ exe = custom_target(
ac3a84
         install_dir : bindir)
ac3a84
 public_programs += exe
ac3a84
 
ac3a84
-if want_tests != 'false'
ac3a84
+if want_tests != 'false' and want_kernel_install
ac3a84
         test('test-kernel-install',
ac3a84
              test_kernel_install_sh,
ac3a84
              args : [exe.full_path(), loaderentry_install])