From owner-svn-src-all@freebsd.org Sat Sep 23 18:34:32 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 B8C0CE0C5FB for ; Sat, 23 Sep 2017 18:34:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x236.google.com (mail-it0-x236.google.com [IPv6:2607:f8b0:4001:c0b::236]) (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 884447F4DD for ; Sat, 23 Sep 2017 18:34:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x236.google.com with SMTP id 85so3935945ith.2 for ; Sat, 23 Sep 2017 11:34:32 -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=I2Q/roWrPFiXnlCP7Z7wmK2HG8AW07pZOS44e9Qtjn4=; b=T3W4zhuPm53hxXSpjwMWepP/fzIHWkRUi9Jwih1Y1eo8RemCceYFTUdMznDbSmr0A6 i1vHw+PcSzELIlDxv+vnV4RWf8qN45zyRfQkN+m1ksIOfhFOduGI9GI/vjaK+0E3GzaC R+/VXH8NB7zWIJgw+SwfEKfztxPfAJ9r4hrS3Hc6JH9IzWFquooVss+Q3b3JPqGoZoQ6 uy9xSH/tU6AGkJN4QCQsCNqOay5M8qyFBJdvzWgJmVSmvfM0/QF1ulbsbGROsegZr1/9 Ieic5kJIb4lPolDBcjw6fbci6wsM2e372ZSjkwawaxpkdYL11xSeogfZb3T5jYrch3Ac Fa6A== 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=I2Q/roWrPFiXnlCP7Z7wmK2HG8AW07pZOS44e9Qtjn4=; b=NuMioXzGv2SESZxdIBw0+uLCnifT9rYVTZXGn8mf3zHIndyUYP3Aobbe4mB0VHLlCV 6IwpqhNDUvCenFRUSVhbj2QGgkZJVaTI5RaQ8SEMFKHFdU904ciUVDocGv57X+4bHmEu LXIHkTm1AOZ2rEQsA/LBFota1EmebryocQSyKLhtHf2WfqtLU2gsl63XrDoAO7bOVsk1 Vm4cHc8ZPDE+vg/R5+eAaVbm/5fRnQaGaOf5Hn4xidwVzWVvRCRNi4IOcrEVW+soFQdg D4EPppqHw0hLdiAD0oA7jf5579LoA8uP1L4c7c3A7qJg3azD7uJ5IpC4DZBztjQLno5y j/qg== X-Gm-Message-State: AHPjjUgKM1BXwXm484MlzPipWV7Tt+qYpGcWKoKVo2/hfNXuoVC1gl1h Wwzg1aD9/VYvIQ1wuHOSr7f5ELYDHQnJPwVkB46oYw== X-Google-Smtp-Source: AOwi7QAIAHSFRp2myi4V7lxi9ufm3zyZs+VEyx6HMk2cgg7QoUm2MotoDA0fkyaqISJyLhKZijmAY0nzloNKIBamx1Y= X-Received: by 10.36.6.18 with SMTP id 18mr13003373itv.15.1506191671801; Sat, 23 Sep 2017 11:34:31 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.2.194 with HTTP; Sat, 23 Sep 2017 11:34:31 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:b191:5184:17d7:e002] In-Reply-To: <32112779.upWhmOh2nn@ralph.baldwin.cx> References: <201709231244.v8NCig1O037355@repo.freebsd.org> <32112779.upWhmOh2nn@ralph.baldwin.cx> From: Warner Losh Date: Sat, 23 Sep 2017 12:34:31 -0600 X-Google-Sender-Auth: OV9W-5fINmF3MVh58SkZB3AJtjs 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-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 18:34:32 -0000 On Sat, Sep 23, 2017 at 9:50 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. 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. > I've wanted all the 'ad-hoc' options in the tree to wind up in src.opts.mk. These would be a great addition. Warner