svn commit: r323952 - head/sys/boot/i386/libi386

[John Baldwin]

On Saturday, September 23, 2017 12:44:42 PM Mariusz Zaborski wrote:
> Author: oshogbo
> Date: Sat Sep 23 12:44:42 2017
> New Revision: 323952
> URL: https://svnweb.freebsd.org/changeset/base/323952
> 
> Log:
>   After the r317886 support for TFTP and NFS can be enable simultaneously.
>   
>   The cleanup of this distinction was done in the r318988, but this Makefile
>   was omitted.
>   
>   Submitted by:	kczekirda@
> 
> Modified:
>   head/sys/boot/i386/libi386/Makefile
> 
> Modified: head/sys/boot/i386/libi386/Makefile
> ==============================================================================
> --- head/sys/boot/i386/libi386/Makefile	Sat Sep 23 12:35:46 2017	(r323951)
> +++ head/sys/boot/i386/libi386/Makefile	Sat Sep 23 12:44:42 2017	(r323952)
> @@ -12,10 +12,10 @@ SRCS=	biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp
>  .PATH:	${.CURDIR}/../../zfs
>  SRCS+=	devicename_stubs.c
>  
> -# Enable PXE TFTP or NFS support, not both.
>  .if defined(LOADER_TFTP_SUPPORT)
>  CFLAGS+=	-DLOADER_TFTP_SUPPORT
> -.else
> +.endif
> +.if defined(LOADER_NFS_SUPPORT)
>  CFLAGS+=	-DLOADER_NFS_SUPPORT
>  .endif

Is LOADER_NFS_SUPPORT defined by default?  If not, I think you just turned off NFS
in the default loader.  One option would be to add a new 'LOADER_NO_NFS_SUPPORT'
and include NFS unless that is defined.  We could also just always include NFS
support.  Finally, if we want to retain the ability to choose loader bits, these
should probably change to real src options: WITH/WITHOUT_LOADER_TFTP_SUPPORT and
WITH/WITHOUT_LOADER_NFS_SUPPORT and have this Makefile check
MK_LOADER_TFTP/NFS_SUPPORT.  Then we could choose defaults in src.opts.mk.

-- 
John Baldwin