Commit 1e89f48c authored by Nikos Skalkotos's avatar Nikos Skalkotos
Browse files

Seperate host and helper build system

parent 54080484
......@@ -9,10 +9,11 @@ osdir=$(OS_DIR)/$(osname)
defaultdir=$(DEFAULT_DIR)
variantsdir=${sysconfdir}/ganeti/snf-image/variants
dist_os_SCRIPTS = ${srcdir}/host/create ${srcdir}/host/import \
${srcdir}/host/export ${srcdir}/host/rename ${srcdir}/host/verify
dist_os_DATA = ${srcdir}/host/ganeti_api_version ${srcdir}/host/parameters.list \
${srcdir}/host/variants.list
dist_os_SCRIPTS = ${srcdir}/create ${srcdir}/import ${srcdir}/export \
${srcdir}/rename ${srcdir}/verify
dist_os_DATA = ${srcdir}/ganeti_api_version ${srcdir}/parameters.list \
${srcdir}/variants.list
os_DATA = host/common.sh
......@@ -34,8 +35,7 @@ edit = sed \
-e 's|@INSTALL_MBR[@]|$(INSTALL_MBR)|g' \
-e 's|@PROGRESS_MONITOR[@]|$(PROGRESS_MONITOR)|g'
host/common.sh: Makefile
@mkdir_p@ host
common.sh: Makefile
rm -f $@ $@.tmp
srcdir=''; \
test -f ./$@.in || srcdir=$(srcdir)/; \
......
......@@ -32,6 +32,7 @@ KPARTX="kpartx"
LOSETUP="losetup"
SFDISK="sfdisk"
PROGRESS_MONITOR="snf-progress-monitor"
HELPER_VM=@HELPER@
progress_monitor_support="@progress_monitor_support@"
......
......@@ -25,12 +25,21 @@ AC_ARG_WITH([progress-monitor],
AM_CONDITIONAL(PROGMONSUPPORT, [test -n "$PROGRESS_MONITOR"])
# --with-helper..
AC_ARG_WITH([helper],
[AS_HELP_STRING([--with-helper=IMG_PATH],
[Path to helper VM image [LOCALSTATEDIR/lib/snf-image/helper.img]]
)],
[helper="$withval"],
[helper="$localstatedir/lib/snf-image/helper.img"])
AC_SUBST(DEFAULT_DIR, $helper)
# --with-os-dir=...
AC_ARG_WITH([os-dir],
[AS_HELP_STRING([--with-os-dir=DIR],
[top-level OS directory under which to install]
[ (default is $datadir/ganeti/os)]
[top-level OS directory under which to install [DATADIR/ganeti/os]]
)],
[os_dir="$withval"],
[os_dir="$datadir/ganeti/os"])
......@@ -40,7 +49,7 @@ AC_SUBST(OS_DIR, $os_dir)
AC_ARG_WITH([default-dir],
[AS_HELP_STRING([--with-default-dir=DIR],
[top-level default config directory under which to install]
[ (default is $sysconfdir/default)]
[ [SYSCONFDIR/default]]
)],
[default_dir="$withval"],
[default_dir="$sysconfdir/default"])
......
......@@ -91,7 +91,7 @@ CLEANUP+=("rm -f $syslog")
result=$(mktemp --tmpdir result.XXXXXXXX) || exit 1
CLEANUP+=("rm -f $result")
#kvm -drive file=snf-image-helper.img,snapshot=on,format=raw,if=virtio,boot=on \
#kvm -drive file=${HELPER},snapshot=on,format=raw,if=virtio,boot=on \
# -boot c -serial stdout -serial $syslog -serial $result -fda $floppy
# Execute cleanups
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment