aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2021-07-30 22:55:43 +0000
committerWarner Losh <imp@FreeBSD.org>2021-09-12 15:56:15 +0000
commit363f9e1114eb05e7d9a8d1e07dae29ebe14a1459 (patch)
tree506731151150985c3c7513566563c261fa808677
parent6c8ad124a253e42285a809667aad51853e724d19 (diff)
downloadsrc-363f9e1114eb05e7d9a8d1e07dae29ebe14a1459.tar.gz
src-363f9e1114eb05e7d9a8d1e07dae29ebe14a1459.zip
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 (cherry picked from commit 9ed1e98abfe470a958a55b4fc6d6391ca8e4478d)
-rw-r--r--tools/tools/nanobsd/dhcpd/common6
1 files 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