git: 9ed1e98abfe4 - main - nanobsd: adopt dhcpd to latest conventions

Warner Losh imp at FreeBSD.org
Fri Jul 30 22:56:37 UTC 2021


The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=9ed1e98abfe470a958a55b4fc6d6391ca8e4478d

commit 9ed1e98abfe470a958a55b4fc6d6391ca8e4478d
Author:     Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-07-30 22:55:43 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-07-30 22:55:43 +0000

    nanobsd: adopt dhcpd to latest conventions
    
    Adopt the dhcpd build to use nanobsd-build top level directory that
    other nanobsd builds are using.
    
    Sponsored by:           Netflix
---
 tools/tools/nanobsd/dhcpd/common | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/tools/nanobsd/dhcpd/common b/tools/tools/nanobsd/dhcpd/common
index 0c801318609e..07b3f3963d0b 100644
--- a/tools/tools/nanobsd/dhcpd/common
+++ b/tools/tools/nanobsd/dhcpd/common
@@ -41,11 +41,11 @@ NANO_CFG_BASE=$(pwd)
 NANO_CFG_BASE=${NANO_CFG_BASE%/dhcpd}
 NANO_SRC=$(pwd)
 NANO_SRC=${NANO_SRC%/tools/tools/nanobsd/dhcpd}
-NANO_OBJ=${NANO_SRC}/../dhcpd/obj
+NANO_OBJ=${NANO_SRC}/../nanobsd-builds/dhcpd/obj
 # Where cust_pkg() finds packages to install
 #XXX: Is this the right place?
-#NANO_PORTS=$(realpath ${NANO_SRC}/../ports)
-NANO_PORTS=/usr/ports
+NANO_PORTS=$(realpath ${NANO_SRC}/../ports)
+#NANO_PORTS=/usr/ports
 NANO_PACKAGE_DIR=${NANO_SRC}/${NANO_TOOLS}/Pkg
 NANO_DATADIR=${NANO_OBJ}/_.data
 NANO_DATASIZE=40960


More information about the dev-commits-src-main mailing list