[elbe-devel] [PATCH] Remove outdated patches

[Torben Hohn]

On Wed, Jul 29, 2020 at 11:26:52AM +0200, bage at linutronix.de wrote:
> From: Bastian Germann <bage at linutronix.de>
> 
> Remove two contrib patches for old Debian/Ubuntu versions that do not
> apply anymore.
> 
> Signed-off-by: Bastian Germann <bage at linutronix.de>

Reviewed-by: Torben Hohn <torben.hohn at linutronix.de>

> ---
>  ...added-python-packaging-as-dependency.patch | 25 --------
>  contrib/ubuntu/xenial.patch                   | 59 -------------------
>  2 files changed, 84 deletions(-)
>  delete mode 100644 contrib/stretch/0001-updated-debian-added-python-packaging-as-dependency.patch
>  delete mode 100644 contrib/ubuntu/xenial.patch
> 
> diff --git a/contrib/stretch/0001-updated-debian-added-python-packaging-as-dependency.patch b/contrib/stretch/0001-updated-debian-added-python-packaging-as-dependency.patch
> deleted file mode 100644
> index 1483e83b2..000000000
> --- a/contrib/stretch/0001-updated-debian-added-python-packaging-as-dependency.patch
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -From b7b647a1151429894c2d6a4ae289e25df345d68e Mon Sep 17 00:00:00 2001
> -From: Kurt Kanzenbach <kurt at linutronix.de>
> -Date: Wed, 22 Mar 2017 12:36:39 +0100
> -Subject: [PATCH] updated: debian: added python-packaging as dependency
> -
> -Signed-off-by: Kurt Kanzenbach <kurt at linutronix.de>
> ----
> - debian/control | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/debian/control b/debian/control
> -index 1148287..477ec2b 100644
> ---- a/debian/control
> -+++ b/debian/control
> -@@ -155,6 +155,7 @@ Depends: ${misc:Depends},
> -   python-apt,
> -   python-suds,
> -   python-phyne,
> -+  python-packaging,
> -   lsb-base (>= 3.0-6)
> - Suggests: python-pyudev,
> -   usbmount
> --- 
> -2.1.4
> -
> diff --git a/contrib/ubuntu/xenial.patch b/contrib/ubuntu/xenial.patch
> deleted file mode 100644
> index 895e5e82f..000000000
> --- a/contrib/ubuntu/xenial.patch
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -diff --git a/debian/control b/debian/control
> -index 158df1b..4662408 100644
> ---- a/debian/control
> -+++ b/debian/control
> -@@ -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 c4f7957..3750db7 100644
> ---- a/elbepack/init/Makefile.mako
> -+++ b/elbepack/init/Makefile.mako
> -@@ -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) \
> --		-device virtio-rng-pci \
> - 		-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 \
> -@@ -115,7 +114,6 @@ all: .stamps/stamp-install-initial-image
> - 
> - run:
> - 	$(INTERPRETER) -M $(MACHINE) \
> --		-device virtio-rng-pci \
> - 		-device virtio-net-pci,netdev=user.0 \
> - 		-drive file=buildenv.img,if=$(HD_TYPE),bus=1,unit=0 \
> - 		-no-reboot \
> -@@ -133,7 +131,6 @@ run:
> - 
> - run-con:
> - 	$(INTERPRETER) -M $(MACHINE) \
> --		-device virtio-rng-pci \
> - 		-device virtio-net-pci,netdev=user.0 \
> - 		-drive file=buildenv.img,if=$(HD_TYPE),bus=1,unit=0 \
> - 		-no-reboot \
> -- 
> 2.27.0
> 
> _______________________________________________
> elbe-devel mailing list
> elbe-devel at linutronix.de
> https://lists.linutronix.de/mailman/listinfo/elbe-devel

-- 
Torben Hohn
Linutronix GmbH | Bahnhofstrasse 3 | D-88690 Uhldingen-Mühlhofen
Phone: +49 7556 25 999 18; Fax.: +49 7556 25 999 99

Hinweise zum Datenschutz finden Sie hier (Informations on data privacy 
can be found here): https://linutronix.de/kontakt/Datenschutz.php

Linutronix GmbH | Firmensitz (Registered Office): Uhldingen-Mühlhofen | 
Registergericht (Registration Court): Amtsgericht Freiburg i.Br., HRB700 
806 | Geschäftsführer (Managing Directors): Heinz Egger, Thomas Gleixner