Redo config of plugin build

[fuel.git] / build / f_isoroot / f_odlpluginbuild / Makefile

diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
index e8afd4a..9cb8fef 100644 (file)
--- a/build/f_isoroot/f_odlpluginbuild/Makefile
+++ b/build/f_isoroot/f_odlpluginbuild/Makefile
@@ -8,13 +8,9 @@
 ##############################################################################
 
 TOP := $(shell pwd)
-ODL_BRANCH=brahmaputra-sr2
-ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
 
-export USE_JAVA8=true
-export JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb
-export ODL_TARBALL_LOCATION=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz
-export ODL_VERSION_NUMBER=0.4.1
+include config.mk
+
 .PHONY: all
 all: .odlbuild
 
@@ -35,6 +31,10 @@ release:.odlbuild
        sudo gem install fpm
        sudo pip install fuel-plugin-builder
        git clone -b $(ODL_BRANCH) $(ODL_REPO)
+       cd fuel-plugin-opendaylight; \
+       if [ -n $(ODL_CHANGE) ]; then \
+          git checkout $(ODL_CHANGE); \
+       fi
        fpb --debug --build fuel-plugin-opendaylight/
        mv fuel-plugin-opendaylight/opendaylight*.rpm .
        $(REPOINFO) -r . > gitinfo_odlplugin.txt
@@ -53,8 +53,13 @@ release:.odlbuild
 #   - The SHA1 hash of the HEAD on the plugin repo's $(ODL_BRANCH)
 #   - The contents of this Makefile
 .cacheid:
-       @$(CACHETOOL) getcommitid $(ODL_REPO) $(ODL_BRANCH) > .cachedata
-       sha1sum Makefile >> .cachedata
+       if [ -n $(ODL_CHANGE) ]; then \
+         $(CACHETOOL) getcommitid $(ODL_REPO) $(ODL_CHANGE) > .cachedata; \
+       else \
+         $(CACHETOOL) getcommitid $(ODL_REPO) $(ODL_BRANCH) > .cachedata; \
+       fi
+       @sha1sum Makefile | awk {'print $$1'} >> .cachedata
+       @sha1sum config.mk | awk {'print $$1'} >> .cachedata
        cat .cachedata | $(CACHETOOL) getid > .cacheid
 
 # Clean local data related to caching - called prior to ordinary build