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

[John Baldwin]

On Saturday, September 23, 2017 08:50:48 AM John Baldwin wrote:
> 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.

I'm now less certain of this statement, but apart from "we should do loader build
options better", I think it needs an answer one way or another.  From what I can tell,
all the other Makefiles under sys/boot have 'LOADER_NFS_SUPPORT?= yes' except for
this one.  OTOH, I can't find any code in libi386 that has an #ifdef depending on
either LOADER_NFS_SUPPORT or LOADER_TFTP_SUPPORT.  It seems to only be used for
sys/boot/i386/loader.conf.c when deciding which filesystems to include (and it
already includes both on i386).  I wonder if this entire clause can just be removed
from this Makefile and have it not even care at all about LOADER_*_SUPPORT?

It seems that bapt@ removed the #ifdef's from pxe.c in r305125 so these variables
aren't meaningful now?

-- 
John Baldwin