From 74456a5c87cfefcd309719d434c374f100a8e40e Mon Sep 17 00:00:00 2001 From: Jean Guyader Date: Mon, 16 Nov 2009 17:09:54 +0000 Subject: [PATCH] [package/xenclient/v2v]: remove xenipv2v, add libv2vbroker and v2vio. --- package/xenclient/v2v/Config.in | 10 ++++---- package/xenclient/v2v/libv2vbroker.mk | 33 +++++++++++++++++++++++++++ package/xenclient/v2v/v2vbroker.mk | 30 ------------------------ package/xenclient/v2v/v2vio.mk | 33 +++++++++++++++++++++++++++ package/xenclient/v2v/xenipv2v.mk | 31 ------------------------- 5 files changed, 71 insertions(+), 66 deletions(-) create mode 100644 package/xenclient/v2v/libv2vbroker.mk delete mode 100644 package/xenclient/v2v/v2vbroker.mk create mode 100644 package/xenclient/v2v/v2vio.mk delete mode 100644 package/xenclient/v2v/xenipv2v.mk diff --git a/package/xenclient/v2v/Config.in b/package/xenclient/v2v/Config.in index c221c5a..888098e 100644 --- a/package/xenclient/v2v/Config.in +++ b/package/xenclient/v2v/Config.in @@ -1,12 +1,12 @@ menu "v2v" -config BR2_PACKAGE_XENCLIENT_V2VBROKER - bool "XenClient v2vbroker" - select BR2_PACKAGE_XENCLIENT_XEN +config BR2_PACKAGE_XENCLIENT_LIBV2VBROKER + bool "XenClient libv2vbroker" + select BR2_PACKAGE_XENCLIENT_XEN BR2_PACKAGE_XENCLIENT_V2VIO -config BR2_PACKAGE_XENCLIENT_XENIPV2V - bool "XenClient Lwip over v2v lib" +config BR2_PACKAGE_XENCLIENT_V2VIO + bool "XenClient v2v library for kerneland/userland communication" select B2_PACKAGE_XENCLIENT_XEN endmenu diff --git a/package/xenclient/v2v/libv2vbroker.mk b/package/xenclient/v2v/libv2vbroker.mk new file mode 100644 index 0000000..cac8ca0 --- /dev/null +++ b/package/xenclient/v2v/libv2vbroker.mk @@ -0,0 +1,33 @@ +############################################################# +# +# XenClient libv2vbroker +# +############################################################# + +XENCLIENT_LIBV2VBROKER_VERSION:=tip +XENCLIENT_LIBV2VBROKER_DIR:=$(BUILD_DIR)/xenclient-libv2vbroker-tip/common/libv2vbroker +XENCLIENT_LIBV2VBROKER_SITE:=git://git.uk.xensource.com/xenclient/v2v.git +XENCLIENT_LIBV2VBROKER_REPO_DIR:=$(REPO_DIR)/xenclient-v2v + +XENCLIENT_LIBV2VBROKER_INSTALL_STAGING:=YES +XENCLIENT_LIBV2VBROKER_INSTALL_TARGET:=YES +XENCLIENT_LIBV2VBROKER_DEPENDENCIES:=xenclient-xen-auto xenclient-v2vio +XENCLIENT_LIBV2VBROKER_AUTORECONF:=YES +XENCLIENT_LIBV2VBROKER_LIBTOOL_PATCH:=YES +XENCLIENT_LIBV2VBROKER_USE_CONFIG_CACHE:=YES + +$(eval $(call AUTOTARGETS,package/xenclient/v2v,xenclient-libv2vbroker)) + +#Places the source tree under the build tree +$(XENCLIENT_LIBV2VBROKER_TARGET_SOURCE): + if [ ! -d "$(XENCLIENT_LIBV2VBROKER_REPO_DIR)" ]; then \ + mkdir -p $(REPO_DIR) ; \ + $(GIT) $(XENCLIENT_LIBV2VBROKER_SITE) $(XENCLIENT_LIBV2VBROKER_REPO_DIR) ; \ + $(GIT_CHECKOUT) xenclient-v2v $(REPO_DIR) ; \ + fi + ln -fs $(XENCLIENT_LIBV2VBROKER_REPO_DIR) $(BUILD_DIR)/xenclient-libv2vbroker-tip + touch $@ + +$(XENCLIENT_LIBV2VBROKER_TARGET_EXTRACT): + @: #Noop -- already extracted + diff --git a/package/xenclient/v2v/v2vbroker.mk b/package/xenclient/v2v/v2vbroker.mk deleted file mode 100644 index 77d22aa..0000000 --- a/package/xenclient/v2v/v2vbroker.mk +++ /dev/null @@ -1,30 +0,0 @@ -############################################################# -# -# XenClient v2vbroker tool -# -############################################################# - -XENCLIENT_V2VBROKER_VERSION:=tip -XENCLIENT_V2VBROKER_SITE:=git://git.uk.xensource.com/xenclient/v2v.git -XENCLIENT_V2VBROKER_REPO_DIR:=$(REPO_DIR)/xenclient-v2v - -XENCLIENT_V2VBROKER_INSTALL_STAGING:=YES -XENCLIENT_V2VBROKER_INSTALL_TARGET:=YES -XENCLIENT_V2VBROKER_DEPENDENCIES:=xenclient-xen-auto -XENCLIENT_V2VBROKER_AUTORECONF:=YES -XENCLIENT_V2VBROKER_LIBTOOL_PATCH:=YES -XENCLIENT_V2VBROKER_USE_CONFIG_CACHE:=YES - -$(eval $(call AUTOTARGETS,package/xenclient/v2vbroker,xenclient-v2vbroker)) - -#Places the source tree under the build tree -$(XENCLIENT_V2VBROKER_TARGET_SOURCE): - mkdir -p $(REPO_DIR) - $(GIT) $(XENCLIENT_V2VBROKER_SITE) $(XENCLIENT_V2VBROKER_REPO_DIR) - ln -fs $(XENCLIENT_V2VBROKER_REPO_DIR)/linux/v2vbroker $(@D) - $(GIT_CHECKOUT) xenclient-v2v $(REPO_DIR) - touch $@ - -$(XENCLIENT_V2VBROKER_TARGET_EXTRACT): - @: #Noop -- already extracted - diff --git a/package/xenclient/v2v/v2vio.mk b/package/xenclient/v2v/v2vio.mk new file mode 100644 index 0000000..868fdd7 --- /dev/null +++ b/package/xenclient/v2v/v2vio.mk @@ -0,0 +1,33 @@ +############################################################# +# +# XenClient v2vio +# +############################################################# + +XENCLIENT_V2VIO_VERSION:=tip +XENCLIENT_V2VIO_DIR:=$(BUILD_DIR)/xenclient-v2vio-tip/linux/libv2vio +XENCLIENT_V2VIO_SITE:=git://git.uk.xensource.com/xenclient/v2v.git +XENCLIENT_V2VIO_REPO_DIR:=$(REPO_DIR)/xenclient-v2v + +XENCLIENT_V2VIO_INSTALL_STAGING:=YES +XENCLIENT_V2VIO_INSTALL_TARGET:=YES +XENCLIENT_V2VIO_DEPENDENCIES:=xenclient-xen-auto +XENCLIENT_V2VIO_AUTORECONF:=YES +XENCLIENT_V2VIO_LIBTOOL_PATCH:=YES +XENCLIENT_V2VIO_USE_CONFIG_CACHE:=YES + +$(eval $(call AUTOTARGETS,package/xenclient/v2v,xenclient-v2vio)) + +#Places the source tree under the build tree +$(XENCLIENT_V2VIO_TARGET_SOURCE): + if [ ! -d "$(XENCLIENT_V2VIO_REPO_DIR)" ]; then \ + mkdir -p $(REPO_DIR) ; \ + $(GIT) $(XENCLIENT_V2VIO_SITE) $(XENCLIENT_V2VIO_REPO_DIR) ; \ + $(GIT_CHECKOUT) xenclient-v2v $(REPO_DIR) ; \ + fi + ln -fs $(XENCLIENT_V2VIO_REPO_DIR) $(BUILD_DIR)/xenclient-v2vio-tip + touch $@ + +$(XENCLIENT_V2VIO_TARGET_EXTRACT): + @: #Noop -- already extracted + diff --git a/package/xenclient/v2v/xenipv2v.mk b/package/xenclient/v2v/xenipv2v.mk deleted file mode 100644 index 778c365..0000000 --- a/package/xenclient/v2v/xenipv2v.mk +++ /dev/null @@ -1,31 +0,0 @@ -############################################################# -# -# XenClient ip over v2v lib -# -############################################################# - -XENCLIENT_XENIPV2V_VERSION:=tip -XENCLIENT_XENIPV2V_SITE:=git://git.uk.xensource.com/xenclient/v2v.git -XENCLIENT_XENIPV2V_REPO_DIR:=$(REPO_DIR)/xenclient-v2v - -XENCLIENT_XENIPV2V_INSTALL_STAGING:=YES -XENCLIENT_XENIPV2V_INSTALL_TARGET:=YES -XENCLIENT_XENIPV2V_AUTORECONF:=YES -XENCLIENT_XENIPV2V_LIBTOOL_PATCH:=YES -XENCLIENT_XENIPV2V_USE_CONFIG_CACHE:=YES -XENCLIENT_XENIPV2V_DEPENDENCIES:=xenclient-xen - -$(eval $(call AUTOTARGETS,package/xenclient/v2v,xenclient-xenipv2v)) - -#Places the source tree under the build tree -$(XENCLIENT_XENIPV2V_TARGET_SOURCE): - mkdir -p $(REPO_DIR) - if [ ! -d "$(XENCLIENT_XENIPV2V_REPO_DIR)" ]; then \ - $(GIT) $(XENCLIENT_XENIPV2V_SITE) $(XENCLIENT_XENIPV2V_REPO_DIR) ; \ - $(GIT_CHECKOUT) xenclient-v2v $(REPO_DIR) ; \ - fi - ln -fs $(XENCLIENT_XENIPV2V_REPO_DIR)/linux/xenipv2v $(@D) - touch $@ - -$(XENCLIENT_XENIPV2V_TARGET_EXTRACT): - @: #Noop -- already extracted -- 2.39.5