Rebased with latest upstream ONOSFW plugin

Change-Id: Iaa8f101380124aae3c91f75702a89ab784884072
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>

diff --git a/build/f_isoroot/f_onosfwpluginbuild/Makefile b/build/f_isoroot/f_onosfwpluginbuild/Makefile
index 8e8ce39..0cf290c 100644 (file)
--- a/build/f_isoroot/f_onosfwpluginbuild/Makefile
+++ b/build/f_isoroot/f_onosfwpluginbuild/Makefile
@@ -59,7 +59,11 @@ release:.onosbuild
 #   - The SHA1 hash of the HEAD on the plugin repo's $(ONOS_BRANCH)
 #   - The contents of this Makefile
 .cacheid:
-       @git ls-remote --heads $(ONOS_REPO) | grep $(ONOS_BRANCH) | awk {'print $$1'} > .cachedata
+       @if [ ! -z $(ONOS_CHANGE) ]; then \
+         $(CACHETOOL) getcommitid $(ONOS_REPO) $(ONOS_CHANGE) > .cachedata; \
+       else \
+         $(CACHETOOL) getcommitid $(ONOS_REPO) $(ONOS_BRANCH) > .cachedata; \
+       fi
        @sha1sum Makefile | awk {'print $$1'} >> .cachedata
        @sha1sum config.mk | awk {'print $$1'} >> .cachedata
        @cat .cachedata | $(CACHETOOL) getid > .cacheid

diff --git a/build/f_isoroot/f_onosfwpluginbuild/config.mk b/build/f_isoroot/f_onosfwpluginbuild/config.mk
index 930fe97..bf0942d 100644 (file)
--- a/build/f_isoroot/f_onosfwpluginbuild/config.mk
+++ b/build/f_isoroot/f_onosfwpluginbuild/config.mk
@@ -7,6 +7,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-ONOS_BRANCH=master
+ONOS_BRANCH=1e0aef4a4495b66122c00bbe698ec95d8d17fe5a
 ONOS_REPO=https://review.openstack.org/openstack/fuel-plugin-onos
-ONOS_CHANGE=refs/changes/02/250802/1
+ONOS_CHANGE=