[PATCH RFC v1 5/6] Unhook stubdom from build system

[Wei Liu <wei.liu2@citrix.com>]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
I've run autogen.sh and commit configure change as well.
---
 Makefile             | 55 ++----------------------------
 autogen.sh           |  3 --
 config/Stubdom.mk.in | 39 ---------------------
 configure            | 75 ----------------------------------------
 configure.ac         | 18 ----------
 m4/stubdom.m4        | 96 ----------------------------------------------------
 6 files changed, 2 insertions(+), 284 deletions(-)
 delete mode 100644 config/Stubdom.mk.in
 delete mode 100644 m4/stubdom.m4

diff --git a/Makefile b/Makefile
index a8e9523..dc1ecdf 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 all: dist
 
 -include config/Toplevel.mk
-SUBSYSTEMS?=xen tools stubdom docs
+SUBSYSTEMS?=xen tools docs
 TARGS_DIST=$(patsubst %, dist-%, $(SUBSYSTEMS))
 TARGS_INSTALL=$(patsubst %, install-%, $(SUBSYSTEMS))
 TARGS_BUILD=$(patsubst %, build-%, $(SUBSYSTEMS))
@@ -17,24 +17,6 @@ TARGS_DISTCLEAN=$(patsubst %, distclean-%, $(SUBSYSTEMS))
 export XEN_ROOT=$(CURDIR)
 include Config.mk
 
-.PHONY: mini-os-dir
-mini-os-dir:
-	if [ ! -d $(XEN_ROOT)/extras/mini-os ]; then \
-		GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh \
-			$(MINIOS_UPSTREAM_URL) \
-			$(MINIOS_UPSTREAM_REVISION) \
-			$(XEN_ROOT)/extras/mini-os ; \
-	fi
-
-.PHONY: mini-os-dir-force-update
-mini-os-dir-force-update: mini-os-dir
-	set -ex; \
-	if [ "$(MINIOS_UPSTREAM_REVISION)" ]; then \
-		cd extras/mini-os-remote; \
-		$(GIT) fetch origin; \
-		$(GIT) reset --hard $(MINIOS_UPSTREAM_REVISION); \
-	fi
-
 export XEN_TARGET_ARCH
 export DESTDIR
 
@@ -53,13 +35,6 @@ build-xen:
 build-tools:
 	$(MAKE) -C tools build
 
-.PHONY: build-stubdom
-build-stubdom: mini-os-dir
-	$(MAKE) -C stubdom build
-ifeq (x86_64,$(XEN_TARGET_ARCH))
-	XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom pv-grub
-endif
-
 .PHONY: build-docs
 build-docs:
 	$(MAKE) -C docs build
@@ -86,10 +61,9 @@ dist-%: install-%
 	@: # do nothing
 
 # Legacy dist targets
-.PHONY: xen tools stubdom docs
+.PHONY: xen tools docs
 xen: dist-xen
 tools: dist-tools
-stubdom: dist-stubdom
 docs: dist-docs
 
 .PHONY: install-xen
@@ -100,13 +74,6 @@ install-xen:
 install-tools:
 	$(MAKE) -C tools install
 
-.PHONY: install-stubdom
-install-stubdom: install-tools mini-os-dir
-	$(MAKE) -C stubdom install
-ifeq (x86_64,$(XEN_TARGET_ARCH))
-	XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub
-endif
-
 .PHONY: tools/firmware/seabios-dir-force-update
 tools/firmware/seabios-dir-force-update:
 	$(MAKE) -C tools/firmware seabios-dir-force-update
@@ -177,13 +144,6 @@ clean-xen:
 clean-tools:
 	$(MAKE) -C tools clean
 
-.PHONY: clean-stubdom
-clean-stubdom:
-	$(MAKE) -C stubdom crossclean
-ifeq (x86_64,$(XEN_TARGET_ARCH))
-	XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom crossclean
-endif
-
 .PHONY: clean-docs
 clean-docs:
 	$(MAKE) -C docs clean
@@ -203,14 +163,6 @@ distclean-xen:
 distclean-tools:
 	$(MAKE) -C tools distclean
 
-.PHONY: distclean-stubdom
-distclean-stubdom:
-	$(MAKE) -C stubdom distclean
-ifeq (x86_64,$(XEN_TARGET_ARCH))
-	XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom distclean
-endif
-	rm -rf extras/mini-os extras/mini-os-remote
-
 .PHONY: distclean-docs
 distclean-docs:
 	$(MAKE) -C docs distclean
@@ -225,7 +177,6 @@ help:
 	@echo '  install               - build and install everything'
 	@echo '  install-xen           - build and install the Xen hypervisor'
 	@echo '  install-tools         - build and install the control tools'
-	@echo '  install-stubdom       - build and install the stubdomain images'
 	@echo '  install-docs          - build and install user documentation'
 	@echo ''
 	@echo 'Local dist targets:'
@@ -233,14 +184,12 @@ help:
 	@echo '  world                 - clean everything then make dist'
 	@echo '  dist-xen              - build Xen hypervisor and install into local dist'
 	@echo '  dist-tools            - build the tools and install into local dist'
