svn commit: r304507 - in stable: 10/sys/boot/efi/loader 11/sys/boot/efi/loader

[John Baldwin]

Author: jhb
Date: Fri Aug 19 23:31:56 2016
New Revision: 304507
URL: https://svnweb.freebsd.org/changeset/base/304507

Log:
  MFC 304018: Add defines needed to export SMBIOS serial numbers
  
  Some defines needed for exporting serial numbers from the SMBIOS were
  missed during integration of SMBIOS support in the EFI boot loader (r281138).
  This is needed for getting the hostid set from the system hardware UUID.
  
  PR:		206031

Modified:
  stable/10/sys/boot/efi/loader/Makefile
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/boot/efi/loader/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/sys/boot/efi/loader/Makefile
==============================================================================
--- stable/10/sys/boot/efi/loader/Makefile	Fri Aug 19 22:27:14 2016	(r304506)
+++ stable/10/sys/boot/efi/loader/Makefile	Fri Aug 19 23:31:56 2016	(r304507)
@@ -50,6 +50,18 @@ CFLAGS+=	-DEFI_ZFS_BOOT
 .endif
 CFLAGS+=	-DNO_PCI -DEFI
 
+.if !defined(BOOT_HIDE_SERIAL_NUMBERS)
+# Export serial numbers, UUID, and asset tag from loader.
+CFLAGS+= -DSMBIOS_SERIAL_NUMBERS
+.if defined(BOOT_LITTLE_ENDIAN_UUID)
+# Use little-endian UUID format as defined in SMBIOS 2.6.
+CFLAGS+= -DSMBIOS_LITTLE_ENDIAN_UUID
+.elif defined(BOOT_NETWORK_ENDIAN_UUID)
+# Use network-endian UUID format for backward compatibility.
+CFLAGS+= -DSMBIOS_NETWORK_ENDIAN_UUID
+.endif
+.endif
+
 .if ${MK_FORTH} != "no"
 BOOT_FORTH=	yes
 CFLAGS+=	-DBOOT_FORTH