summaryrefslogtreecommitdiffstats
path: root/build/f_isoroot/f_odlpluginbuild/Makefile
diff options
context:
space:
mode:
authorNikolas Hermanns <nikolas.hermanns@ericsson.com>2016-08-22 15:11:06 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-22 15:11:06 +0000
commit08526c7376ee1b155dfb51f164f46f14f4ec6e52 (patch)
tree712ce628d286c9a0961324cafd93987f9594ab7b /build/f_isoroot/f_odlpluginbuild/Makefile
parentc71b57140fdbadfb4c1f39bf0e2df99403820ddb (diff)
parent63474c7efcaed99ea9d83f5e4220d66db0d82c35 (diff)
Merge "Changing ODL change into FUEL_PLUGIN_ODL"
Diffstat (limited to 'build/f_isoroot/f_odlpluginbuild/Makefile')
-rw-r--r--build/f_isoroot/f_odlpluginbuild/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
index e2cbf7d46..f51d0bd22 100644
--- 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