From owner-svn-src-head@freebsd.org Sun Sep 24 14:26:22 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 D1E17E2935B for ; Sun, 24 Sep 2017 14:26:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x22e.google.com (mail-io0-x22e.google.com [IPv6:2607:f8b0:4001:c06::22e]) (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 832CA77321 for ; Sun, 24 Sep 2017 14:26:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22e.google.com with SMTP id h66so7801685ioh.11 for ; Sun, 24 Sep 2017 07:26:22 -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=SdyZPRb1DZ5uwvo9kbTk/+45ldLSQLb1DT0nJsDM4So=; b=Y7ndTJw7Hhk9GmzCN30K+FjvbIvCn1c0rOxxuYPSw1D3/It5TN3fXIoMRwC05+svrR c3Npm74+b019K6h2oCJhYmUd2yMm6eM8GTzGYlJvjMtjbOztKCSHTt7/phuVmVMMe2Ga tD4Sg4g5nZx8daRnnQDSmOUVfZSOEz+LviyOj7xXCgt/c/9xmc1hnRi1BQrNoNI6vG3/ b6FU/zHvVDoqpeHsFi5QVFCVkSJ4MuqVE76RUg6UgrZ04FdjyiNM1omr5kSm2SVo/aKM HaZGVwSn3Y2FIw/dn1Ox1Aee+dWa5IaZOr4FKlqmAOEibF1vB0o92f1CIIXNlBeTzjoQ w2cQ== 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=SdyZPRb1DZ5uwvo9kbTk/+45ldLSQLb1DT0nJsDM4So=; b=KEo3kfuAWnN5h/ejqyd0KS0TuGnPb9+7l3bwTxCiXGfl0Xc6wXj1SC6uTYiya9ym+3 Kx+xJfjmJuXpFs794SyYcaNxGpQV5J8EvWJ9+fr9Q4M2OVxWepk7WSuX92xK3TdJIDfA reefXOdUsCPgYWq73tEu4SLbdCx9S2Cd+sBS6mUkifCmGgeqqz3WEET1Gl6css9k44Sb RU6dchV9bfE/ryqzNhnWUCiltCOjLRwO1I9JKP/IUkZEyzwXqUhoLCZ3+EcyNrsEfn+g O1GzVTkAdlXFtFhrjaYlHxyPkqIV8fUs2DtDUI558qWEYsDEULbXCsTCKb1yDKU7ZLVf qrUw== X-Gm-Message-State: AHPjjUggjqFkkf5SsTbNfBGoNOSroJ7FP82VbF99bJY8BSBeAE7K4zSP nxkK6P/2JXf1iu5G+rfB7BX+DhCxp9B+SKeWKtLsgA== X-Google-Smtp-Source: AOwi7QCotJ7ThKzWz8FNjrbHtTEmtuqJ0fYxZnv5M69QE3Vh9ooJi2aPeAuB7AUvSkt6xPe1x9B+Ok+53jdyd3CRvTo= X-Received: by 10.107.7.161 with SMTP id g33mr5920351ioi.169.1506263181709; Sun, 24 Sep 2017 07:26:21 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.2.194 with HTTP; Sun, 24 Sep 2017 07:26:20 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:78f4:43db:b652:bfa7] In-Reply-To: References: <201709231244.v8NCig1O037355@repo.freebsd.org> <32112779.upWhmOh2nn@ralph.baldwin.cx> From: Warner Losh Date: Sun, 24 Sep 2017 08:26:20 -0600 X-Google-Sender-Auth: 6ePHSyexlKwXQwDnME8HS5rTf2U Message-ID: Subject: Re: svn commit: r323952 - head/sys/boot/i386/libi386 To: Kamil Czekirda Cc: Baptiste Daroussin , John Baldwin , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , src-committers , Mariusz Zaborski 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: Sun, 24 Sep 2017 14:26:22 -0000 We should move them to src.opt.mk In fact, I think I may just do that this morning. Then we can just change the defaults. Warner On Sun, Sep 24, 2017 at 7:15 AM, Kamil Czekirda wrote: > I think we can enable support for both NFS and TFTP protocols by default > for all architectures and redefine options to LOADER_NO_NFS_SUPPORT and > LOADER_NO_TFTP_SUPPORT. > > 2017-09-23 20:34 GMT+02:00 Warner Losh : > >> 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 >> _______________________________________________ >> svn-src-head@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/svn-src-head >> To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >> > >