[efi] Minimise use of iPXE header files when building host utilities

Avoid dragging in unnecessary iPXE header files such as <ipxe/uuid.h>
and <ipxe/tables.h> when building host utilities, and ensure that
FILE_LICENCE() (present in the imported EDK2 headers) expands to a
no-op.

Reported-by: Michael Tautschnig <mt@debian.org>
Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/util/efifatbin.c b/src/util/efifatbin.c
index c02f750b69db71b62c9116f4bc3718607ecf40bf..918e7a3c49cd7ce13ba798679a5f79a9a4e53078 100644 (file)
--- a/src/util/efifatbin.c
+++ b/src/util/efifatbin.c
@@ -17,6 +17,7 @@
  * 02110-1301, USA.
  */
 
+#define FILE_LICENCE(...) extern void __file_licence ( void )
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -27,7 +28,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <getopt.h>
-#include <ipxe/efi/efi.h>
+#include <ipxe/efi/Uefi.h>
 #include <ipxe/efi/IndustryStandard/PeImage.h>
 
 #define eprintf(...) fprintf ( stderr, __VA_ARGS__ )

diff --git a/src/util/efirom.c b/src/util/efirom.c
index abee496dd0d7fd6441612366234b3aa86cc53e45..a982c19ae47558bb2998417c6cb155fcd2c4dca8 100644 (file)
--- a/src/util/efirom.c
+++ b/src/util/efirom.c
@@ -17,6 +17,7 @@
  * 02110-1301, USA.
  */
 
+#define FILE_LICENCE(...) extern void __file_licence ( void )
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -27,7 +28,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <getopt.h>
-#include <ipxe/efi/efi.h>
+#include <ipxe/efi/Uefi.h>
 #include <ipxe/efi/IndustryStandard/PeImage.h>
 #include <ipxe/efi/IndustryStandard/Pci22.h>
 

diff --git a/src/util/elf2efi.c b/src/util/elf2efi.c
index 4d2de3e753ae71671c952c9b554e025769445053..bf6dae05f5248631f5bb95c3f7dd2dbce0bb21f7 100644 (file)
--- a/src/util/elf2efi.c
+++ b/src/util/elf2efi.c
@@ -20,6 +20,7 @@
 #define _GNU_SOURCE
 #define PACKAGE "elf2efi"
 #define PACKAGE_VERSION "1"
+#define FILE_LICENCE(...) extern void __file_licence ( void )
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -30,7 +31,7 @@
 #include <assert.h>
 #include <getopt.h>
 #include <bfd.h>
-#include <ipxe/efi/efi.h>
+#include <ipxe/efi/Uefi.h>
 #include <ipxe/efi/IndustryStandard/PeImage.h>
 #include <libgen.h>