aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-16 17:05:14 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-16 17:10:11 +0200
commitc9b05e2c54b2b1eb77847638bf3e9e9f75b86556 (patch)
treea8f0c50a8d080c9eb399019f81036e3f8ae04cdc
parent230c9e821ebf27ad6b4f4c4c7f82c9192cb222b4 (diff)
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
-rw-r--r--patches/fuel-web/0003-Update-docs-for-qemu-debootstrap.patch21
1 files changed, 0 insertions, 21 deletions
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 <stanislaw.kardach@caviumnetworks.com>
-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