patches/opnfv-fuel/0045-build-cache-Consider-UBUNTU_ARCH-in-.cacheid.patch

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Wed, 17 Aug 2016 20:36:51 +0200
   3 Subject: [PATCH] build: cache: Consider UBUNTU_ARCH in .cacheid
   4
   5 Usually UBUNTU_ARCH is not changed inside the same repository,
   6 but we should consider this case anyway for future merging
   7 Armband and Fuel@OPNFV repositories/build systems.
   8
   9 This applies to all Fuel plugins and the local repo.
  10
  11 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  12 ---
  13  build/f_isoroot/f_bgpvpn-pluginbuild/Makefile              | 1 +
  14  build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile | 1 +
  15  build/f_isoroot/f_kvm-pluginbuild/Makefile                 | 1 +
  16  build/f_isoroot/f_odlpluginbuild/Makefile                  | 1 +
  17  build/f_isoroot/f_onosfwpluginbuild/Makefile               | 1 +
  18  build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile        | 1 +
  19  build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile         | 1 +
  20  build/f_isoroot/f_repobuild/Makefile                       | 1 +
  21  build/f_isoroot/f_vsperfpluginbuild/Makefile               | 1 +
  22  build/f_isoroot/f_yardstick-pluginbuild/Makefile           | 1 +
  23  10 files changed, 10 insertions(+)
  24
  25 diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
  26 index ed3be29..8ce28fc 100644
  27 --- a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
  28 +++ b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
  29 @@ -67,6 +67,7 @@ release:.bgpvpnbuild
  30         fi
  31         sha1sum Makefile >> .cachedata
  32         sha1sum config.mk >> .cachedata
  33 +       echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
  34         cat .cachedata | $(CACHETOOL) getid > .cacheid
  35
  36  # Clean local data related to caching - called prior to ordinary build
  37 diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
  38 index 9ab922d..17bc36d 100644
  39 --- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
  40 +++ b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
  41 @@ -67,6 +67,7 @@ release:.fastpathmetrics
  42         fi
  43         @sha1sum Makefile | awk {'print $$1'} >> .cachedata
  44         @sha1sum config.mk | awk {'print $$1'} >> .cachedata
  45 +       @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
  46         @cat .cachedata | $(CACHETOOL) getid > .cacheid
  47
  48  # Clean local data related to caching - called prior to ordinary build
  49 diff --git a/build/f_isoroot/f_kvm-pluginbuild/Makefile b/build/f_isoroot/f_kvm-pluginbuild/Makefile
  50 index ba2fd0b..2454b5e 100644
  51 --- a/build/f_isoroot/f_kvm-pluginbuild/Makefile
  52 +++ b/build/f_isoroot/f_kvm-pluginbuild/Makefile
  53 @@ -70,6 +70,7 @@ release:.kvmbuild
  54         fi
  55         @sha1sum Makefile | awk {'print $$1'} >> .cachedata
  56         @sha1sum config.mk | awk {'print $$1'} >> .cachedata
  57 +       @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
  58         @cat .cachedata | $(CACHETOOL) getid > .cacheid
  59
  60  # Clean local data related to caching - called prior to ordinary build
  61 diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
  62 index e2cbf7d..6c717c7 100644
  63 --- a/build/f_isoroot/f_odlpluginbuild/Makefile
  64 +++ b/build/f_isoroot/f_odlpluginbuild/Makefile
  65 @@ -58,6 +58,7 @@ release:.odlbuild
  66         fi
  67         @sha1sum Makefile | awk {'print $$1'} >> .cachedata
  68         @sha1sum config.mk | awk {'print $$1'} >> .cachedata
  69 +       @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
  70         cat .cachedata | $(CACHETOOL) getid > .cacheid
  71
  72  # Clean local data related to caching - called prior to ordinary build
  73 diff --git a/build/f_isoroot/f_onosfwpluginbuild/Makefile b/build/f_isoroot/f_onosfwpluginbuild/Makefile
  74 index a9dcb22..02ba029 100644
  75 --- a/build/f_isoroot/f_onosfwpluginbuild/Makefile
  76 +++ b/build/f_isoroot/f_onosfwpluginbuild/Makefile
  77 @@ -66,6 +66,7 @@ release:.onosbuild
  78         fi
  79         @sha1sum Makefile | awk {'print $$1'} >> .cachedata
  80         @sha1sum config.mk | awk {'print $$1'} >> .cachedata
  81 +       @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
  82         @cat .cachedata | $(CACHETOOL) getid > .cacheid
  83
  84  # Clean local data related to caching - called prior to ordinary build
  85 diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
  86 index ecf586a..2d0d202 100644
  87 --- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
  88 +++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
  89 @@ -67,6 +67,7 @@ release:.ovsbuild
  90         fi
  91         @sha1sum Makefile | awk {'print $$1'} >> .cachedata
  92         @sha1sum config.mk | awk {'print $$1'} >> .cachedata
  93 +       @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
  94         @cat .cachedata | $(CACHETOOL) getid > .cacheid
  95
  96  # Clean local data related to caching - called prior to ordinary build
  97 diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
  98 index 9e432d1..9455389 100644
  99 --- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
 100 +++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
 101 @@ -67,6 +67,7 @@ release:.ovsnfvbuild
 102         fi
 103         @sha1sum Makefile | awk {'print $$1'} >> .cachedata
 104         @sha1sum config.mk | awk {'print $$1'} >> .cachedata
 105 +       @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
 106         @cat .cachedata | $(CACHETOOL) getid > .cacheid
 107
 108  # Clean local data related to caching - called prior to ordinary build
 109 diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
 110 index 6fef8ff..f6ebc2c 100644
 111 --- a/build/f_isoroot/f_repobuild/Makefile
 112 +++ b/build/f_isoroot/f_repobuild/Makefile
 113 @@ -73,6 +73,7 @@ release:nailgun
 114         sha1sum Makefile >> .cachedata
 115         sha1sum config.mk >> .cachedata
 116         $(CACHETOOL) packages >> .cachedata
 117 +       echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
 118         cat .cachedata | $(CACHETOOL) getid > .cacheid
 119
 120  # Clean local data related to caching - called prior to ordinary build
 121 diff --git a/build/f_isoroot/f_vsperfpluginbuild/Makefile b/build/f_isoroot/f_vsperfpluginbuild/Makefile
 122 index 9bd236a..73de611 100644
 123 --- a/build/f_isoroot/f_vsperfpluginbuild/Makefile
 124 +++ b/build/f_isoroot/f_vsperfpluginbuild/Makefile
 125 @@ -68,6 +68,7 @@ release:.vsperfbuild
 126         fi
 127         @sha1sum Makefile | awk {'print $$1'} >> .cachedata
 128         @sha1sum config.mk | awk {'print $$1'} >> .cachedata
 129 +       @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
 130         @cat .cachedata | $(CACHETOOL) getid > .cacheid
 131
 132  # Clean local data related to caching - called prior to ordinary build
 133 diff --git a/build/f_isoroot/f_yardstick-pluginbuild/Makefile b/build/f_isoroot/f_yardstick-pluginbuild/Makefile
 134 index 47723d5..32de3b3 100644
 135 --- a/build/f_isoroot/f_yardstick-pluginbuild/Makefile
 136 +++ b/build/f_isoroot/f_yardstick-pluginbuild/Makefile
 137 @@ -68,6 +68,7 @@ release:.yardstickbuild
 138         fi
 139         @sha1sum Makefile | awk {'print $$1'} >> .cachedata
 140         @sha1sum config.mk | awk {'print $$1'} >> .cachedata
 141 +       @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata
 142         @cat .cachedata | $(CACHETOOL) getid > .cacheid
 143
 144  # Clean local data related to caching - called prior to ordinary build