summaryrefslogtreecommitdiffstats
path: root/build/f_isoroot
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-08-17 20:36:51 +0200
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-08-31 15:15:04 +0000
commit00c404ef7066e31adfc409a15d9e0e118e0b491a (patch)
treea2d6df8cfcca0c78d45b5ba53c861ab5685c6ce1 /build/f_isoroot
parente2cfdabd45281bf26a45803509f1c3555f3d93d0 (diff)
build: cache: Consider UBUNTU_ARCH in .cacheid
Usually UBUNTU_ARCH is not changed inside the same repository, but we should consider this case anyway for future merging Armband and Fuel@OPNFV repositories/build systems. This applies to all Fuel plugins and the local repo. Change-Id: I1fb86af4e4dc665e3b443ed8c6cfcb43f365ae6a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 1fb86af4e4dc665e3b443ed8c6cfcb43f365ae6a)
Diffstat (limited to 'build/f_isoroot')
-rw-r--r--build/f_isoroot/f_bgpvpn-pluginbuild/Makefile1
-rw-r--r--build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile1
-rw-r--r--build/f_isoroot/f_kvm-pluginbuild/Makefile1
-rw-r--r--build/f_isoroot/f_odlpluginbuild/Makefile1
-rw-r--r--build/f_isoroot/f_onosfwpluginbuild/Makefile1
-rw-r--r--build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile1
-rw-r--r--build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile1
-rw-r--r--build/f_isoroot/f_repobuild/Makefile1
-rw-r--r--build/f_isoroot/f_vsperfpluginbuild/Makefile1
-rw-r--r--build/f_isoroot/f_yardstick-pluginbuild/Makefile1
10 files changed, 10 insertions, 0 deletions
diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
index ed3be2971..8ce28fcf8 100644
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
+++ b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
@@ -67,6 +67,7 @@ release:.bgpvpnbuild
fi
sha1sum Makefile >> .cachedata
sha1sum config.mk >> .cachedata
+ echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
cat .cachedata | $(CACHETOOL) getid > .cacheid
# Clean local data related to caching - called prior to ordinary build
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
index 9ab922d2d..17bc36d91 100644
--- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
+++ b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
@@ -67,6 +67,7 @@ release:.fastpathmetrics
fi
@sha1sum Makefile | awk {'print $$1'} >> .cachedata
@sha1sum config.mk | awk {'print $$1'} >> .cachedata
+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
@cat .cachedata | $(CACHETOOL) getid > .cacheid
# Clean local data related to caching - called prior to ordinary build
diff --git a/build/f_isoroot/f_kvm-pluginbuild/Makefile b/build/f_isoroot/f_kvm-pluginbuild/Makefile
index 7268699c3..81309ef87 100644
--- a/build/f_isoroot/f_kvm-pluginbuild/Makefile
+++ b/build/f_isoroot/f_kvm-pluginbuild/Makefile
@@ -68,6 +68,7 @@ release:.kvmbuild
fi
@sha1sum Makefile | awk {'print $$1'} >> .cachedata
@sha1sum config.mk | awk {'print $$1'} >> .cachedata
+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
@cat .cachedata | $(CACHETOOL) getid > .cacheid
# Clean local data related to caching - called prior to ordinary build
diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
index f51d0bd22..bf811f25f 100644
--- a/build/f_isoroot/f_odlpluginbuild/Makefile
+++ b/build/f_isoroot/f_odlpluginbuild/Makefile
@@ -58,6 +58,7 @@ release:.odlbuild
fi
@sha1sum Makefile | awk {'print $$1'} >> .cachedata
@sha1sum config.mk | awk {'print $$1'} >> .cachedata
+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
cat .cachedata | $(CACHETOOL) getid > .cacheid
# Clean local data related to caching - called prior to ordinary build
diff --git a/build/f_isoroot/f_onosfwpluginbuild/Makefile b/build/f_isoroot/f_onosfwpluginbuild/Makefile
index a9dcb2200..02ba02951 100644
--- a/build/f_isoroot/f_onosfwpluginbuild/Makefile
+++ b/build/f_isoroot/f_onosfwpluginbuild/Makefile
@@ -66,6 +66,7 @@ release:.onosbuild
fi
@sha1sum Makefile | awk {'print $$1'} >> .cachedata
@sha1sum config.mk | awk {'print $$1'} >> .cachedata
+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
@cat .cachedata | $(CACHETOOL) getid > .cacheid
# Clean local data related to caching - called prior to ordinary build
diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
index ecf586a76..2d0d202af 100644
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
+++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
@@ -67,6 +67,7 @@ release:.ovsbuild
fi
@sha1sum Makefile | awk {'print $$1'} >> .cachedata
@sha1sum config.mk | awk {'print $$1'} >> .cachedata
+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
@cat .cachedata | $(CACHETOOL) getid > .cacheid
# Clean local data related to caching - called prior to ordinary build
diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
index 9e432d146..9455389bf 100644
--- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
+++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
@@ -67,6 +67,7 @@ release:.ovsnfvbuild
fi
@sha1sum Makefile | awk {'print $$1'} >> .cachedata
@sha1sum config.mk | awk {'print $$1'} >> .cachedata
+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
@cat .cachedata | $(CACHETOOL) getid > .cacheid
# Clean local data related to caching - called prior to ordinary build
diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
index 8312f5e55..7c6b16304 100644
--- a/build/f_isoroot/f_repobuild/Makefile
+++ b/build/f_isoroot/f_repobuild/Makefile
@@ -67,6 +67,7 @@ release:nailgun
sha1sum Makefile >> .cachedata
sha1sum config.mk >> .cachedata
$(CACHETOOL) packages >> .cachedata
+ echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
cat .cachedata | $(CACHETOOL) getid > .cacheid
# Clean local data related to caching - called prior to ordinary build
diff --git a/build/f_isoroot/f_vsperfpluginbuild/Makefile b/build/f_isoroot/f_vsperfpluginbuild/Makefile
index 9bd236a8d..73de611ff 100644
--- a/build/f_isoroot/f_vsperfpluginbuild/Makefile
+++ b/build/f_isoroot/f_vsperfpluginbuild/Makefile
@@ -68,6 +68,7 @@ release:.vsperfbuild
fi
@sha1sum Makefile | awk {'print $$1'} >> .cachedata
@sha1sum config.mk | awk {'print $$1'} >> .cachedata
+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
@cat .cachedata | $(CACHETOOL) getid > .cacheid
# Clean local data related to caching - called prior to ordinary build
diff --git a/build/f_isoroot/f_yardstick-pluginbuild/Makefile b/build/f_isoroot/f_yardstick-pluginbuild/Makefile
index 47723d53e..32de3b3f4 100644
--- a/build/f_isoroot/f_yardstick-pluginbuild/Makefile
+++ b/build/f_isoroot/f_yardstick-pluginbuild/Makefile
@@ -68,6 +68,7 @@ release:.yardstickbuild
fi
@sha1sum Makefile | awk {'print $$1'} >> .cachedata
@sha1sum config.mk | awk {'print $$1'} >> .cachedata
+ @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
@cat .cachedata | $(CACHETOOL) getid > .cacheid
# Clean local data related to caching - called prior to ordinary build