diff options
| author |   Stanislaw Kardach <kda@semihalf.com> | 2016-03-29 14:42:46 +0200 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-02 14:15:59 +0000 |
| commit | 6398937dfe68ad9c7ce2133c866edb6a7bd69b32 (patch) | |
| tree | e72adfd031bb09477d36723cd77609536a9f5fa3 /patches/fuel-plugin-ovsnfv/0001-fuel-plugin-Pick-updated-numa.-packages.patch | |
| parent | 24428f3c202e3b889114915d06ddb1178369c117 (diff) | |
Rebase patches and fix importing
* We were missing the patch rebase changes that were introduced by gerrit
automatic upstream project update for submodules. This patch introduces
them.
* Apply all submodule patches a single `git am` call to help with
rebasing patches.
* Correct Opendaylight plugin initialization in repo config.
Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
(cherry picked from commit ccf57699bbff183ef45fd4a4e94df094ca69ee87)
Change-Id: I88be0617196bc77cf237a9818f7368f6eb78f6b3
Diffstat (limited to 'patches/fuel-plugin-ovsnfv/0001-fuel-plugin-Pick-updated-numa.-packages.patch')
| -rw-r--r-- | patches/fuel-plugin-ovsnfv/0001-fuel-plugin-Pick-updated-numa.-packages.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/patches/fuel-plugin-ovsnfv/0001-fuel-plugin-Pick-updated-numa.-packages.patch b/patches/fuel-plugin-ovsnfv/0001-fuel-plugin-Pick-updated-numa.-packages.patch deleted file mode 100644 index 22f3b226..00000000 --- a/patches/fuel-plugin-ovsnfv/0001-fuel-plugin-Pick-updated-numa.-packages.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> -Date: Sat, 5 Mar 2016 15:14:41 +0100 -Subject: [PATCH] fuel plugin: Pick updated numa... packages. - -Package version 1ubuntu3.14.04.1 of numactl_2.0.9~rc5, -libnuma1_2.0.9~rc5 and libnuma-dev_2.0.9~rc5 is removed from -archive.ubuntu.com and replaced with 1ubuntu3.14.04.2. - -TODO: This can be modified by using docker/chroot combined with apt-get -download. ---- - fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt b/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt -index 7d62008..1766086 100644 ---- a/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt -+++ b/fuel-plugin-ovsnfv/ovs_package/ubuntu/dependencies.txt -@@ -71,11 +71,11 @@ http://archive.ubuntu.com/ubuntu/pool/main/b/bc/bc_1.06.95-8ubuntu1_amd64.deb - http://archive.ubuntu.com/ubuntu/pool/main/p/pkg-config/pkg-config_0.26-1ubuntu4_amd64.deb - http://archive.ubuntu.com/ubuntu/pool/main/d/dbus/libdbus-1-dev_1.6.18-0ubuntu4.3_amd64.deb - http://archive.ubuntu.com/ubuntu/pool/main/p/python-defaults/libpython-dev_2.7.5-5ubuntu3_amd64.deb --http://archive.ubuntu.com/ubuntu/pool/universe/n/numactl/numactl_2.0.9~rc5-1ubuntu3.14.04.1_amd64.deb -+http://archive.ubuntu.com/ubuntu/pool/universe/n/numactl/numactl_2.0.9~rc5-1ubuntu3.14.04.2_amd64.deb - http://archive.ubuntu.com/ubuntu/pool/main/p/python2.7/python2.7-dev_2.7.6-8ubuntu0.2_amd64.deb - http://archive.ubuntu.com/ubuntu/pool/main/p/python-defaults/python-dev_2.7.5-5ubuntu3_amd64.deb --http://archive.ubuntu.com/ubuntu/pool/main/n/numactl/libnuma1_2.0.9~rc5-1ubuntu3.14.04.1_amd64.deb --http://archive.ubuntu.com/ubuntu/pool/main/n/numactl/libnuma-dev_2.0.9~rc5-1ubuntu3.14.04.1_amd64.deb -+http://archive.ubuntu.com/ubuntu/pool/main/n/numactl/libnuma1_2.0.9~rc5-1ubuntu3.14.04.2_amd64.deb -+http://archive.ubuntu.com/ubuntu/pool/main/n/numactl/libnuma-dev_2.0.9~rc5-1ubuntu3.14.04.2_amd64.deb - https://pypi.python.org/packages/source/l/libvirt-python/libvirt-python-1.2.12.tar.gz - http://archive.ubuntu.com/ubuntu/pool/main/libg/libgpg-error/libgpg-error-dev_1.12-0.2ubuntu1_amd64.deb - http://archive.ubuntu.com/ubuntu/pool/main/libg/libgcrypt11/libgcrypt11-dev_1.5.3-2ubuntu4.3_amd64.deb |