Page MenuHomeFreeBSD
Files F164120981

D58381.diff
No OneTemporary
Actions

D58381.diff
View Options

diff --git a/stand/defs.mk b/stand/defs.mk
--- a/stand/defs.mk
+++ b/stand/defs.mk
@@ -124,7 +124,7 @@
# These should be confined to loader.mk, but can't because uboot/lib
# also uses it. It's part of loader, but isn't a loader so we can't
# just include loader.mk
-.if ${LOADER_DISK_SUPPORT:Uyes} == "yes"
+.if ${LOADER_DISK_SUPPORT:Uyes:tl} == "yes"
CFLAGS+= -DLOADER_DISK_SUPPORT
.endif
diff --git a/stand/loader.mk b/stand/loader.mk
--- a/stand/loader.mk
+++ b/stand/loader.mk
@@ -40,6 +40,9 @@
# non-default values won't work due to buggy support for that component being
# optional.
#
+# Valid values for these variables are "yes" or "no" (case-insensitive).
+# Specifying any other value may lead to unpredictable results.
+#
# LOADER_BZIP2_SUPPORT Add support for bzip2 compressed files
# LOADER_CD9660_SUPPORT Add support for iso9660 filesystems
# LOADER_DISK_SUPPORT Adds support for disks and mounting filesystems on it
@@ -56,12 +59,12 @@
# LOADER_ZFS_SUPPORT Add support for ZFS filesystems
#
-.if ${LOADER_DISK_SUPPORT:Uyes} == "yes"
+.if ${LOADER_DISK_SUPPORT:Uyes:tl} == "yes"
CFLAGS.part.c+= -DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib
SRCS+= disk.c part.c vdisk.c
.endif
-.if ${LOADER_NET_SUPPORT:Uno} == "yes"
+.if ${LOADER_NET_SUPPORT:Uno:tl} == "yes"
SRCS+= dev_net.c
.endif
@@ -110,47 +113,47 @@
.endif
# Filesystem support
-.if ${LOADER_CD9660_SUPPORT:Uno} == "yes"
+.if ${LOADER_CD9660_SUPPORT:Uno:tl} == "yes"
CFLAGS+= -DLOADER_CD9660_SUPPORT
.endif
-.if ${LOADER_EXT2FS_SUPPORT:Uno} == "yes"
+.if ${LOADER_EXT2FS_SUPPORT:Uno:tl} == "yes"
CFLAGS+= -DLOADER_EXT2FS_SUPPORT
.endif
-.if ${LOADER_MSDOS_SUPPORT:Uno} == "yes"
+.if ${LOADER_MSDOS_SUPPORT:Uno:tl} == "yes"
CFLAGS+= -DLOADER_MSDOS_SUPPORT
.endif
-.if ${LOADER_UFS_SUPPORT:Uyes} == "yes"
+.if ${LOADER_UFS_SUPPORT:Uyes:tl} == "yes"
CFLAGS+= -DLOADER_UFS_SUPPORT
.endif
# Compression
-.if ${LOADER_GZIP_SUPPORT:Uno} == "yes"
+.if ${LOADER_GZIP_SUPPORT:Uno:tl} == "yes"
CFLAGS+= -DLOADER_GZIP_SUPPORT
.endif
-.if ${LOADER_BZIP2_SUPPORT:Uno} == "yes"
+.if ${LOADER_BZIP2_SUPPORT:Uno:tl} == "yes"
CFLAGS+= -DLOADER_BZIP2_SUPPORT
.endif
# Network related things
-.if ${LOADER_NET_SUPPORT:Uno} == "yes"
+.if ${LOADER_NET_SUPPORT:Uno:tl} == "yes"
CFLAGS+= -DLOADER_NET_SUPPORT
.endif
-.if ${LOADER_NFS_SUPPORT:Uno} == "yes"
+.if ${LOADER_NFS_SUPPORT:Uno:tl} == "yes"
CFLAGS+= -DLOADER_NFS_SUPPORT
.endif
-.if ${LOADER_TFTP_SUPPORT:Uno} == "yes"
+.if ${LOADER_TFTP_SUPPORT:Uno:tl} == "yes"
CFLAGS+= -DLOADER_TFTP_SUPPORT
.endif
# Partition support
-.if ${LOADER_GPT_SUPPORT:Uyes} == "yes"
+.if ${LOADER_GPT_SUPPORT:Uyes:tl} == "yes"
CFLAGS+= -DLOADER_GPT_SUPPORT
.endif
-.if ${LOADER_MBR_SUPPORT:Uyes} == "yes"
+.if ${LOADER_MBR_SUPPORT:Uyes:tl} == "yes"
CFLAGS+= -DLOADER_MBR_SUPPORT
.endif
-.if ${HAVE_ZFS:Uno} == "yes"
+.if ${HAVE_ZFS:Uno:tl} == "yes"
CFLAGS+= -DLOADER_ZFS_SUPPORT
CFLAGS+= -I${ZFSSRC}
CFLAGS+= -I${SYSDIR}/cddl/boot/zfs
@@ -194,7 +197,7 @@
HELP_FILES+= ${LDRSRC}/help.common
CFLAGS+= -DHELP_FILENAME=\"${HELP_FILENAME}\"
-.if ${INSTALL_LOADER_HELP_FILE:Uyes} == "yes"
+.if ${INSTALL_LOADER_HELP_FILE:Uyes:tl} == "yes"
CLEANFILES+= ${HELP_FILENAME}
FILES+= ${HELP_FILENAME}
.endif

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 29, 10:32 PM (19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35458410
Default Alt Text
D58381.diff (3 KB)

Event Timeline