From owner-svn-src-all@freebsd.org Sat Sep 23 15:53:55 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF195E08147; Sat, 23 Sep 2017 15:53:55 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B225477434; Sat, 23 Sep 2017 15:53:55 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net [73.231.226.104]) by mail.baldwin.cx (Postfix) with ESMTPSA id EF16110A82D; Sat, 23 Sep 2017 11:53:53 -0400 (EDT) From: John Baldwin To: Mariusz Zaborski Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r323952 - head/sys/boot/i386/libi386 Date: Sat, 23 Sep 2017 08:50:48 -0700 Message-ID: <32112779.upWhmOh2nn@ralph.baldwin.cx> User-Agent: KMail/4.14.10 (FreeBSD/11.1-STABLE; KDE/4.14.30; amd64; ; ) In-Reply-To: <201709231244.v8NCig1O037355@repo.freebsd.org> References: <201709231244.v8NCig1O037355@repo.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Sat, 23 Sep 2017 11:53:54 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Sep 2017 15:53:56 -0000 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