From b928411e18de2c7ec4f52008ce63be026274ca00 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 29 Apr 2016 20:13:33 +0200 Subject: [PATCH] Cleanup: Kill submodules: Remove obsolete patches. Change-Id: Ia4123727913aa401d26cbe1028f30b20b4497961 Signed-off-by: Alexandru Avadanii (cherry picked from commit 523f0f6e0522e41815d8b77a00799a17fde3d72b) --- ...low-customizing-fuel-plugin-opendaylight.patch} | 0 .../0007-Allow-customizing-fuel-plugin-qemu.patch | 21 --------------------- ...0008-Allow-customizing-fuel-plugin-ovsnfv.patch | 22 ---------------------- ...rmband-repo-comp-from-upstream-RPM-repos.patch} | 0 ...uild-Makefile-Use-python-debian-from-pip.patch} | 0 5 files changed, 43 deletions(-) rename patches/opnfv-fuel/{0009-Allow-customizing-fuel-plugin-opendaylight.patch => 0007-Allow-customizing-fuel-plugin-opendaylight.patch} (100%) delete mode 100644 patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch delete mode 100644 patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch rename patches/opnfv-fuel/{0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch => 0008-Separate-armband-repo-comp-from-upstream-RPM-repos.patch} (100%) rename patches/opnfv-fuel/{0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch => 0009-f_repobuild-Makefile-Use-python-debian-from-pip.patch} (100%) diff --git a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-opendaylight.patch similarity index 100% rename from patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch rename to 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 -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 -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 similarity index 100% rename from patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch rename to 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 similarity index 100% rename from patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch rename to patches/opnfv-fuel/0009-f_repobuild-Makefile-Use-python-debian-from-pip.patch -- 2.16.6