[node-patches] Change in ovirt-node[master]: Fix ovirt local repo issue if AUTOBUILD_PACKAGE_ROOT is not ...

[wenyi at linux.vnet.ibm.com]

Wenyi Gao has uploaded a new change for review.

Change subject: Fix ovirt local repo issue if AUTOBUILD_PACKAGE_ROOT is not set
......................................................................

Fix ovirt local repo issue if AUTOBUILD_PACKAGE_ROOT is not set

When AUTOBUILD_PACKAGE_ROOT is not set, OVIRT_LOCAL_REPO will be
file:///rpm/RPMS. But in fact, the actual ovirt-node repository is
file:///$HOME/rpmbuild/RPMS/noarch.

Change-Id: I6e6bc4482dfd0e7bc6b1eb483b192cb1d901a753
Signed-off-by: Wenyi Gao <wenyi at linux.vnet.ibm.com>
---
M autobuild.sh
1 file changed, 8 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/58/13158/1

diff --git a/autobuild.sh b/autobuild.sh
index 4f3de7a..f08df22 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -30,7 +30,12 @@
 test -f Makefile && make -k distclean || :
 
 OVIRT_CACHE_DIR=${AUTOBUILD_SOURCE_ROOT-${HOME}}/ovirt-cache
-OVIRT_LOCAL_REPO=file://${AUTOBUILD_PACKAGE_ROOT}/rpm/RPMS
+if [ -n "$AUTOBUILD_PACKAGE_ROOT" ]; then
+    OVIRT_LOCAL_DIR=${AUTOBUILD_PACKAGE_ROOT}/rpm/RPMS
+else
+    OVIRT_LOCAL_DIR=${HOME}/rpmbuild/RPMS/noarch
+fi
+OVIRT_LOCAL_REPO=file://${OVIRT_LOCAL_DIR}
 export OVIRT_LOCAL_REPO OVIRT_CACHE_DIR
 
 ./autogen.sh --prefix=$AUTOBUILD_INSTALL_ROOT --with-image-minimizer
@@ -54,9 +59,9 @@
   rpmbuild --nodeps --define "extra_release $EXTRA_RELEASE" -ta --clean *.tar.gz
 fi
 
-mkdir -p ${AUTOBUILD_PACKAGE_ROOT}/rpm/RPMS
+mkdir -p ${OVIRT_LOCAL_DIR}
 # regenerate repo so iso uses new ovirt-node rpms
-createrepo -d ${AUTOBUILD_PACKAGE_ROOT}/rpm/RPMS
+createrepo -d ${OVIRT_LOCAL_DIR}
 
 cd recipe
 make ovirt-node-image.iso 


--
To view, visit http://gerrit.ovirt.org/13158
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e6bc4482dfd0e7bc6b1eb483b192cb1d901a753
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Wenyi Gao <wenyi at linux.vnet.ibm.com>