From owner-svn-src-all@freebsd.org Sun Oct 22 15:36:06 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 9A076E54EA1 for ; Sun, 22 Oct 2017 15:36:06 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x235.google.com (mail-it0-x235.google.com [IPv6:2607:f8b0:4001:c0b::235]) (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 5ABED6A38C for ; Sun, 22 Oct 2017 15:36:06 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x235.google.com with SMTP id n195so3354520itg.2 for ; Sun, 22 Oct 2017 08:36:06 -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=xdcUXHOOfNxHEH584lObXAm3jshiDiIYZsPrudDxAtQ=; b=Xc8lKcx6Ot9Hm5uA9lduQChQsJdGxeAm65OLE4DD8+cmFLqyWLh9Y2QyJ5cCQBNZg4 UmaESZ2CoA4VUDQGHCtlrX8U6UzNVt71CHn3pOhnM6zB53q574QITE49mut6u4mwJK8P wiv0A1KhjpylAHeL1CIR13NB9bAZo+QZBvfHQouimaj8Hky86mXXGAQA19AtSm8vy0d1 RA2ZO8m7/Xib8GAk7YBwpRz0SU0EkG593GxD8Ba9ECZJFl7QW8bpCTmVbnvjvrkBFv3B dNoPFCGjvAChid/xasVYTEVjCcFAi0piLvSGgkBXyMmXH6YQUoVTxfhSMBvUkmqQ8w98 r4sw== 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=xdcUXHOOfNxHEH584lObXAm3jshiDiIYZsPrudDxAtQ=; b=JwewUS4HU+X7NghVpUFuL99PvxD2ZYRkHYQjIPeMRxy+wLv7dv0/Gmh1pxlyqiaPyi +J2tdYEVJneqS1/Yl262ODeROeunBLeGmUWB3cPecP8NrF0mRqWE98vvZLTMS9+Im/6t 1ziqg6j7vym3Tv9N5ZDTKEsQFqXrpRnXZXz6UorZS87zKlZgMm/51XueEPQ0XnF+d53r XbMZQUby2L7f+Ee26SXqWFBO7ClZM48sbXpygyc/yaewIQqLRpdnNrA6jgHdV9wO3Eii 0/4TZqwlmFnMJRkLnbYN4NwI+mWp0g4v0o4Ju+EYAzj2avBSpP5W3OxRBbXdmr5+CRxr Z4fg== X-Gm-Message-State: AMCzsaX4a2hO8S0xejX9SXiftGhs73TVzQFhxQ+OvgnWghesDE4MWDqg HCO5tZkKPzJFjdpVUHIw73Lc6gzlm9fmLiA16Ie6Mg== X-Google-Smtp-Source: ABhQp+QMRZHR+u6KV5cFl8QKuCpDHtcWN/18MoM243t+IqCtxjGvSq5zcMOYHqKW0/gH0Uu6PUH2i2TVy9t4MkGmRlM= X-Received: by 10.36.69.100 with SMTP id y97mr6049262ita.50.1508686565504; Sun, 22 Oct 2017 08:36:05 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.57.22 with HTTP; Sun, 22 Oct 2017 08:36:04 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:df5:793f:4458:5cf6] In-Reply-To: <201710221532.v9MFWt6B039162@pdx.rh.CN85.dnsmgr.net> References: <201710220352.v9M3q3l9028012@repo.freebsd.org> <201710221532.v9MFWt6B039162@pdx.rh.CN85.dnsmgr.net> From: Warner Losh Date: Sun, 22 Oct 2017 09:36:04 -0600 X-Google-Sender-Auth: i_8Nsi4zbOiMnA4aZOnjzgBHKfs Message-ID: Subject: Re: svn commit: r324841 - head/sys/boot To: "Rodney W. Grimes" Cc: Warner Losh , 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: Sun, 22 Oct 2017 15:36:06 -0000 On Sun, Oct 22, 2017 at 9:32 AM, Rodney W. Grimes < freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > [ Charset UTF-8 unsupported, converting... ] > > Author: imp > > Date: Sun Oct 22 03:52:03 2017 > > New Revision: 324841 > > URL: https://svnweb.freebsd.org/changeset/base/324841 > > > > Log: > > Use BOOTDIR more consistently in defs.mk rather than repeat sys/boot. > > > > Sponsored By: Netflix > > Shouldn't these be BOOTSRC so BOOTDIR can be /boot as BINDIR is /bin? There's currently no BOOTDIR, so there's no conflict. However, as a design point, that may be desirable. Warner > > Modified: > > head/sys/boot/defs.mk > > > > Modified: head/sys/boot/defs.mk > > ============================================================ > ================== > > --- head/sys/boot/defs.mk Sun Oct 22 00:10:18 2017 (r324840) > > +++ head/sys/boot/defs.mk Sun Oct 22 03:52:03 2017 (r324841) > > @@ -6,9 +6,9 @@ > > __BOOT_DEFS_MK__=${MFILE} > > > > BOOTDIR= ${SRCTOP}/sys/boot > > -FICLDIR= ${SRCTOP}/sys/boot/ficl > > +FICLDIR= ${BOOTDIR}/ficl > > LDR_MI= ${BOOTDIR}/common > > -SASRC= ${SRCTOP}/sys/boot/libsa > > +SASRC= ${BOOTDIR}/libsa > > SYSDIR= ${SRCTOP}/sys > > > > # NB: The makefiles depend on these being empty when we don't build > forth. > > > > > > -- > Rod Grimes > rgrimes@freebsd.org >