From a601537cff623acc04d3fb495fedfc634c6b4221 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 26 Apr 2016 23:15:15 +0200 Subject: 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 Change-Id: Iba8f6cb52ad0a92e5d8d2bee4fb066b213991a94 (cherry picked from commit ea5e41035b621520b805f5c50bb5153a76ff0800) --- ...build-Makefile-Use-python-debian-from-pip.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch 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 new file mode 100644 index 00000000..f84b4c0c --- /dev/null +++ b/patches/opnfv-fuel/0011-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) -- cgit 1.2.3-korg