From owner-svn-src-head@freebsd.org Sun Sep 24 13:16:11 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 A3350E283B9; Sun, 24 Sep 2017 13:16:11 +0000 (UTC) (envelope-from kczekirda@gmail.com) Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) (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 346A67593E; Sun, 24 Sep 2017 13:16:10 +0000 (UTC) (envelope-from kczekirda@gmail.com) Received: by mail-wm0-x241.google.com with SMTP id e64so4998132wmi.2; Sun, 24 Sep 2017 06:16:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=RiZCn3RWIBDDuUzB4AXJFygvWH/+I11V/uXJUKFrQmg=; b=kQnZVDElJlTvLuPFpYi9WYGHokDTcix1qSUueQtyL8lPprb/R+JiIMSc9SgzkDE/T3 SwD/zBsNQ1JXuPo6PHAeA072tsqXAx2J3Sam0YC5PLEJorJF/AUBwIgOP1QOrlqSnmcw +IDOW140d7lq4PHyIWEEfB4HFwPO1Ede5t/nppLZvnxIv6COdtlGmChGPDTmfv/7Bugq cyuE7/7Vni0kOHowzNdS+4vh76RV5xJ/7MCqw0p9uUf663vpfHeI67bDASy4glkDfFM2 5Zzk0PuwiccoXFxCSyDnqV3zicBCpPzPQT0VcIAS1gOKydhV6PLm/K0fgw7SeMDk3jpu 2tVw== 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=RiZCn3RWIBDDuUzB4AXJFygvWH/+I11V/uXJUKFrQmg=; b=rm9rxEZ8hneSHcNGmX4/0yDlxnFxQv7nOxCiNeiEzhtfB9hUm1hU+u81+fcf3yijsN PcinK3ALLWLNE/UU8lU23+ndbv5GLTwSSRxCyDViSXAUd/enSgTCRHpEcg7zzvaMoLp+ KNWlZ1SI8PySNo85xtqBUBFwmk6/RHoc6fz5cpflG/OHOlBbPg3PTJJM5pVsVNo8Xd52 2uYlgygmKtWOBLT/W+1gsH4XAY4zj6IAMGC8o7pIhFiDhIgnyAjSbkwHTm6JDUiAYtuN nnlXSJenScE5Z7ANcXX68SfFQ72jsCW6njHBwleb94vFkhzX1oJvrIVNwNfOMmf+2xIz ymnQ== X-Gm-Message-State: AHPjjUid5HzGmVgGhO8/tX1ZivOHfrYccm/NQLymYKcdcvN1YaYAlNxp 2TZVHueMt1Y02ncwPIT8b2/ND5ZJAfgo1gOOx0VZTg== X-Google-Smtp-Source: AOwi7QBBzCD6njeJu5wAvPDDAvgtA5vu/PPxOwiGRTcaPKbdkwIi62snToiyusTx/79Q9mX+cIqYTRYeeCiBCIS+RQA= X-Received: by 10.28.217.73 with SMTP id q70mr8448436wmg.9.1506258968868; Sun, 24 Sep 2017 06:16:08 -0700 (PDT) MIME-Version: 1.0 Sender: kczekirda@gmail.com Received: by 10.223.130.34 with HTTP; Sun, 24 Sep 2017 06:15:38 -0700 (PDT) In-Reply-To: References: <201709231244.v8NCig1O037355@repo.freebsd.org> <32112779.upWhmOh2nn@ralph.baldwin.cx> From: Kamil Czekirda Date: Sun, 24 Sep 2017 15:15:38 +0200 X-Google-Sender-Auth: xlBika19bGY--4T-mOZKrMKtjkM Message-ID: Subject: Re: svn commit: r323952 - head/sys/boot/i386/libi386 To: Baptiste Daroussin Cc: John Baldwin , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , src-committers , Mariusz Zaborski , Warner Losh 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 13:16:11 -0000 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" >