From b928411e18de2c7ec4f52008ce63be026274ca00 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 29 Apr 2016 20:13:33 +0200 Subject: Cleanup: Kill submodules: Remove obsolete patches. Change-Id: Ia4123727913aa401d26cbe1028f30b20b4497961 Signed-off-by: Alexandru Avadanii (cherry picked from commit 523f0f6e0522e41815d8b77a00799a17fde3d72b) --- ...llow-customizing-fuel-plugin-opendaylight.patch | 26 +++++++++++++ .../0007-Allow-customizing-fuel-plugin-qemu.patch | 21 ----------- ...0008-Allow-customizing-fuel-plugin-ovsnfv.patch | 22 ----------- ...armband-repo-comp-from-upstream-RPM-repos.patch | 43 ++++++++++++++++++++++ ...llow-customizing-fuel-plugin-opendaylight.patch | 26 ------------- ...build-Makefile-Use-python-debian-from-pip.patch | 29 +++++++++++++++ ...armband-repo-comp-from-upstream-RPM-repos.patch | 43 ---------------------- ...build-Makefile-Use-python-debian-from-pip.patch | 29 --------------- 8 files changed, 98 insertions(+), 141 deletions(-) create mode 100644 patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-opendaylight.patch 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 create mode 100644 patches/opnfv-fuel/0008-Separate-armband-repo-comp-from-upstream-RPM-repos.patch delete mode 100644 patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch create mode 100644 patches/opnfv-fuel/0009-f_repobuild-Makefile-Use-python-debian-from-pip.patch delete mode 100644 patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch delete mode 100644 patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch diff --git a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-opendaylight.patch new file mode 100644 index 00000000..c47b166c --- /dev/null +++ b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-opendaylight.patch @@ -0,0 +1,26 @@ +From: Florin Dumitrascu +Date: Thu, 17 Mar 2016 19:37:19 +0100 +Subject: [PATCH] Allow customizing fuel-plugin-opendaylight + +Signed-off-by: Florin Dumitrascu +--- + build/f_isoroot/f_odlpluginbuild/config.mk | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk +index e64a05e..bca432c 100644 +--- a/build/f_isoroot/f_odlpluginbuild/config.mk ++++ b/build/f_isoroot/f_odlpluginbuild/config.mk +@@ -7,9 +7,9 @@ + # http://www.apache.org/licenses/LICENSE-2.0 + ############################################################################## + +-ODL_BRANCH=brahmaputra-sr2 +-ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a +-ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git" ++ODL_BRANCH:=brahmaputra-sr2 ++ODL_CHANGE:=ec9474c1178e7451ec75f6e306ac84424a84a28a ++ODL_REPO:="https://github.com/openstack/fuel-plugin-opendaylight.git" + + export USE_JAVA8=true + export JAVA8_URL:=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb 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/0008-Separate-armband-repo-comp-from-upstream-RPM-repos.patch b/patches/opnfv-fuel/0008-Separate-armband-repo-comp-from-upstream-RPM-repos.patch new file mode 100644 index 00000000..670e8728 --- /dev/null +++ b/patches/opnfv-fuel/0008-Separate-armband-repo-comp-from-upstream-RPM-repos.patch @@ -0,0 +1,43 @@ +From: Alexandru Avadanii +Date: Mon, 18 Apr 2016 17:24:25 +0200 +Subject: [PATCH] Separate armband repo-comp from upstream RPM repos. + +Instead of using linux.enea.com for ALL RPM packages for CentOS7, +by overriding FUEL_MIRROR in the Makefile, we switched to using +EXTRA_RPM_REPOS variable to point to armband RPM repo-component. + +This way, the bulk of RPM packages will be fetched from upstream, +instead of our mirror. + +This requires updating ks.cfg{,.orig} with the new armband repo. +--- + build/f_isoroot/f_kscfg/ks.cfg | 2 +- + build/f_isoroot/f_kscfg/ks.cfg.orig | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/f_isoroot/f_kscfg/ks.cfg b/build/f_isoroot/f_kscfg/ks.cfg +index 30bad1d..b58f98b 100644 +--- a/build/f_isoroot/f_kscfg/ks.cfg ++++ b/build/f_isoroot/f_kscfg/ks.cfg +@@ -14,7 +14,7 @@ unsupported_hardware + # SKIP CONFIGURING X + skipx + repo --name="mos-centos" --baseurl=file:///run/install/repo/mos-centos/ --cost=100 +- ++repo --name="armband" --baseurl=file:///run/install/repo/extra-repos/armband --cost=10 + # NEVER ever place zerombr here, it breaks automated installation + %include /tmp/bootloader.ks + %include /tmp/partition.ks +diff --git a/build/f_isoroot/f_kscfg/ks.cfg.orig b/build/f_isoroot/f_kscfg/ks.cfg.orig +index f8a43da..5f541a4 100755 +--- a/build/f_isoroot/f_kscfg/ks.cfg.orig ++++ b/build/f_isoroot/f_kscfg/ks.cfg.orig +@@ -14,7 +14,7 @@ unsupported_hardware + # SKIP CONFIGURING X + skipx + repo --name="mos-centos" --baseurl=file:///run/install/repo/mos-centos/ --cost=100 +- ++repo --name="armband" --baseurl=file:///run/install/repo/extra-repos/armband --cost=10 + # NEVER ever place zerombr here, it breaks automated installation + %include /tmp/bootloader.ks + %include /tmp/partition.ks diff --git a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch deleted file mode 100644 index c47b166c..00000000 --- a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Florin Dumitrascu -Date: Thu, 17 Mar 2016 19:37:19 +0100 -Subject: [PATCH] Allow customizing fuel-plugin-opendaylight - -Signed-off-by: Florin Dumitrascu ---- - build/f_isoroot/f_odlpluginbuild/config.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk -index e64a05e..bca432c 100644 ---- a/build/f_isoroot/f_odlpluginbuild/config.mk -+++ b/build/f_isoroot/f_odlpluginbuild/config.mk -@@ -7,9 +7,9 @@ - # http://www.apache.org/licenses/LICENSE-2.0 - ############################################################################## - --ODL_BRANCH=brahmaputra-sr2 --ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a --ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git" -+ODL_BRANCH:=brahmaputra-sr2 -+ODL_CHANGE:=ec9474c1178e7451ec75f6e306ac84424a84a28a -+ODL_REPO:="https://github.com/openstack/fuel-plugin-opendaylight.git" - - export USE_JAVA8=true - export JAVA8_URL:=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb diff --git a/patches/opnfv-fuel/0009-f_repobuild-Makefile-Use-python-debian-from-pip.patch b/patches/opnfv-fuel/0009-f_repobuild-Makefile-Use-python-debian-from-pip.patch new file mode 100644 index 00000000..f84b4c0c --- /dev/null +++ b/patches/opnfv-fuel/0009-f_repobuild-Makefile-Use-python-debian-from-pip.patch @@ -0,0 +1,29 @@ +From: Alexandru Avadanii +Date: Tue, 26 Apr 2016 23:12:20 +0200 +Subject: [PATCH] f_repobuild/Makefile: Use python-debian from pip. + +Currently, Ubuntu Trusty provides a broken python-debian package, +that fails to parse foreign architecture (package:any) relationships. + +Purge debian package and let pip resolve this dependency, using a +newer version from pypi. + +[1] http://lists.alioth.debian.org/pipermail/ + pkg-python-debian-maint/2014-July/001795.html +--- + build/f_isoroot/f_repobuild/Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile +index 709ca6b..5e7157b 100644 +--- a/build/f_isoroot/f_repobuild/Makefile ++++ b/build/f_isoroot/f_repobuild/Makefile +@@ -25,6 +25,8 @@ all: nailgun + + nailgun: + sudo apt-get install -y git libxml2-dev libxslt-dev python-dev python-pip libz-dev libyaml-dev createrepo python-yaml ++ # python-debian from Ubuntu can't parse foreign arch relationships, use pip ++ sudo apt-get purge -y --force-yes python-debian + rm -Rf nailgun + sudo mkdir -p /var/www/nailgun + git clone $(FUEL_MIRROR_REPO) diff --git a/patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch b/patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch deleted file mode 100644 index 670e8728..00000000 --- a/patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Alexandru Avadanii -Date: Mon, 18 Apr 2016 17:24:25 +0200 -Subject: [PATCH] Separate armband repo-comp from upstream RPM repos. - -Instead of using linux.enea.com for ALL RPM packages for CentOS7, -by overriding FUEL_MIRROR in the Makefile, we switched to using -EXTRA_RPM_REPOS variable to point to armband RPM repo-component. - -This way, the bulk of RPM packages will be fetched from upstream, -instead of our mirror. - -This requires updating ks.cfg{,.orig} with the new armband repo. ---- - build/f_isoroot/f_kscfg/ks.cfg | 2 +- - build/f_isoroot/f_kscfg/ks.cfg.orig | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build/f_isoroot/f_kscfg/ks.cfg b/build/f_isoroot/f_kscfg/ks.cfg -index 30bad1d..b58f98b 100644 ---- a/build/f_isoroot/f_kscfg/ks.cfg -+++ b/build/f_isoroot/f_kscfg/ks.cfg -@@ -14,7 +14,7 @@ unsupported_hardware - # SKIP CONFIGURING X - skipx - repo --name="mos-centos" --baseurl=file:///run/install/repo/mos-centos/ --cost=100 -- -+repo --name="armband" --baseurl=file:///run/install/repo/extra-repos/armband --cost=10 - # NEVER ever place zerombr here, it breaks automated installation - %include /tmp/bootloader.ks - %include /tmp/partition.ks -diff --git a/build/f_isoroot/f_kscfg/ks.cfg.orig b/build/f_isoroot/f_kscfg/ks.cfg.orig -index f8a43da..5f541a4 100755 ---- a/build/f_isoroot/f_kscfg/ks.cfg.orig -+++ b/build/f_isoroot/f_kscfg/ks.cfg.orig -@@ -14,7 +14,7 @@ unsupported_hardware - # SKIP CONFIGURING X - skipx - repo --name="mos-centos" --baseurl=file:///run/install/repo/mos-centos/ --cost=100 -- -+repo --name="armband" --baseurl=file:///run/install/repo/extra-repos/armband --cost=10 - # NEVER ever place zerombr here, it breaks automated installation - %include /tmp/bootloader.ks - %include /tmp/partition.ks diff --git a/patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch b/patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch deleted file mode 100644 index f84b4c0c..00000000 --- a/patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Alexandru Avadanii -Date: Tue, 26 Apr 2016 23:12:20 +0200 -Subject: [PATCH] f_repobuild/Makefile: Use python-debian from pip. - -Currently, Ubuntu Trusty provides a broken python-debian package, -that fails to parse foreign architecture (package:any) relationships. - -Purge debian package and let pip resolve this dependency, using a -newer version from pypi. - -[1] http://lists.alioth.debian.org/pipermail/ - pkg-python-debian-maint/2014-July/001795.html ---- - build/f_isoroot/f_repobuild/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile -index 709ca6b..5e7157b 100644 ---- a/build/f_isoroot/f_repobuild/Makefile -+++ b/build/f_isoroot/f_repobuild/Makefile -@@ -25,6 +25,8 @@ all: nailgun - - nailgun: - sudo apt-get install -y git libxml2-dev libxslt-dev python-dev python-pip libz-dev libyaml-dev createrepo python-yaml -+ # python-debian from Ubuntu can't parse foreign arch relationships, use pip -+ sudo apt-get purge -y --force-yes python-debian - rm -Rf nailgun - sudo mkdir -p /var/www/nailgun - git clone $(FUEL_MIRROR_REPO) -- cgit 1.2.3-korg