Page MenuHomeFreeBSD
Files F144526516

D29993.1775243313.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D29993.1775243313.diff
View Options

diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile
--- a/stand/efi/boot1/Makefile
+++ b/stand/efi/boot1/Makefile
@@ -53,6 +53,8 @@
CFLAGS+= -DEFI_DEBUG
.endif
+.include "${BOOTSRC}/veriexec.mk"
+
# Always add MI sources and REGULAR efi loader bits
.PATH: ${EFISRC}/loader/arch/${MACHINE}
.PATH: ${EFISRC}/loader
diff --git a/stand/efi/fdt/Makefile b/stand/efi/fdt/Makefile
--- a/stand/efi/fdt/Makefile
+++ b/stand/efi/fdt/Makefile
@@ -9,6 +9,8 @@
SRCS= efi_fdt.c
+.include "${BOOTSRC}/veriexec.mk"
+
# EFI library headers
CFLAGS+= -I${EFISRC}/include
CFLAGS+= -I${EFISRC}/include/${MACHINE}
diff --git a/stand/efi/libefi/Makefile b/stand/efi/libefi/Makefile
--- a/stand/efi/libefi/Makefile
+++ b/stand/efi/libefi/Makefile
@@ -67,4 +67,6 @@
CFLAGS+= -DTERM_EMU
+.include "${BOOTSRC}/veriexec.mk"
+
.include <bsd.lib.mk>
diff --git a/stand/fdt/Makefile b/stand/fdt/Makefile
--- a/stand/fdt/Makefile
+++ b/stand/fdt/Makefile
@@ -17,4 +17,6 @@
CFLAGS+= -Wformat -Wall
+.include "${BOOTSRC}/veriexec.mk"
+
.include <bsd.lib.mk>
diff --git a/stand/ficl.mk b/stand/ficl.mk
--- a/stand/ficl.mk
+++ b/stand/ficl.mk
@@ -17,6 +17,4 @@
CFLAGS+= -I${FICLSRC} -I${FICLSRC}/${FICL_CPUARCH} -I${LDRSRC}
CFLAGS+= -DBF_DICTSIZE=30000
-.if ${MK_LOADER_VERIEXEC} != "no"
-CFLAGS+= -DLOADER_VERIEXEC -I${SRCTOP}/lib/libsecureboot/h
-.endif
+.include "${BOOTSRC}/veriexec.mk"
diff --git a/stand/i386/libfirewire/Makefile b/stand/i386/libfirewire/Makefile
--- a/stand/i386/libfirewire/Makefile
+++ b/stand/i386/libfirewire/Makefile
@@ -8,6 +8,8 @@
SRCS+= firewire.c fwohci.c dconsole.c
SRCS+= dcons.c fwcrom.c
+.include "${BOOTSRC}/veriexec.mk"
+
CFLAGS+= -D_BOOT
CFLAGS+= -I${LDRSRC}
diff --git a/stand/i386/libi386/Makefile b/stand/i386/libi386/Makefile
--- a/stand/i386/libi386/Makefile
+++ b/stand/i386/libi386/Makefile
@@ -17,6 +17,8 @@
.PATH: ${SYSDIR}/teken
SRCS+= teken.c
+.include "${BOOTSRC}/veriexec.mk"
+
BOOT_COMCONSOLE_PORT?= 0x3f8
CFLAGS+= -DCOMPORT=${BOOT_COMCONSOLE_PORT}
diff --git a/stand/liblua/Makefile b/stand/liblua/Makefile
--- a/stand/liblua/Makefile
+++ b/stand/liblua/Makefile
@@ -40,8 +40,7 @@
.if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 0
CFLAGS+= -fPIC
.endif
-.if ${MK_LOADER_VERIEXEC} == "yes"
-CFLAGS+= -I${SRCTOP}/lib/libsecureboot/h -DLOADER_VERIEXEC
-.endif
+
+.include "${BOOTSRC}/veriexec.mk"
.include <bsd.lib.mk>
diff --git a/stand/loader.mk b/stand/loader.mk
--- a/stand/loader.mk
+++ b/stand/loader.mk
@@ -90,16 +90,7 @@
.error Unknown interpreter ${LOADER_INTERP}
.endif
-.if ${MK_LOADER_VERIEXEC} != "no"
-CFLAGS+= -DLOADER_VERIEXEC -I${SRCTOP}/lib/libsecureboot/h
-.if ${MK_LOADER_VERIEXEC_VECTX} != "no"
-CFLAGS+= -DLOADER_VERIEXEC_VECTX
-.endif
-.endif
-
-.if ${MK_LOADER_VERIEXEC_PASS_MANIFEST} != "no"
-CFLAGS+= -DLOADER_VERIEXEC_PASS_MANIFEST -I${SRCTOP}/lib/libsecureboot/h
-.endif
+.include "${BOOTSRC}/veriexec.mk"
.if defined(BOOT_PROMPT_123)
CFLAGS+= -DBOOT_PROMPT_123
diff --git a/stand/veriexec.mk b/stand/veriexec.mk
new file mode 100644
--- /dev/null
+++ b/stand/veriexec.mk
@@ -0,0 +1,9 @@
+.if ${MK_LOADER_VERIEXEC} != "no"
+CFLAGS+= -DLOADER_VERIEXEC -I${SRCTOP}/lib/libsecureboot/h
+.if ${MK_LOADER_VERIEXEC_VECTX} != "no"
+CFLAGS+= -DLOADER_VERIEXEC_VECTX
+.endif
+.if ${MK_LOADER_VERIEXEC_PASS_MANIFEST} != "no"
+CFLAGS+= -DLOADER_VERIEXEC_PASS_MANIFEST
+.endif
+.endif

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 3, 7:08 PM (5 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28253484
Default Alt Text
D29993.1775243313.diff (3 KB)

Event Timeline