From: Alexandru Avadanii Date: Tue, 29 May 2018 15:32:56 +0000 (+0200) Subject: u/fuel: Bump & rebase for upstream ODL leveldbjni X-Git-Tag: opnfv-7.0.0~50 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4270458ba464057578f2bbc7360fb8d0f8fa89cc;p=armband.git u/fuel: Bump & rebase for upstream ODL leveldbjni JIRA: ARMBAND-387 Change-Id: Id24c15f7390bb63b6c422f1da8548effd5aa885a Signed-off-by: Alexandru Avadanii --- diff --git a/patches/opnfv-fuel/0004-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch similarity index 100% rename from patches/opnfv-fuel/0004-mcp-salt-formulas-armband-Extend-libvirt_domain.patch rename to patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch diff --git a/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch deleted file mode 100644 index c2f2c36f..00000000 --- a/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch +++ /dev/null @@ -1,48 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2018 Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii -Date: Thu, 27 Jul 2017 23:42:29 +0200 -Subject: [PATCH] mcp: salt-formulas: opendaylight: AArch64 leveldb - -ODL requires native leveldbjni support on architectures like AArch64. -Armband provides a Debian package that provides exactly that, -specially tailored to be applied on top of upstream Opendaylight -Debian package. - -Install as part of the existing Opendaylight -salt-formula (and not as part of Armband's separate salt-formula, like -previous fixups). - -Some dependencies are not self-contained in this formula yet, and -should be handled before upstreaming this patch: -- Armband DEB repository (mcp-repos) is added by "openstack" state; -- only Debian systems are supported (no equivalent RPM provided); -- only systemd is supported (unlikely to change); - -JIRA: https://jira.opnfv.org/browse/ARMBAND-283 - -Signed-off-by: Alexandru Avadanii ---- - mcp/salt-formulas/opendaylight/server.sls | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls -index 51a4d9f9..61877d12 100644 ---- a/mcp/salt-formulas/opendaylight/server.sls -+++ b/mcp/salt-formulas/opendaylight/server.sls -@@ -99,4 +99,9 @@ service.mask: - - service: opendaylight - {%- endif %} - -+opendaylight_aarch64_leveldbjni: -+ pkg.installed: -+ {% if grains['cpuarch'] == 'aarch64'%} -+ - name: armband-odl-leveldb-fix -+ {% endif %} - {%- endif %} diff --git a/patches/opnfv-fuel/0005-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch similarity index 100% rename from patches/opnfv-fuel/0005-virtng.py-virt.sls-Extend-libvirt_domain.patch rename to patches/opnfv-fuel/0004-virtng.py-virt.sls-Extend-libvirt_domain.patch diff --git a/patches/opnfv-fuel/0006-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch similarity index 100% rename from patches/opnfv-fuel/0006-Add-opnfv-user-to-the-deployment.patch rename to patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch diff --git a/patches/opnfv-fuel/0007-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch similarity index 100% rename from patches/opnfv-fuel/0007-Set-volume-name-in-source-file-to-sdX.patch rename to patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch diff --git a/patches/opnfv-fuel/0008-curtin-arm64-Fix-missing-newline.patch b/patches/opnfv-fuel/0007-curtin-arm64-Fix-missing-newline.patch similarity index 100% rename from patches/opnfv-fuel/0008-curtin-arm64-Fix-missing-newline.patch rename to patches/opnfv-fuel/0007-curtin-arm64-Fix-missing-newline.patch diff --git a/upstream/fuel b/upstream/fuel index 7f797f1b..57175f45 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit 7f797f1b5a9340d24d700879abca6b39413e7375 +Subproject commit 57175f45f6ae9c2ee2adf02ea30a75c0ab956206