[elbe-devel] [PATCH] contrib/ubuntu: update patch for xenial

[Manuel Traut]

e.g. virsh is in different packages, for different ubuntu releases.
this needs extra patches for each ubuntu release.

Signed-off-by: Manuel Traut <manut at linutronix.de>
---
 ...buntu-debianization.patch => xenial.patch} | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)
 rename contrib/ubuntu/{0001-contrib-modifications-for-ubuntu-debianization.patch => xenial.patch} (51%)

diff --git a/contrib/ubuntu/0001-contrib-modifications-for-ubuntu-debianization.patch b/contrib/ubuntu/xenial.patch
similarity index 51%
rename from contrib/ubuntu/0001-contrib-modifications-for-ubuntu-debianization.patch
rename to contrib/ubuntu/xenial.patch
index 9d6b3cdd..895e5e82 100644
--- a/contrib/ubuntu/0001-contrib-modifications-for-ubuntu-debianization.patch
+++ b/contrib/ubuntu/xenial.patch
@@ -1,21 +1,39 @@
 diff --git a/debian/control b/debian/control
-index 57191e26..6f300aaf 100644
+index 158df1b..4662408 100644
 --- a/debian/control
 +++ b/debian/control
-@@ -61,7 +61,7 @@ Depends: ${misc:Depends},
-   elbe-common (= ${binary:Version}),
-   elbe-control (= ${binary:Version}),
+@@ -102,7 +102,7 @@ Depends: ${misc:Depends},
+   python-elbe-bin (= ${binary:Version}),
+   python-elbe-control (= ${binary:Version}),
    qemu-utils,
 -  qemu-kvm (>= 1:2.1),
 +  qemu-kvm,
    python-mako,
    p7zip-full,
    make
+@@ -224,7 +224,7 @@ Depends: ${misc:Depends},
+   python-suds,
+   python-debian,
+   python-elbe-common (= ${binary:Version}),
+-  libvirt-clients,
++  libvirt-bin,
+   libvirt-daemon-system
+ Description: Commandline Tool to control an elbe buildenv
+  The SOAP Interface is used to control an elbe buildenv.
+@@ -236,7 +236,7 @@ Depends: ${misc:Depends},
+   python3-suds,
+   python3-debian,
+   python3-elbe-common (= ${binary:Version}),
+-  libvirt-clients,
++  libvirt-bin,
+   libvirt-daemon-system
+ Description: Commandline Tool to control an elbe buildenv
+  The SOAP Interface is used to control an elbe buildenv.
 diff --git a/elbepack/init/Makefile.mako b/elbepack/init/Makefile.mako
-index 21f21cd0..7aed5286 100644
+index c4f7957..3750db7 100644
 --- a/elbepack/init/Makefile.mako
 +++ b/elbepack/init/Makefile.mako
-@@ -85,7 +85,6 @@ all: .stamps/stamp-install-initial-image
+@@ -84,7 +84,6 @@ all: .stamps/stamp-install-initial-image
  .stamps/stamp-install-initial-image: .stamps/stamp-create-buildenv-img
  	@ echo $(INTERPRETER)
  	@ $(INTERPRETER) -M $(MACHINE) \
@@ -23,7 +41,7 @@ index 21f21cd0..7aed5286 100644
  		-drive file=buildenv.img,if=$(HD_TYPE),bus=1,unit=0 \
  % if prj.has("mirror/cdrom"):
  		-drive file=${prj.text("mirror/cdrom")},if=$(CDROM_TYPE),media=cdrom,bus=1,unit=0 \
-@@ -116,7 +115,6 @@ all: .stamps/stamp-install-initial-image
+@@ -115,7 +114,6 @@ all: .stamps/stamp-install-initial-image
  
  run:
  	$(INTERPRETER) -M $(MACHINE) \
@@ -31,7 +49,7 @@ index 21f21cd0..7aed5286 100644
  		-device virtio-net-pci,netdev=user.0 \
  		-drive file=buildenv.img,if=$(HD_TYPE),bus=1,unit=0 \
  		-no-reboot \
-@@ -134,7 +132,6 @@ run:
+@@ -133,7 +131,6 @@ run:
  
  run-con:
  	$(INTERPRETER) -M $(MACHINE) \
-- 
2.17.0