Date: Sun, 24 Sep 2017 08:26:20 -0600 From: Warner Losh <imp@bsdimp.com> To: Kamil Czekirda <kczekirda@freebsd.org> Cc: Baptiste Daroussin <bapt@freebsd.org>, John Baldwin <jhb@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, src-committers <src-committers@freebsd.org>, Mariusz Zaborski <oshogbo@freebsd.org> Subject: Re: svn commit: r323952 - head/sys/boot/i386/libi386 Message-ID: <CANCZdfowFB29GN5sEB0ixadd=gqpcS6rGeVNq9%2BDAbJ07Um9YQ@mail.gmail.com> In-Reply-To: <CADSgWNFfvuiCJAxFyNjM%2BUrPM_L2frm_K0gRsnHyV-5F7sH9RQ@mail.gmail.com> References: <201709231244.v8NCig1O037355@repo.freebsd.org> <32112779.upWhmOh2nn@ralph.baldwin.cx> <CANCZdfraTZ7bmAies4Mp7Dx6FX09ZioU4g1LgYb6GVAToq-J%2BQ@mail.gmail.com> <CADSgWNFfvuiCJAxFyNjM%2BUrPM_L2frm_K0gRsnHyV-5F7sH9RQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <kczekirda@freebsd.org> 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 <imp@bsdimp.com>: > >> On Sat, Sep 23, 2017 at 9:50 AM, John Baldwin <jhb@freebsd.org> 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" >> > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfowFB29GN5sEB0ixadd=gqpcS6rGeVNq9%2BDAbJ07Um9YQ>