-	@echo '  dist-stubdom          - build the stubdomain images and install into local dist'
 	@echo '  dist-docs             - build user documentation and install into local dist'
 	@echo ''
 	@echo 'Building targets:'
 	@echo '  build                 - build everything'
 	@echo '  build-xen             - build Xen hypervisor'
 	@echo '  build-tools           - build the tools'
-	@echo '  build-stubdom         - build the stubdomain images'
 	@echo '  build-docs            - build user documentation'
 	@echo ''
 	@echo 'Cleaning targets:'
diff --git a/autogen.sh b/autogen.sh
index 2be8360..3684ea6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,9 +4,6 @@ autoconf -f
   autoconf -f
   autoheader
 )
-( cd stubdom
-  autoconf -f
-)
 ( cd docs
   autoconf -f
 )
diff --git a/config/Stubdom.mk.in b/config/Stubdom.mk.in
deleted file mode 100644
index 5990fc4..0000000
--- a/config/Stubdom.mk.in
+++ /dev/null
@@ -1,39 +0,0 @@
--include $(XEN_ROOT)/config/Paths.mk
-
-# Path Programs
-CMAKE               := @CMAKE@
-FETCHER             := @FETCHER@
-
-# A debug build of stubdom? //FIXME: Someone make this do something
-debug               := @debug@
-
-STUBDOM_TARGETS     := @STUBDOM_TARGETS@
-STUBDOM_BUILD       := @STUBDOM_BUILD@
-STUBDOM_INSTALL     := @STUBDOM_INSTALL@
-
-ZLIB_VERSION        := @ZLIB_VERSION@
-ZLIB_URL            := @ZLIB_URL@
-
-LIBPCI_VERSION      := @LIBPCI_VERSION@
-LIBPCI_URL          := @LIBPCI_URL@
-
-NEWLIB_VERSION      := @NEWLIB_VERSION@
-NEWLIB_URL          := @NEWLIB_URL@
-
-LWIP_VERSION        := @LWIP_VERSION@
-LWIP_URL            := @LWIP_URL@
-
-GRUB_VERSION        := @GRUB_VERSION@
-GRUB_URL            := @GRUB_URL@
-
-OCAML_VERSION       := @OCAML_VERSION@
-OCAML_URL           := @OCAML_URL@
-
-GMP_VERSION         := @GMP_VERSION@
-GMP_URL             := @GMP_URL@
-
-POLARSSL_VERSION    := @POLARSSL_VERSION@
-POLARSSL_URL        := @POLARSSL_URL@
-
-TPMEMU_VERSION      := @TPMEMU_VERSION@
-TPMEMU_URL          := @TPMEMU_URL@
diff --git a/configure b/configure
index c200eed..a1628df 100755
--- a/configure
+++ b/configure
@@ -590,7 +590,6 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 SUBSYSTEMS
 docs
-stubdom
 tools
 xen
 subdirs
@@ -666,7 +665,6 @@ with_libexec_leaf_dir
 with_xen_dumpdir
 enable_xen
 enable_tools
-enable_stubdom
 enable_docs
 '
       ac_precious_vars='build_alias
@@ -674,7 +672,6 @@ host_alias
 target_alias'
 ac_subdirs_all='xen
 tools
-stubdom
 docs'
 
 # Initialize some variables set by options.
@@ -1290,7 +1287,6 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-xen           Disable build and install of xen
   --disable-tools         Disable build and install of tools
-  --enable-stubdom        Enable build and install of stubdom
   --disable-docs          Disable build and install of docs
 
 Optional Packages:
@@ -2005,21 +2001,6 @@ XEN_DUMP_DIR=$xen_dumpdir_path
 
 
 
-case "$host_cpu" in
-    i[3456]86|x86_64)
-        arch_enable_stubdom=y
-        ;;
-    *)
-        arch_enable_stubdom=n
-        ;;
-esac
-
-case "$host_os" in
-    freebsd*)
-        arch_enable_stubdom=n
-        ;;
-esac
-
 
 
 
@@ -2115,62 +2096,6 @@ fi
 
 
 
-# Check whether --enable-stubdom was given.
-if test "${enable_stubdom+set}" = set; then :
-  enableval=$enable_stubdom;
-
-if test "x$enableval" = "xyes"; then :
-
-
-stubdom=y
-SUBSYSTEMS="$SUBSYSTEMS stubdom"
-
-
-else
-
-if test "x$enableval" = "xno"; then :
-
-
-stubdom=n
-
-
-fi
-
-fi
-
-
-else
-
-if test "x$arch_enable_stubdom" = "xy"; then :
-
-
-stubdom=y
-SUBSYSTEMS="$SUBSYSTEMS stubdom"
-
-
-else
-
-
-stubdom=n
-
-
-fi
-
-fi
-
-
-if test -e "stubdom/configure"; then :
-
-if test "x$stubdom" = "xy" || test "x$stubdom" = "x" ; then
-    subdirs="$subdirs stubdom"
-
-fi
-
-fi
-
-
-
-
 # Check whether --enable-docs was given.
 if test "${enable_docs+set}" = set; then :
   enableval=$enable_docs;
