[elbe-devel] [PATCH v2 03/27] debian: Only install python3 files/dependencies

[Torben Hohn]

On Thu, Sep 24, 2020 at 04:56:00PM +0200, Torben Hohn wrote:
> From: Bastian Germann <bage at linutronix.de>
> 
> Make all the binary Debian packages only install the python3 files and
> python3 dependencies.
> 
> Signed-off-by: Bastian Germann <bage at linutronix.de>

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

> ---
>  debian/control                   | 56 ++++++++++++------------
>  debian/elbe-bootup-check.install |  2 +-
>  debian/elbe-daemon.install       | 10 ++---
>  debian/elbe-debianize.install    | 74 ++++++++++++++++----------------
>  debian/elbe-soap.install         | 10 ++---
>  debian/elbe-updated.install      |  6 +--
>  debian/rules                     |  2 +-
>  7 files changed, 80 insertions(+), 80 deletions(-)
> 
> diff --git a/debian/control b/debian/control
> index de0771252..f6a74d8b4 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -66,16 +66,12 @@ Package: elbe-debianize
>  Architecture: all
>  Conflicts: elbe-debianize
>  Depends: ${misc:Depends},
> -  python (>= 2.7~),
>    python3,
>    devscripts,
>    libdistro-info-perl,
>    libparse-debcontrol-perl,
> -  python-elbe-common (= ${binary:Version}),
>    python3-elbe-common (= ${binary:Version}),
> -  python-urwid,
>    python3-urwid,
> -  python-pkg-resources,
>    python3-pkg-resources
>  Description: Wizard for debian folder generation
>   Assists users in generating a debianization for a given source code project.
> @@ -83,8 +79,8 @@ Description: Wizard for debian folder generation
>  Package: elbe
>  Architecture: all
>  Depends: ${misc:Depends},
> -  python3-elbe-bin (= ${binary:Version}) | python-elbe-bin (= ${binary:Version}),
> -  python3-elbe-control (= ${binary:Version}) | python-elbe-control (= ${binary:Version}),
> +  python3-elbe-bin (= ${binary:Version}),
> +  python3-elbe-control (= ${binary:Version}),
>    qemu-utils,
>    qemu-kvm,
>    p7zip-full,
> @@ -99,11 +95,14 @@ Description: Embedded Linux Build Environment
>  Package: elbe-daemon
>  Architecture: all
>  Depends: ${misc:Depends},
> -  python (>= 2.7~),
> -  python-elbe-bin (= ${binary:Version}),
> -  python-elbe-common (= ${binary:Version}),
> -  python-elbe-buildenv (= ${binary:Version}),
> -  python-cherrypy3, python-beaker, openssh-server, lsb-base (>= 3.0-6)
> +  python3,
> +  python3-elbe-bin (= ${binary:Version}),
> +  python3-elbe-common (= ${binary:Version}),
> +  python3-elbe-buildenv (= ${binary:Version}),
> +  python3-cherrypy3,
> +  python3-beaker,
> +  openssh-server,
> +  lsb-base (>= 3.0-6)
>  Description: wsgi daemon interface
>   subcommand to start wsgi services.
>  
> @@ -148,10 +147,11 @@ Description: Embedded Linux Build Environment Server Component
>  Package: elbe-bootup-check
>  Architecture: all
>  Depends: ${misc:Depends},
> -  python (>= 2.7~),
> -  python-elbe-bin (= ${binary:Version}),
> -  python-elbe-common (= ${binary:Version}),
> -  python-apt, lsb-base (>= 3.0-6)
> +  python3,
> +  python3-elbe-bin (= ${binary:Version}),
> +  python3-elbe-common (= ${binary:Version}),
> +  python3-apt,
> +  lsb-base (>= 3.0-6)
>  Description: bootup checker
>   This package is typically installed on a embedded system. The bootup checker
>   shows some information about the installed software on the embedded device.
> @@ -159,9 +159,9 @@ Description: bootup checker
>  Package: elbe-soap
>  Architecture: all
>  Depends: ${misc:Depends},
> -  python (>= 2.7~),
> -  python-spyne,
> -  python-elbe-buildenv (= ${binary:Version}),
> +  python3,
> +  python3-spyne,
> +  python3-elbe-buildenv (= ${binary:Version}),
>    elbe-daemon (= ${binary:Version})
>  Description: SOAP Interface for elbe buildenv
>   Enables remote control of the elbe buildenv via SOAP.
> @@ -182,20 +182,20 @@ Description: Commandline Tool to control an elbe buildenv
>  Package: elbe-updated
>  Architecture: all
>  Depends: ${misc:Depends},
> -  python (>= 2.7~),
> -  python-elbe-bin (= ${binary:Version}),
> -  python-elbe-common (= ${binary:Version}),
> -  python-lxml (>= 2.3.2-1),
> -  python-pyinotify,
> -  python-apt,
> -  python-suds,
> -  python-spyne,
> +  python3,
> +  python3-elbe-bin (= ${binary:Version}),
> +  python3-elbe-common (= ${binary:Version}),
> +  python3-lxml (>= 2.3.2-1),
> +  python3-pyinotify,
> +  python3-apt,
> +  python3-suds,
> +  python3-spyne,
>    lsb-base (>= 3.0-6)
> -Suggests: python-pyudev,
> +Suggests: python3-pyudev,
>    usbmount
>  Description: update daemon for embedded systems
>   This package is typically installed on a embedded system. The update daemon
>   monitors a directory or USB mounts. If an ELBE update file (generated by
> - 'elbe gen_update' command from the 'python-elbe-buildenv' package) is placed in this
> + 'elbe gen_update' command from the 'python3-elbe-buildenv' package) is placed in this
>   directory the update will be applied.
>   Downgrades are possible by the integrated SOAP interface.
> diff --git a/debian/elbe-bootup-check.install b/debian/elbe-bootup-check.install
> index b9f21b390..1f61d1246 100644
> --- a/debian/elbe-bootup-check.install
> +++ b/debian/elbe-bootup-check.install
> @@ -1 +1 @@
> -./usr/lib/python2.*/*-packages/elbepack/commands/bootup-check.py
> +./usr/lib/python3.*/*-packages/elbepack/commands/bootup-check.py
> diff --git a/debian/elbe-daemon.install b/debian/elbe-daemon.install
> index 1298eb2a4..f3e41ada4 100644
> --- a/debian/elbe-daemon.install
> +++ b/debian/elbe-daemon.install
> @@ -1,5 +1,5 @@
> -./usr/lib/python2.*/*-packages/elbepack/daemons/__init__.py
> -./usr/lib/python2.*/*-packages/elbepack/commands/daemon.py
> -./usr/lib/python2.*/*-packages/elbepack/asyncworker.py
> -./usr/lib/python2.*/*-packages/elbepack/pkgarchive.py
> -./usr/lib/python2.*/*-packages/elbepack/projectmanager.py
> +./usr/lib/python3.*/*-packages/elbepack/daemons/__init__.py
> +./usr/lib/python3.*/*-packages/elbepack/commands/daemon.py
> +./usr/lib/python3.*/*-packages/elbepack/asyncworker.py
> +./usr/lib/python3.*/*-packages/elbepack/pkgarchive.py
> +./usr/lib/python3.*/*-packages/elbepack/projectmanager.py
> diff --git a/debian/elbe-debianize.install b/debian/elbe-debianize.install
> index 6d80ec1b6..18e16cd87 100644
> --- a/debian/elbe-debianize.install
> +++ b/debian/elbe-debianize.install
> @@ -1,37 +1,37 @@
> -./usr/lib/python*/*-packages/elbepack/commands/debianize.py
> -./usr/lib/python*/*-packages/elbepack/debianize/__init__.py
> -./usr/lib/python*/*-packages/elbepack/debianize/base/__init__.py
> -./usr/lib/python*/*-packages/elbepack/debianize/base/tui.py
> -./usr/lib/python*/*-packages/elbepack/debianize/panels/barebox.py
> -./usr/lib/python*/*-packages/elbepack/debianize/panels/base.py
> -./usr/lib/python*/*-packages/elbepack/debianize/panels/factory.py
> -./usr/lib/python*/*-packages/elbepack/debianize/panels/__init__.py
> -./usr/lib/python*/*-packages/elbepack/debianize/panels/kernel.py
> -./usr/lib/python*/*-packages/elbepack/debianize/panels/uboot.py
> -./usr/lib/python*/*-packages/elbepack/debianize/widgets/button.py
> -./usr/lib/python*/*-packages/elbepack/debianize/widgets/edit.py
> -./usr/lib/python*/*-packages/elbepack/debianize/widgets/form.py
> -./usr/lib/python*/*-packages/elbepack/debianize/widgets/grid.py
> -./usr/lib/python*/*-packages/elbepack/debianize/widgets/__init__.py
> -./usr/lib/python*/*-packages/elbepack/debianize/widgets/radio.py
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/rules.mako
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/linux-image.install
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/control.mako
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/format.mako
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/linux-headers.install
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/preinst.mako
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/postinst.mako
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/prerm.mako
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/postrm.mako
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/linux-libc-dev.install
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/barebox/barebox-image.install
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/barebox/barebox-tools.install
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/barebox/control.mako
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/barebox/format.mako
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/barebox/rules.mako
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/u-boot/control.mako
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/u-boot/format.mako
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/u-boot/rules.mako
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/u-boot/u-boot-image.install
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/u-boot/u-boot-tools.install
> -./usr/lib/python*/*-packages/elbepack/makofiles/debianize/u-boot/u-boot-tools.links
> +./usr/lib/python3*/*-packages/elbepack/commands/debianize.py
> +./usr/lib/python3*/*-packages/elbepack/debianize/__init__.py
> +./usr/lib/python3*/*-packages/elbepack/debianize/base/__init__.py
> +./usr/lib/python3*/*-packages/elbepack/debianize/base/tui.py
> +./usr/lib/python3*/*-packages/elbepack/debianize/panels/barebox.py
> +./usr/lib/python3*/*-packages/elbepack/debianize/panels/base.py
> +./usr/lib/python3*/*-packages/elbepack/debianize/panels/factory.py
> +./usr/lib/python3*/*-packages/elbepack/debianize/panels/__init__.py
> +./usr/lib/python3*/*-packages/elbepack/debianize/panels/kernel.py
> +./usr/lib/python3*/*-packages/elbepack/debianize/panels/uboot.py
> +./usr/lib/python3*/*-packages/elbepack/debianize/widgets/button.py
> +./usr/lib/python3*/*-packages/elbepack/debianize/widgets/edit.py
> +./usr/lib/python3*/*-packages/elbepack/debianize/widgets/form.py
> +./usr/lib/python3*/*-packages/elbepack/debianize/widgets/grid.py
> +./usr/lib/python3*/*-packages/elbepack/debianize/widgets/__init__.py
> +./usr/lib/python3*/*-packages/elbepack/debianize/widgets/radio.py
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/kernel/rules.mako
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/kernel/linux-image.install
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/kernel/control.mako
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/kernel/format.mako
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/kernel/linux-headers.install
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/kernel/preinst.mako
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/kernel/postinst.mako
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/kernel/prerm.mako
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/kernel/postrm.mako
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/kernel/linux-libc-dev.install
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/barebox/barebox-image.install
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/barebox/barebox-tools.install
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/barebox/control.mako
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/barebox/format.mako
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/barebox/rules.mako
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/u-boot/control.mako
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/u-boot/format.mako
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/u-boot/rules.mako
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/u-boot/u-boot-image.install
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/u-boot/u-boot-tools.install
> +./usr/lib/python3*/*-packages/elbepack/makofiles/debianize/u-boot/u-boot-tools.links
> diff --git a/debian/elbe-soap.install b/debian/elbe-soap.install
> index 9261ecca9..17d8a795d 100644
> --- a/debian/elbe-soap.install
> +++ b/debian/elbe-soap.install
> @@ -1,5 +1,5 @@
> -./usr/lib/python2.*/*-packages/elbepack/daemons/soap/__init__.py
> -./usr/lib/python2.*/*-packages/elbepack/daemons/soap/authentication.py
> -./usr/lib/python2.*/*-packages/elbepack/daemons/soap/datatypes.py
> -./usr/lib/python2.*/*-packages/elbepack/daemons/soap/faults.py
> -./usr/lib/python2.*/*-packages/elbepack/daemons/soap/esoap.py
> +./usr/lib/python3.*/*-packages/elbepack/daemons/soap/__init__.py
> +./usr/lib/python3.*/*-packages/elbepack/daemons/soap/authentication.py
> +./usr/lib/python3.*/*-packages/elbepack/daemons/soap/datatypes.py
> +./usr/lib/python3.*/*-packages/elbepack/daemons/soap/faults.py
> +./usr/lib/python3.*/*-packages/elbepack/daemons/soap/esoap.py
> diff --git a/debian/elbe-updated.install b/debian/elbe-updated.install
> index 9d54fae52..edd03a952 100644
> --- a/debian/elbe-updated.install
> +++ b/debian/elbe-updated.install
> @@ -1,3 +1,3 @@
> -./usr/lib/python2.*/*-packages/elbepack/updated.py
> -./usr/lib/python2.*/*-packages/elbepack/updated_monitors.py
> -./usr/lib/python2.*/*-packages/elbepack/commands/updated.py
> +./usr/lib/python3.*/*-packages/elbepack/updated.py
> +./usr/lib/python3.*/*-packages/elbepack/updated_monitors.py
> +./usr/lib/python3.*/*-packages/elbepack/commands/updated.py
> diff --git a/debian/rules b/debian/rules
> index 71f40154f..e0e7c494e 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -29,4 +29,4 @@ override_dh_install:
>  	dh_installxmlcatalogs
>  
>  %:
> -	dh $@ --with systemd --buildsystem=pybuild --with python2,python3
> +	dh $@ --with systemd --buildsystem=pybuild --with python3
> -- 
> 2.20.1
> 
> _______________________________________________
> 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