Support HYPERVISOR_NAME contains blank space
We changed our branding.inc not including speech marks "", e.g.
HYPERVISOR_NAME=XXX YYY, but will add the necessary "" in script
get_plugin_version.sh, however this made the building failed as
there is blank space in sed, e.g. s/@HYPERVISOR_NAME@/XXX YYY/g \,
this patch is to fix this problem
Change-Id: I3fad385f50e1c7c3c929e4f19658b92cd2b2c991
(cherry picked from commit 84a5086e3d
)
This commit is contained in:
parent
357c8276bd
commit
54e5721e9c
24
Makefile
24
Makefile
|
@ -26,19 +26,19 @@ REQUIRED_ISOS=$(PLATFORMS:%=suppack/xcp_%/xenapi-plugins-${OPENSTACK_RELEASE}.is
|
||||||
iso: $(REQUIRED_ISOS)
|
iso: $(REQUIRED_ISOS)
|
||||||
|
|
||||||
$(REQUIRED_ISOS): plugin_source/deployment_scripts/patchset/xenhost
|
$(REQUIRED_ISOS): plugin_source/deployment_scripts/patchset/xenhost
|
||||||
suppack/build-xenserver-suppack.sh ${OPENSTACK_RELEASE} ${HYPERVISOR_NAME}
|
suppack/build-xenserver-suppack.sh ${OPENSTACK_RELEASE} "${HYPERVISOR_NAME}"
|
||||||
|
|
||||||
${BUILDROOT}/${PLUGIN_NAME}/branded: ${BRANDING} ${REQUIRED_ISOS} plugin_source
|
${BUILDROOT}/${PLUGIN_NAME}/branded: ${BRANDING} ${REQUIRED_ISOS} plugin_source
|
||||||
mkdir -p ${BUILDROOT}/${PLUGIN_NAME}
|
mkdir -p ${BUILDROOT}/${PLUGIN_NAME}
|
||||||
cp -r plugin_source/* ${BUILDROOT}/${PLUGIN_NAME}
|
cp -r plugin_source/* ${BUILDROOT}/${PLUGIN_NAME}
|
||||||
find ${BUILDROOT}/${PLUGIN_NAME} -type f -print0 | \
|
find ${BUILDROOT}/${PLUGIN_NAME} -type f -print0 | \
|
||||||
xargs -0 -i sed -i \
|
xargs -0 -i sed -i \
|
||||||
-e s/@HYPERVISOR_NAME@/${HYPERVISOR_NAME}/g \
|
-e "s/@HYPERVISOR_NAME@/${HYPERVISOR_NAME}/g" \
|
||||||
-e s/@HYPERVISOR_LOWER@/${HYPERVISOR_LOWER}/g \
|
-e "s/@HYPERVISOR_LOWER@/${HYPERVISOR_LOWER}/g" \
|
||||||
-e s/@PLUGIN_NAME@/${PLUGIN_NAME}/g \
|
-e "s/@PLUGIN_NAME@/${PLUGIN_NAME}/g" \
|
||||||
-e s/@PLUGIN_VERSION@/${PLUGIN_VERSION}/g \
|
-e "s/@PLUGIN_VERSION@/${PLUGIN_VERSION}/g" \
|
||||||
-e s/@PLUGIN_REVISION@/${PLUGIN_REVISION}/g \
|
-e "s/@PLUGIN_REVISION@/${PLUGIN_REVISION}/g" \
|
||||||
-e s/@VERSION_HOTFIXES@/${VERSION_HOTFIXES}/g {}
|
-e s/@VERSION_HOTFIXES@/'${VERSION_HOTFIXES}'/g {}
|
||||||
cp -r suppack/xcp_* ${BUILDROOT}/${PLUGIN_NAME}/deployment_scripts/
|
cp -r suppack/xcp_* ${BUILDROOT}/${PLUGIN_NAME}/deployment_scripts/
|
||||||
touch ${BUILDROOT}/${PLUGIN_NAME}/branded
|
touch ${BUILDROOT}/${PLUGIN_NAME}/branded
|
||||||
|
|
||||||
|
@ -54,11 +54,11 @@ ${BUILDROOT}/doc/source ${BUILDROOT}/doc/Makefile: ${BRANDING} doc/Makefile doc/
|
||||||
cp -r doc/Makefile doc/source ${BUILDROOT}/doc
|
cp -r doc/Makefile doc/source ${BUILDROOT}/doc
|
||||||
find ${BUILDROOT}/doc -type f -print0 | \
|
find ${BUILDROOT}/doc -type f -print0 | \
|
||||||
xargs -0 -i sed -i \
|
xargs -0 -i sed -i \
|
||||||
-e s/@HYPERVISOR_NAME@/${HYPERVISOR_NAME}/g \
|
-e "s/@HYPERVISOR_NAME@/${HYPERVISOR_NAME}/g" \
|
||||||
-e s/@PLUGIN_NAME@/${PLUGIN_NAME}/g \
|
-e "s/@PLUGIN_NAME@/${PLUGIN_NAME}/g" \
|
||||||
-e s/@PLUGIN_VERSION@/${PLUGIN_VERSION}/g \
|
-e "s/@PLUGIN_VERSION@/${PLUGIN_VERSION}/g" \
|
||||||
-e s/@PLUGIN_REVISION@/${PLUGIN_REVISION}/g \
|
-e "s/@PLUGIN_REVISION@/${PLUGIN_REVISION}/g" \
|
||||||
-e s/@PLUGIN_MD5@/`cat output/${MD5_FILENAME} | cut -d' ' -f1`/g {}
|
-e "s/@PLUGIN_MD5@/`cat output/${MD5_FILENAME} | cut -d' ' -f1`/g" {}
|
||||||
|
|
||||||
${BUILDROOT}/doc/build/latex/%.pdf: ${BUILDROOT}/doc/Makefile ${shell find ${BUILDROOT}/doc/source}
|
${BUILDROOT}/doc/build/latex/%.pdf: ${BUILDROOT}/doc/Makefile ${shell find ${BUILDROOT}/doc/source}
|
||||||
make -C ${BUILDROOT}/doc latexpdf
|
make -C ${BUILDROOT}/doc latexpdf
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
HYPERVISOR_NAME=XenServer
|
HYPERVISOR_NAME=XenServer
|
||||||
HYPERVISOR_LOWER=xenserver
|
HYPERVISOR_LOWER=xenserver
|
||||||
PLUGIN_NAME=fuel-plugin-xenserver
|
PLUGIN_NAME=fuel-plugin-xenserver
|
||||||
VERSION_HOTFIXES='{"6.5.0":["XS65ESP1013"]}'
|
VERSION_HOTFIXES={"6.5.0":["XS65ESP1013"]}
|
||||||
PLATFORMS=1.9.0 2.1.0 2.2.0
|
PLATFORMS=1.9.0 2.1.0 2.2.0
|
||||||
PLUGIN_BRANCHES=9.0 8.0 7.0 6.1
|
PLUGIN_BRANCHES=9.0 8.0 7.0 6.1
|
||||||
PLUGIN_VERSION_6_1=1.0
|
PLUGIN_VERSION_6_1=1.0
|
||||||
|
|
Loading…
Reference in New Issue