From owner-svn-src-head@freebsd.org Mon Sep 25 21:09:00 2017 Return-Path: Delivered-To: svn-src-head@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 287EEE24433 for ; Mon, 25 Sep 2017 21:09:00 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x22b.google.com (mail-io0-x22b.google.com [IPv6:2607:f8b0:4001:c06::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DEFAA698BF for ; Mon, 25 Sep 2017 21:08:59 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22b.google.com with SMTP id d16so10990538ioj.3 for ; Mon, 25 Sep 2017 14:08:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=SdUP8WTZsxvUYF1VWTpNo3WhCJ5duPCz/n4ahYwHVBs=; b=lVx+uCFUXTZpsSScDTePLs8HdO+c16HnHiXAsjbeNq6Y1+0dcfP4UzMUsvkTTLydF/ z+yLeq4Q3xZLxrRBcoTJOEyiKLRbC9Mu2xzE3fr4lpxx/d1iIdBwY0xJoyXSeWRfXW0f 7HzNWlhl21v9RNstt6+HfU234JbrLxcu8P4FEb0FUozZyUG7hGczj7NL5e8NefFj+VKN rPQACU8nBTvzD28+9ldf46r9oMDIfw1eAyscrLA2xsstVxrlF7COXCC4N/quitpyYQaS 72M2BMNp1+BgMWyfs7zOz9iDZ7atbYPGbtCVKsAu/ceF928wYdtqUqbwLaWtESU4fbrh Q1jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=SdUP8WTZsxvUYF1VWTpNo3WhCJ5duPCz/n4ahYwHVBs=; b=ooXwjl5awzXRUmqcrY27rM9Y83n3reMVXUk/SXfk8WzdWDD3kUeIIk9zsJ6Cyj9Go4 UJKH4QOkCWStz7NPMV/EuEUdF9KwA/xsR4AfSFIPvhf6u0avVfDKnNVSQewt/AyGgEjW IB8XM+HohmCDDLYE1s/IIcAUB3KXjhbrS0CHAMRJb53nUNmZ1bLHAlfBxNhDv5L5XukQ uzh7QdBZYRnvOVjAOpPocw/3aPPeicF54cInyD/rcZm9qGSrcznyPGt/gwG9y3H23c3P 8k3sKXfIrp5BzYi9fjSzMvIZSlQ7zU0aPbEtvt0AQmLaqBfI9AbzDMpAFUjIWfLNTYFt a2WA== X-Gm-Message-State: AHPjjUgjrZg5sSaizVUkqhjGYssAb+kztY2KE8cWFEhB4Yt2SZYmUIHI VpwAO5CJwXPNUb/E08Yq8UgsHE4mI7Zaf+DDSYJ+Jw== X-Google-Smtp-Source: AOwi7QBHB7EkBaD2ZTYCKurHF+5NuL8Zx9oCbR4+xT/LPIB8QkLYqqGQJAivoc5Lx02e55HzfX0UO3T2iy6SBcBhEjc= X-Received: by 10.107.133.92 with SMTP id h89mr10514467iod.208.1506373739082; Mon, 25 Sep 2017 14:08:59 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.2.194 with HTTP; Mon, 25 Sep 2017 14:08:58 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:78f4:43db:b652:bfa7] In-Reply-To: <5584174.l2VGySiRAV@ralph.baldwin.cx> References: <201709231244.v8NCig1O037355@repo.freebsd.org> <32112779.upWhmOh2nn@ralph.baldwin.cx> <5584174.l2VGySiRAV@ralph.baldwin.cx> From: Warner Losh Date: Mon, 25 Sep 2017 15:08:58 -0600 X-Google-Sender-Auth: xz8EZMgML16lLAAG3KJHHC3jXzw Message-ID: Subject: Re: svn commit: r323952 - head/sys/boot/i386/libi386 To: John Baldwin Cc: Mariusz Zaborski , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Sep 2017 21:09:00 -0000 On Mon, Sep 25, 2017 at 12:30 PM, John Baldwin wrote: > 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? > I think you may be right... I'm hacking through doing load options better, because they suck right now. If someone else wants to eliminate these in the mean time, feel free. I'll cope. Warner