aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-opendaylight.patch (renamed from patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch)0
-rw-r--r--patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch21
-rw-r--r--patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch22
-rw-r--r--patches/opnfv-fuel/0008-Separate-armband-repo-comp-from-upstream-RPM-repos.patch (renamed from patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch)0
-rw-r--r--patches/opnfv-fuel/0009-f_repobuild-Makefile-Use-python-debian-from-pip.patch (renamed from patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch)0
5 files changed, 0 insertions, 43 deletions
diff --git a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-opendaylight.patch
index c47b166c..c47b166c 100644
--- a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
+++ b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-opendaylight.patch
diff --git a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
deleted file mode 100644
index 4ce6d83e..00000000
--- a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
-Date: Fri, 4 Mar 2016 14:27:48 +0100
-Subject: [PATCH] Allow customizing fuel-plugin-qemu
-
----
- build/f_isoroot/f_qemupluginbuild/config.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build/f_isoroot/f_qemupluginbuild/config.mk b/build/f_isoroot/f_qemupluginbuild/config.mk
-index 0b84654..e7fb65a 100644
---- a/build/f_isoroot/f_qemupluginbuild/config.mk
-+++ b/build/f_isoroot/f_qemupluginbuild/config.mk
-@@ -7,6 +7,6 @@
- # http://www.apache.org/licenses/LICENSE-2.0
- ##############################################################################
-
--QEMU_BRANCH=c35ce3377bcf382a4e36f1df49758100cd2910b1
--QEMU_REPO=https://review.openstack.org/openstack/fuel-plugin-qemu
-+QEMU_BRANCH:=c35ce3377bcf382a4e36f1df49758100cd2910b1
-+QEMU_REPO:=https://review.openstack.org/openstack/fuel-plugin-qemu
- QEMU_CHANGE=
diff --git a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
deleted file mode 100644
index c427394f..00000000
--- a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
-Date: Sat, 5 Mar 2016 15:08:10 +0100
-Subject: [PATCH] Allow customizing fuel-plugin-ovsnfv
-
----
- build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
-index 1893fce..f29dab5 100644
---- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
-+++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
-@@ -7,7 +7,7 @@
- # http://www.apache.org/licenses/LICENSE-2.0
- ##############################################################################
-
--OVSNFV_DPDK_BRANCH=stable/brahmaputra
--OVSNFV_DPDK_REPO=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
-+OVSNFV_DPDK_BRANCH:=stable/brahmaputra
-+OVSNFV_DPDK_REPO:=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
- OVSNFV_DPDK_DIR=fuel-plugin-ovsnfv
- OVSNFV_DPDK_CHANGE=
diff --git a/patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch b/patches/opnfv-fuel/0008-Separate-armband-repo-comp-from-upstream-RPM-repos.patch
index 670e8728..670e8728 100644
--- a/patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch
+++ b/patches/opnfv-fuel/0008-Separate-armband-repo-comp-from-upstream-RPM-repos.patch
diff --git a/patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch b/patches/opnfv-fuel/0009-f_repobuild-Makefile-Use-python-debian-from-pip.patch
index f84b4c0c..f84b4c0c 100644
--- a/patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch
+++ b/patches/opnfv-fuel/0009-f_repobuild-Makefile-Use-python-debian-from-pip.patch