diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-01-21 23:02:47 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-01-22 00:10:41 +0100 |
| commit | 39019e8a11b727c9ffcc4d7eaeedf6318e8542f8 (patch) | |
| tree | 4f8355441a67d3efdac0010ecf428a15ce1bc0f1 /patches/opnfv-fuel/arm64-bug-fixes | |
| parent | ab1b892d8d2960342ab74d509927d9a62724c861 (diff) | |
patch-packages: Disable for Armband
Now Armband also patches test-vm with an updated x86 image in the
upstream repo, so we can disable patch-packages for cirros-testvm
during ISO build.
Since Armband can patch packages at the upstream repo level,
disable patch-packages completely.
JIRA: ARMBAND-200
Change-Id: I5531460c1dd18d94b680d40971713d090be8c353
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/arm64-bug-fixes')
| -rw-r--r-- | patches/opnfv-fuel/arm64-bug-fixes/0002-patch-packages-cirros_testvm-Use-Armband-version.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/patches/opnfv-fuel/arm64-bug-fixes/0002-patch-packages-cirros_testvm-Use-Armband-version.patch b/patches/opnfv-fuel/arm64-bug-fixes/0002-patch-packages-cirros_testvm-Use-Armband-version.patch deleted file mode 100644 index 3bf33b27..00000000 --- a/patches/opnfv-fuel/arm64-bug-fixes/0002-patch-packages-cirros_testvm-Use-Armband-version.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Fri, 13 Jan 2017 21:16:30 +0100 -Subject: [PATCH] patch-packages: cirros_testvm: Use Armband version - -Armband repackages cirros_testvm to add AArch64 binaries, and hence -rebuilds x86 binaries too, to align package versions. - -Account for Armband's cirros_testvm version by using its specific -version string instead of the old MOS one. - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - build/patch-packages/cirros_testvm/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/patch-packages/cirros_testvm/Makefile b/build/patch-packages/cirros_testvm/Makefile -index b6a56d4..62c27f6 100644 ---- a/build/patch-packages/cirros_testvm/Makefile -+++ b/build/patch-packages/cirros_testvm/Makefile -@@ -23,7 +23,7 @@ clean: - - .PHONY: release - release: -- ../tools/deb_unpack c/cirros-testvm/cirros-testvm_0.3.4-2~u16.04+mos5_amd64.deb $(ORIGISO) -+ ../tools/deb_unpack c/cirros-testvm/cirros-testvm_0.3.4-2+amos1~u16.04+mos5_amd64.deb $(ORIGISO) - @rm -rf package/usr/share/cirros-testvm/* - wget -O package/usr/share/cirros-testvm/cirros-x86_64-disk.img http://download.cirros-cloud.net/daily/20160722/cirros-d160722-x86_64-disk.img - ../tools/deb_pack $(REVSTATE) |