summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0025-f_repobuild-Makefile-Use-python-debian-from-pip.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-06 21:13:01 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-07 13:09:24 +0200
commit6f3a054fc95622f0c002f72c0fac6074bb36c36f (patch)
tree55186fcd41e404cb023e176477ffea52cfab51cf /patches/opnfv-fuel/0025-f_repobuild-Makefile-Use-python-debian-from-pip.patch
parent15aac10c6b474790aedfd88d80c5e9d86a7f36b2 (diff)
Cleanup: Remove obsolete Fuel@OPNFV patches
Since we are now building inside docker containers, it is no longer necessary to use `python-debian` from pip repo instead of Ubuntu. Also, since Fuel@OPNFV improved our mirror selection in [1], we can drop our custom blacklist entries for Ubuntu SE mirrors, as well as repeating the repo mirror build in case of failure. [1] https://gerrit.opnfv.org/gerrit/#/c/22195 Change-Id: I62890b6ae7977cd8a39c06ce17c8964e6cb1dddb Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0025-f_repobuild-Makefile-Use-python-debian-from-pip.patch')
-rw-r--r--patches/opnfv-fuel/0025-f_repobuild-Makefile-Use-python-debian-from-pip.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/patches/opnfv-fuel/0025-f_repobuild-Makefile-Use-python-debian-from-pip.patch b/patches/opnfv-fuel/0025-f_repobuild-Makefile-Use-python-debian-from-pip.patch
deleted file mode 100644
index f84b4c0c..00000000
--- a/patches/opnfv-fuel/0025-f_repobuild-Makefile-Use-python-debian-from-pip.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-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)