On 31/10/14 14:34, Justin Cormack wrote:
> Well, right now it makes little difference to the build time, and it
> ships enabled by default in NetBSD despite not being expected to work
> (which seems more problematic). Actually, the "config" abilities of
> rumprun-posix are pretty gross at present, so not inclined to add
> options.
We're not obliged to repeat all NetBSD mistakes ;)
Dunno if I agree about config being too gross to support a toggle. This
should work:
diff --git a/Makefile b/Makefile
index 1af1a8f..0734181 100644
--- a/Makefile
+++ b/Makefile
@@ -63,9 +63,11 @@ NBUTILS+= usr.bin/ktrace
NBUTILS+= external/bsd/wpa/bin/wpa_passphrase
NBUTILS+= external/bsd/wpa/bin/wpa_supplicant
+ifeq (${BUILDZFS},true)
NBUTILS+= external/cddl/osnet/sbin/zfs
NBUTILS+= external/cddl/osnet/sbin/zpool
NBUTILS+= external/cddl/osnet/usr.bin/ztest
+endif
CPPFLAGS.umount= -DSMALL
diff --git a/buildnb.sh b/buildnb.sh
index 9c98671..907b1eb 100755
--- a/buildnb.sh
+++ b/buildnb.sh
@@ -32,6 +32,7 @@ CHECKOUT=true
JUSTCHECKOUT=false
BUILDRUMP=true
TESTS=false
+BUILDZFS=false
# XXX TODO set FLAGS from -F options here to pass to buildrump.sh
@@ -60,12 +61,16 @@ do
${MAKE} distcleanrump
exit 0
;;
+ "zfs")
+ BUILDZFS=true
+ ;;
*)
RUMPLOC=${arg}
BUILDRUMP=false
;;
esac
done
+export BUILDZFS
set -e
[ ! -f ./buildrump.sh/subr.sh ] && git submodule update --init
buildrump.sh
@@ -93,7 +98,7 @@ done
# Build rump kernel if requested
${BUILDRUMP} && ./buildrump.sh/buildrump.sh ${BUILD_QUIET}
${EXTRAFLAGS} ${FLAG
-s rumpsrc -T rumptools -o rumpdynobj -d rumpdyn -V MKSTATICLIB=no \
- -V MKZFS=yes fullbuild
+ $(${BUILDZFS} && echo -V MKZFS=yes) fullbuild
# build tools (for building libs)
./buildrump.sh/buildrump.sh ${BUILD_QUIET} ${EXTRAFLAGS} ${FLAGS} -s
rumpsrc \
------------------------------------------------------------------------------
_______________________________________________
rumpkernel-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rumpkernel-users
