summaryrefslogtreecommitdiffstats
path: root/build/f_isoroot/f_onosfwpluginbuild
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2015-12-21 12:21:53 +0100
committerJonas Bjurel <jonas.bjurel@ericsson.com>2015-12-21 12:26:42 +0100
commitf84a868f42f3cde41e2f17b2c776f13b0cc37334 (patch)
tree197a7d70933d167bf3bf40e307fe0ef7397d6533 /build/f_isoroot/f_onosfwpluginbuild
parent9752483d05576a22a0495294dbbb031784251cc5 (diff)
Rebased with latest upstream ONOSFW plugin
Change-Id: Iaa8f101380124aae3c91f75702a89ab784884072 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Diffstat (limited to 'build/f_isoroot/f_onosfwpluginbuild')
-rw-r--r--build/f_isoroot/f_onosfwpluginbuild/Makefile6
-rw-r--r--build/f_isoroot/f_onosfwpluginbuild/config.mk4
2 files changed, 7 insertions, 3 deletions
diff --git a/build/f_isoroot/f_onosfwpluginbuild/Makefile b/build/f_isoroot/f_onosfwpluginbuild/Makefile
index 8e8ce39ae..0cf290c1c 100644
--- 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 930fe9782..bf0942d49 100644
--- 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=