Merge "Rebase: p/fuel-library: CirrOS direct kernel boot"

[armband.git] / patches / fuel-main / 0001-Use-qemu-debootstrap-to-support-multi-arch.patch

diff --git a/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch b/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch
index 15dcac3..07f1fb9 100644 (file)
--- a/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch
+++ b/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch
@@ -12,15 +12,15 @@ diff --git a/prepare-build-env.sh b/prepare-build-env.sh
 index 194e528..fa186ed 100755
 --- a/prepare-build-env.sh
 +++ b/prepare-build-env.sh
-@@ -112,7 +112,7 @@ sudo apt-get -y install build-essential make git $GEMPKG debootstrap createrepo
-   python-nose libvirt-bin python-ipaddr python-paramiko python-yaml \
-   python-pip kpartx extlinux unzip genisoimage syslinux debmirror \
-   lrzip python-daemon python-dev libparse-debcontrol-perl reprepro devscripts \
--  xorriso
-+  xorriso qemu-user-static
- sudo gem install bundler -v 1.2.1
- sudo gem install builder
- sudo pip install xmlbuilder jinja2 pbr
+@@ -112,6 +112,7 @@
+   lrzip \
+   python-jinja2 \
+   python-yaml \
++  qemu-user-static
+   reprepro \
+   rpm \
+   syslinux \
+   unzip \
 diff --git a/requirements-rpm.txt b/requirements-rpm.txt
 index e0aa9ba..9a2d141 100644
 --- a/requirements-rpm.txt