From: Alexandru Avadanii Date: Mon, 16 May 2016 15:05:14 +0000 (+0200) Subject: Rebase: p/fuel-web: Drop obsoleted qemu doc patch. X-Git-Tag: colorado.1.rc1~454^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c9b05e2c54b2b1eb77847638bf3e9e9f75b86556;p=armband.git Rebase: p/fuel-web: Drop obsoleted qemu doc patch. Upstream moved documentation from local repo to fuel-docs in [1]. While looking at this patch, I think we should drop this change altogether, since qemu-user-static is not needed inside the docker builder container, at least not until we start using it for cross-builds, which is highly unlikely anyway. qemu-user-static should always be automatically installed as a dependency of fuel-agent, and NOT by explicit request. [1] https://github.com/openstack/fuel-web/commit/ eb673991cc99c5dadb251f922adb08abb40a8bad Change-Id: Iad7f659fd5ff81e92860508fad58bac519158c47 --- diff --git a/patches/fuel-web/0003-Update-docs-for-qemu-debootstrap.patch b/patches/fuel-web/0003-Update-docs-for-qemu-debootstrap.patch deleted file mode 100644 index 5a975fb7..00000000 --- a/patches/fuel-web/0003-Update-docs-for-qemu-debootstrap.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Stanislaw Kardach -Date: Thu, 25 Feb 2016 13:35:39 +0100 -Subject: [PATCH] Update docs for qemu-debootstrap - ---- - docs/develop/env.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/docs/develop/env.rst b/docs/develop/env.rst -index 227549c..47b9823 100644 ---- a/docs/develop/env.rst -+++ b/docs/develop/env.rst -@@ -114,7 +114,7 @@ your Fuel ISO build environment on Ubuntu 14.04: - python-setuptools yum yum-utils libmysqlclient-dev isomd5sum \ - python-nose libvirt-bin python-ipaddr python-paramiko python-yaml \ - python-pip kpartx extlinux unzip genisoimage nodejs multistrap \ -- lrzip python-daemon -+ lrzip python-daemon qemu-user-static - sudo gem install bundler -v 1.2.1 - sudo gem install builder - sudo pip install xmlbuilder jinja2