diff options
| author | Warner Losh <imp@FreeBSD.org> | 2017-11-10 23:54:41 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2017-11-10 23:54:41 +0000 |
| commit | a179cd9114f08949088458bc6cef1f094f6c36ce (patch) | |
| tree | bd70ab43a1aa437a98d8248be11a0f7df8379665 /sys/boot | |
| parent | 96534eedcdaf6e6f8151943f759612ec54bf6164 (diff) | |
| download | src-a179cd9114f08949088458bc6cef1f094f6c36ce.tar.gz src-a179cd9114f08949088458bc6cef1f094f6c36ce.zip | |
Replace LOADER_FIREWIRE_SUPPORT variable
Rename LOADER_FIREWIRE_SUPPORT to MK_LOADER_FIREWIRE. Only build
libfirewire when this is "yes". Add note to updating. Fix build script
to build this for x86 so the option doesn't decay. sparc64 supports
ZFS, so also build it MK_ZFS=no.
Sponsored by: Netflix
Notes
Notes:
svn path=/head/; revision=325692
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/Makefile | 8 | ||||
| -rw-r--r-- | sys/boot/i386/Makefile.inc | 5 | ||||
| -rw-r--r-- | sys/boot/i386/loader/Makefile | 11 |
3 files changed, 17 insertions, 7 deletions
diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile index af74d6954dac..9a1663abab07 100644 --- a/sys/boot/i386/Makefile +++ b/sys/boot/i386/Makefile @@ -3,7 +3,13 @@ .include <bsd.init.mk> SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ - libi386 libfirewire loader + libi386 + +.if ${MK_LOADER_FIREWIRE} == "yes" +SUBDIR+= libfirewire +.endif + +SUBDIR+= loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc index b324d1adfef5..5c36555f940c 100644 --- a/sys/boot/i386/Makefile.inc +++ b/sys/boot/i386/Makefile.inc @@ -28,4 +28,9 @@ LD_FLAGS_BIN=-static -N --gc-sections DO32=1 .endif +.if defined(LOADER_FIREWIRE_SUPPORT) +MK_LOADER_FIREWIRE=yes +.warning "LOADER_FIREWIRE_SUPPORT deprecated, please move to WITH_LOADER_FIREWIRE" +.endif + .include "../Makefile.inc" diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index d97d1bcd549d..e9d8f897a164 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -26,12 +26,6 @@ VERSION_FILE= ${.CURDIR}/../loader/version # architecture-specific loader code SRCS= main.c conf.c vers.c chain.c -# Put LOADER_FIREWIRE_SUPPORT=yes in /etc/make.conf for FireWire/dcons support -.if defined(LOADER_FIREWIRE_SUPPORT) -CFLAGS+= -DLOADER_FIREWIRE_SUPPORT -LIBFIREWIRE= ${BOOTOBJ}/i386/libfirewire/libfirewire.a -.endif - # Include bcache code. HAVE_BCACHE= yes @@ -39,6 +33,11 @@ HAVE_BCACHE= yes HAVE_PNP= yes HAVE_ISABUS= yes +.if ${MK_LOADER_FIREWIRE} == "yes" +CFLAGS+= -DLOADER_FIREWIRE_SUPPORT +LIBFIREWIRE= ${BOOTOBJ}/i386/libfirewire/libfirewire.a +.endif + .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT CFLAGS+= -I${BOOTSRC}/geli |