diff --git a/configure.ac b/configure.ac
index 1843b52..e4c7af4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,26 +18,8 @@ m4_include([m4/paths.m4])
 
 AX_XEN_EXPAND_CONFIG()
 
-dnl mini-os is only ported to certain platforms
-case "$host_cpu" in
-    i[[3456]]86|x86_64)
-        arch_enable_stubdom=y
-        ;;
-    *)
-        arch_enable_stubdom=n
-        ;;
-esac
-
-dnl Stubdomains need some work in order to compile on FreeBSD
-case "$host_os" in
-    freebsd*)
-        arch_enable_stubdom=n
-        ;;
-esac
-
 AX_SUBSYSTEM_DEFAULT_ENABLE([xen])
 AX_SUBSYSTEM_DEFAULT_ENABLE([tools])
-AX_SUBSYSTEM_CONDITIONAL([stubdom], $arch_enable_stubdom)
 AX_SUBSYSTEM_DEFAULT_ENABLE([docs])
 
 AX_SUBSYSTEM_FINISH
diff --git a/m4/stubdom.m4 b/m4/stubdom.m4
deleted file mode 100644
index f4b4cef..0000000
--- a/m4/stubdom.m4
+++ /dev/null
@@ -1,96 +0,0 @@
-AC_DEFUN([AX_STUBDOM_DEFAULT_ENABLE], [
-AC_ARG_ENABLE([$1],
-AS_HELP_STRING([--disable-$1], [Build and install $1 (default is ENABLED)]),[
-AX_STUBDOM_INTERNAL([$1], [$2])
-],[
-AX_ENABLE_STUBDOM([$1], [$2])
-])
-AC_SUBST([$2])
-])
-
-AC_DEFUN([AX_STUBDOM_DEFAULT_DISABLE], [
-AC_ARG_ENABLE([$1],
-AS_HELP_STRING([--enable-$1], [Build and install $1 (default is DISABLED)]),[
-AX_STUBDOM_INTERNAL([$1], [$2])
-],[
-AX_DISABLE_STUBDOM([$1], [$2])
-])
-AC_SUBST([$2])
-])
-
-AC_DEFUN([AX_STUBDOM_CONDITIONAL], [
-AC_ARG_ENABLE([$1],
-AS_HELP_STRING([--enable-$1], [Build and install $1]),[
-AX_STUBDOM_INTERNAL([$1], [$2])
-])
-])
-
-AC_DEFUN([AX_STUBDOM_CONDITIONAL_FINISH], [
-AS_IF([test "x$$2" = "xy" || test "x$$2" = "x"], [
-AX_ENABLE_STUBDOM([$1],[$2])
-],[
-AX_DISABLE_STUBDOM([$1],[$2])
-])
-AC_SUBST([$2])
-])
-
-AC_DEFUN([AX_STUBDOM_AUTO_DEPENDS], [
-AS_IF([test "x$$1" = "x" && test "x$$2" = "xn"], [
-$1="n"
-])
-])
-
-
-AC_DEFUN([AX_ENABLE_STUBDOM], [
-$2=y
-STUBDOM_TARGETS="$STUBDOM_TARGETS $2"
-STUBDOM_BUILD="$STUBDOM_BUILD $1"
-STUBDOM_INSTALL="$STUBDOM_INSTALL install-$2"
-])
-
-AC_DEFUN([AX_DISABLE_STUBDOM], [
-$2=n
-])
-
-dnl Don't call this outside of this file
-AC_DEFUN([AX_STUBDOM_INTERNAL], [
-AS_IF([test "x$enableval" = "xyes"], [
-AX_ENABLE_STUBDOM([$1], [$2])
-],[
-AS_IF([test "x$enableval" = "xno"],[
-AX_DISABLE_STUBDOM([$1], [$2])
-])
-])
-])
-
-AC_DEFUN([AX_STUBDOM_FINISH], [
-AC_SUBST(STUBDOM_TARGETS)
-AC_SUBST(STUBDOM_BUILD)
-AC_SUBST(STUBDOM_INSTALL)
-echo "Will build the following stub domains:"
-for x in $STUBDOM_BUILD; do
-	echo "  $x"
-done
-])
-
-AC_DEFUN([AX_STUBDOM_LIB], [
-AC_ARG_VAR([$1_URL], [Download url for $2])
-AS_IF([test "x$$1_URL" = "x"], [
-	AS_IF([test "x$extfiles" = "xy"],
-		[$1_URL=\@S|@\@{:@XEN_EXTFILES_URL\@:}@],
-		[$1_URL="$4"])
-	])
-$1_VERSION="$3"
-AC_SUBST($1_URL)
-AC_SUBST($1_VERSION)
-])
-
-AC_DEFUN([AX_STUBDOM_LIB_NOEXT], [
-AC_ARG_VAR([$1_URL], [Download url for $2])
-AS_IF([test "x$$1_URL" = "x"], [
-	$1_URL="$4"
-	])
-$1_VERSION="$3"
-AC_SUBST($1_URL)
-AC_SUBST($1_VERSION)
-])
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel