Changing ODL change into FUEL_PLUGIN_ODL

Some users where confused if the change we are doing
here is a change to ODL or the fuel-plugin-opendaylight.
So renaming helps for more understanding.

Change-Id: I886d7be3db995f37f9451c06ee22c16d540254e1
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>

diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
index e2cbf7d..f51d0bd 100644 (file)
--- a/build/f_isoroot/f_odlpluginbuild/Makefile
+++ b/build/f_isoroot/f_odlpluginbuild/Makefile
@@ -28,10 +28,10 @@ release:.odlbuild
        cp gitinfo_odlplugin.txt $(BUILD_BASE)
 .odlbuild:
        rm -rf fuel-plugin-opendaylight
-       git clone -b $(ODL_BRANCH) $(ODL_REPO)
+       git clone -b $(FUEL_PLUGIN_ODL_BRANCH) $(FUEL_PLUGIN_ODL_REPO)
        cd fuel-plugin-opendaylight; \
-       if [ -n $(ODL_CHANGE) ]; then \
-          git checkout $(ODL_CHANGE); \
+       if [ -n $(FUEL_PLUGIN_ODL_CHANGE) ]; then \
+          git checkout $(FUEL_PLUGIN_ODL_CHANGE); \
        fi
        fpb --debug --build fuel-plugin-opendaylight/
        mv fuel-plugin-opendaylight/opendaylight*.rpm .
@@ -48,13 +48,13 @@ release:.odlbuild
 
 
 # Create a unique hash to be used for getting and putting cache, based on:
-#   - The SHA1 hash of the HEAD on the plugin repo's $(ODL_BRANCH)
+#   - The SHA1 hash of the HEAD on the plugin repo's $(FUEL_PLUGIN_ODL_BRANCH)
 #   - The contents of this Makefile
 .cacheid:
-       if [ -n $(ODL_CHANGE) ]; then \
-         $(CACHETOOL) getcommitid $(ODL_REPO) $(ODL_CHANGE) > .cachedata; \
+       if [ -n $(FUEL_PLUGIN_ODL_CHANGE) ]; then \
+         $(CACHETOOL) getcommitid $(FUEL_PLUGIN_ODL_REPO) $(FUEL_PLUGIN_ODL_CHANGE) > .cachedata; \
        else \
-         $(CACHETOOL) getcommitid $(ODL_REPO) $(ODL_BRANCH) > .cachedata; \
+         $(CACHETOOL) getcommitid $(FUEL_PLUGIN_ODL_REPO) $(FUEL_PLUGIN_ODL_BRANCH) > .cachedata; \
        fi
        @sha1sum Makefile | awk {'print $$1'} >> .cachedata
        @sha1sum config.mk | awk {'print $$1'} >> .cachedata

diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk
index 448356b..d600e54 100644 (file)
--- a/build/f_isoroot/f_odlpluginbuild/config.mk
+++ b/build/f_isoroot/f_odlpluginbuild/config.mk
@@ -7,9 +7,9 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-ODL_BRANCH ?= master
-ODL_CHANGE ?= 8cc22c4717d2da338135d854e1d13aac3ef75314
-ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git
+FUEL_PLUGIN_ODL_BRANCH ?= master
+FUEL_PLUGIN_ODL_CHANGE ?= 8cc22c4717d2da338135d854e1d13aac3ef75314
+FUEL_PLUGIN_ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git
 
 export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.4.3-Beryllium-SR3/distribution-karaf-0.4.3-Beryllium-SR3.tar.gz
 export ODL_VERSION_NUMBER?=0.4.3