From e42a9b3011f96ad26f4a19db77ac44cad31a4290 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 18 Dec 2016 16:53:26 +0100 Subject: Uplift Armband to Fuel Newton [ Dan Andresan ] - puppet: database: Fix Percona XtraBackup sync [ Alexandru Avadanii ] - disable all plugins; - re-enable remote tracking; - remove "Revert: Point to specific snapshot ..."; - patch context adjustments; - obsolete "kernel-bump", linux-image-lts-xenial is now the default; - network-checker iface state check now fixed upstream [1]; - fuel-nailgun-agent hugepage size should also check /proc/meminfo; - fuel-nailgun-agent CPU detection for AArch64; - nova AArch64 hugepage support is now upstream; - obsolete Cirros Test VM direct kernel boot (by switch to AAVMF): * f-l/0001-upload_cirros-Add-direct-kernel-boot-support.patch * f-w/0001-direct-kernel-boot-for-cirros.patch - rework m1.micro RAM size patch after puppet manifest split upstream; - re-enable arch-agnostic plugins which were rebased in Fuel@OPNFV: * f_yardstick-pluginbuild * f_congress-pluginbuild - do NOT retire MySQL SST provider patch series (nack: ARMBAND-186), rebase (and keep for now) MySQL SST provider patches, as trying to use xtrabackup-v2 revelead a regression since Colorado.3.0, and these patches simplify troubleshooting a lot; - AArch64: nova: libvirt: Use host-model cpu (ARMBAND-193); - AArch64: nova: libvirt: Use pointer_model instead of use_usb_tablet; - m1.micro RAM size insufficient for TestVM with AAVMF (s/128/256/) - switch Cirros TestVM to AAVMF from direct kernel boot; - backport nova libvirt driver fix for deleting instances booted with AAVMF firmware from [2]; TODO (later): - Include ISO build time fixes for cirros_testvm in Armband package; TODO (ODL, later): - test & revise leveldb patching; - bring back Qugga patching for arm64; - configure systemd service to automatically respawn; [1] https://review.openstack.org/#/c/417373/ [2] https://review.openstack.org/#/c/357190/ JIRA: ARMBAND-29 JIRA: ARMBAND-32 JIRA: ARMBAND-63 JIRA: ARMBAND-88 JIRA: ARMBAND-116 JIRA: ARMBAND-118 JIRA: ARMBAND-186 JIRA: ARMBAND-193 JIRA: ARMBAND-194 JIRA: ARMBAND-195 JIRA: ARMBAND-196 JIRA: ARMBAND-197 Change-Id: Ia99022e364e61245d109cabab9d0ed7157b4d2f5 Signed-off-by: Alexandru Avadanii Signed-off-by: Dan Andresan --- .../0002-build-docker-Use-older-ffi-1.9.14.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 patches/opnfv-fuel/upstream-backports/0002-build-docker-Use-older-ffi-1.9.14.patch (limited to 'patches/opnfv-fuel/upstream-backports/0002-build-docker-Use-older-ffi-1.9.14.patch') diff --git a/patches/opnfv-fuel/upstream-backports/0002-build-docker-Use-older-ffi-1.9.14.patch b/patches/opnfv-fuel/upstream-backports/0002-build-docker-Use-older-ffi-1.9.14.patch new file mode 100644 index 00000000..ccc37cb3 --- /dev/null +++ b/patches/opnfv-fuel/upstream-backports/0002-build-docker-Use-older-ffi-1.9.14.patch @@ -0,0 +1,32 @@ +From: Alexandru Avadanii +Date: Fri, 13 Jan 2017 18:40:08 +0100 +Subject: [PATCH] build/docker: Use older ffi (1.9.14) + +`gem install fbm` tries to install the ffi gem too, which has a +problem in newer versions (>= 1.9.15) - see [1]: +"AbstractMemory.c:349:48: error: expected ')' before 'PRIsVALUE'" + +To bypass the newly introduced issues, use the old version. + +[1] https://jira.opnfv.org/browse/ARMBAND-191 + +JIRA: ARMBAND-191 + +Signed-off-by: Alexandru Avadanii +--- + build/docker/Dockerfile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile +index 04c4d2b..54aca35 100644 +--- a/build/docker/Dockerfile ++++ b/build/docker/Dockerfile +@@ -22,6 +22,8 @@ RUN apt-get install -y software-properties-common python-software-properties \ + ca-certificates sudo apt-utils lsb-release dosfstools debmirror p7zip-full \ + build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev + ++# FIXME(armband): Newer ffi is broken - https://jira.opnfv.org/browse/ARMBAND-191 ++RUN gem install ffi -v 1.9.14 + RUN gem install fpm + + # Temporary: fpb needs to be built from sources -- cgit 1.2.3-korg