From 9ed1e98abfe470a958a55b4fc6d6391ca8e4478d Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 30 Jul 2021 16:55:43 -0600 Subject: [PATCH] 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 0c801318609..07b3f3963d0 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