From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 31 Dec 2020 23:55:21 +0000 (+0900)
Subject: efi: create symbolic link to efi/loader-feature.h
X-Git-Tag: v248-rc1~304^2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0159eee04a275e353c2b5f6ddd4901c180dd3026;p=thirdparty%2Fsystemd.git

efi: create symbolic link to efi/loader-feature.h

To drop src/boot/efi from include directories for binaries later.
---

diff --git a/src/basic/efivars.h b/src/basic/efivars.h
index d310dde7d78..dcaf87eacdb 100644
--- a/src/basic/efivars.h
+++ b/src/basic/efivars.h
@@ -10,7 +10,6 @@
 
 #include "sd-id128.h"
 
-#include "efi/loader-features.h"
 #include "time-util.h"
 
 #define EFI_VENDOR_LOADER  SD_ID128_MAKE(4a,67,b0,82,0a,4c,41,cf,b6,c7,44,0b,29,bb,8c,4f)
diff --git a/src/shared/efi-loader-features.h b/src/shared/efi-loader-features.h
new file mode 120000
index 00000000000..481a053954b
--- /dev/null
+++ b/src/shared/efi-loader-features.h
@@ -0,0 +1 @@
+../boot/efi/loader-features.h
\ No newline at end of file
diff --git a/src/shared/efi-loader.h b/src/shared/efi-loader.h
index 34476f4ced0..76217947362 100644
--- a/src/shared/efi-loader.h
+++ b/src/shared/efi-loader.h
@@ -1,10 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "efivars.h"
-
 #include <sys/stat.h>
 
+#include "efi-loader-features.h"
+#include "efivars.h"
+
 #if ENABLE_EFI
 
 int efi_reboot_to_firmware_supported(void);
diff --git a/src/shared/meson.build b/src/shared/meson.build
index c56da5791d5..dd2e82c0bcb 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -87,6 +87,7 @@ shared_sources = files('''
         dns-domain.h
         dropin.c
         dropin.h
+        efi-loader-features.h
         efi-loader.c
         efi-loader.h
         enable-mempool.c