summaryrefslogtreecommitdiffstats
path: root/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-13 22:17:14 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-16 12:01:40 +0000
commit902f8b6ec6303fdd4c01dfe2889d0107e103fe6b (patch)
treeb6f5da155ad8be9d1f98dcfa1ae219ddeaf71397 /patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch
parent2741c6e75c660727177b9d32d5cf29c60b40eb25 (diff)
Rebase: p/fuel-main: Refresh after pkglist update.
Upstream commit: "Update package list required for building ISO" [1] [1] https://github.com/openstack/fuel-main/commit/ 18f2c14a928bf3e92ccd4d868953361bed61614b Change-Id: I59af524de7539489ad4dce12894573f8ff1ac5a5
Diffstat (limited to 'patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch')
-rw-r--r--patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch18
1 files changed, 9 insertions, 9 deletions
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 15dcac3e..07f1fb93 100644
--- 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