[elbe-devel] [PATCH v2 06/27] debian: rename pkg elbe-daemon to python3-elbe-daemon

[Bastian Germann]

Am 24.09.20 um 16:56 schrieb Torben Hohn:
> Somehow dh_install installs python modules to /usr/lib/python3
> when a package name starts with python3-.
> This was not the case for elbe-daemon and the files were installed
> to /usr/lib/python3.7/. That prevents elbe from finding the "daemon"
> command, and the daemon in the initvm can not start.
> 
> Rename all packages containeing commands to python3-* and adjust depends.

containing

> Also fix the packagenames to be installed into the initvm in
> elbepack/version.py and change the defaults filename in the service file.
> 
> Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>

First off: The commit title has to be changed, because it is not only
elbe-daemon that is changed. I guess you can make pybuild/dh_python3
install the packages somehow without the second version info.

Actually, especially for python modules with an executable the
convention is not to have the python3- pkg prefix.

If you do not find info on that, please change the install files to have
the right paths in place.

> ---
>  debian/control                                     | 14 +++++++-------
>  ...p-check.init => python3-elbe-bootup-check.init} |  0
>  ...k.install => python3-elbe-bootup-check.install} |  0
>  ...-daemon.default => python3-elbe-daemon.default} |  0
>  .../{elbe-daemon.init => python3-elbe-daemon.init} |  0
>  ...-daemon.install => python3-elbe-daemon.install} |  0
>  ...-daemon.service => python3-elbe-daemon.service} |  2 +-
>  ...nize.install => python3-elbe-debianize.install} |  0
>  ...elbe-soap.install => python3-elbe-soap.install} |  0
>  ...pdated.default => python3-elbe-updated.default} |  0
>  ...elbe-updated.init => python3-elbe-updated.init} |  0
>  ...pdated.install => python3-elbe-updated.install} |  0
>  ...ated.postinst => python3-elbe-updated.postinst} |  0
>  ...-updated.postrm => python3-elbe-updated.postrm} |  0
>  ...be-updated.prerm => python3-elbe-updated.prerm} |  0
>  ...pdated.service => python3-elbe-updated.service} |  0
>  elbepack/version.py                                |  4 ++--
>  17 files changed, 10 insertions(+), 10 deletions(-)
>  rename debian/{elbe-bootup-check.init => python3-elbe-bootup-check.init} (100%)
>  rename debian/{elbe-bootup-check.install => python3-elbe-bootup-check.install} (100%)
>  rename debian/{elbe-daemon.default => python3-elbe-daemon.default} (100%)
>  rename debian/{elbe-daemon.init => python3-elbe-daemon.init} (100%)
>  rename debian/{elbe-daemon.install => python3-elbe-daemon.install} (100%)
>  rename debian/{elbe-daemon.service => python3-elbe-daemon.service} (72%)
>  rename debian/{elbe-debianize.install => python3-elbe-debianize.install} (100%)
>  rename debian/{elbe-soap.install => python3-elbe-soap.install} (100%)
>  rename debian/{elbe-updated.default => python3-elbe-updated.default} (100%)
>  rename debian/{elbe-updated.init => python3-elbe-updated.init} (100%)
>  rename debian/{elbe-updated.install => python3-elbe-updated.install} (100%)
>  rename debian/{elbe-updated.postinst => python3-elbe-updated.postinst} (100%)
>  rename debian/{elbe-updated.postrm => python3-elbe-updated.postrm} (100%)
>  rename debian/{elbe-updated.prerm => python3-elbe-updated.prerm} (100%)
>  rename debian/{elbe-updated.service => python3-elbe-updated.service} (100%)
> 
> diff --git a/debian/control b/debian/control
> index f6a74d8b4..440a374fd 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -62,7 +62,7 @@ Description: common files
>   Common files for ELBE (embedded linux build environment). These
>   python-modules are shared by several elbe subcommands.
>  
> -Package: elbe-debianize
> +Package: python3-elbe-debianize
>  Architecture: all
>  Conflicts: elbe-debianize
>  Depends: ${misc:Depends},
> @@ -86,13 +86,13 @@ Depends: ${misc:Depends},
>    p7zip-full,
>    make,
>    lsb-release
> -Recommends: elbe-doc (= ${binary:Version}), elbe-debianize, haveged
> +Recommends: elbe-doc (= ${binary:Version}), python3-elbe-debianize, haveged
>  Description: Embedded Linux Build Environment
>   A flexible Root Filesystem builder. ELBE uses Debian packages to build a RFS
>   for (embedded) targets. A target is described with a single XML file. Besides
>   the target image, licence information, source cdroms, etc. are generated.
>  
> -Package: elbe-daemon
> +Package: python3-elbe-daemon
>  Architecture: all
>  Depends: ${misc:Depends},
>    python3,
> @@ -144,7 +144,7 @@ Description: Embedded Linux Build Environment Server Component
>   subcommands need to be executed with root privileges. It is not recommended to
>   install this package on a native system.
>  
> -Package: elbe-bootup-check
> +Package: python3-elbe-bootup-check
>  Architecture: all
>  Depends: ${misc:Depends},
>    python3,
> @@ -156,13 +156,13 @@ 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.
>  
> -Package: elbe-soap
> +Package: python3-elbe-soap
>  Architecture: all
>  Depends: ${misc:Depends},
>    python3,
>    python3-spyne,
>    python3-elbe-buildenv (= ${binary:Version}),
> -  elbe-daemon (= ${binary:Version})
> +  python3-elbe-daemon (= ${binary:Version})
>  Description: SOAP Interface for elbe buildenv
>   Enables remote control of the elbe buildenv via SOAP.
>  
> @@ -179,7 +179,7 @@ Description: Commandline Tool to control an elbe buildenv
>   The SOAP Interface is used to control an elbe buildenv.
>  
>  
> -Package: elbe-updated
> +Package: python3-elbe-updated
>  Architecture: all
>  Depends: ${misc:Depends},
>    python3,
> diff --git a/debian/elbe-bootup-check.init b/debian/python3-elbe-bootup-check.init
> similarity index 100%
> rename from debian/elbe-bootup-check.init
> rename to debian/python3-elbe-bootup-check.init
> diff --git a/debian/elbe-bootup-check.install b/debian/python3-elbe-bootup-check.install
> similarity index 100%
> rename from debian/elbe-bootup-check.install
> rename to debian/python3-elbe-bootup-check.install
> diff --git a/debian/elbe-daemon.default b/debian/python3-elbe-daemon.default
> similarity index 100%
> rename from debian/elbe-daemon.default
> rename to debian/python3-elbe-daemon.default
> diff --git a/debian/elbe-daemon.init b/debian/python3-elbe-daemon.init
> similarity index 100%
> rename from debian/elbe-daemon.init
> rename to debian/python3-elbe-daemon.init
> diff --git a/debian/elbe-daemon.install b/debian/python3-elbe-daemon.install
> similarity index 100%
> rename from debian/elbe-daemon.install
> rename to debian/python3-elbe-daemon.install
> diff --git a/debian/elbe-daemon.service b/debian/python3-elbe-daemon.service
> similarity index 72%
> rename from debian/elbe-daemon.service
> rename to debian/python3-elbe-daemon.service
> index 88689763d..26619b918 100644
> --- a/debian/elbe-daemon.service
> +++ b/debian/python3-elbe-daemon.service
> @@ -3,7 +3,7 @@ Description=ELBE Daemon
>  
>  [Service]
>  Type=simple
> -EnvironmentFile=/etc/default/elbe-daemon
> +EnvironmentFile=/etc/default/python3-elbe-daemon
>  ExecStart=/usr/bin/elbe $DAEMON_ARGS
>  
>  [Install]
> diff --git a/debian/elbe-debianize.install b/debian/python3-elbe-debianize.install
> similarity index 100%
> rename from debian/elbe-debianize.install
> rename to debian/python3-elbe-debianize.install
> diff --git a/debian/elbe-soap.install b/debian/python3-elbe-soap.install
> similarity index 100%
> rename from debian/elbe-soap.install
> rename to debian/python3-elbe-soap.install
> diff --git a/debian/elbe-updated.default b/debian/python3-elbe-updated.default
> similarity index 100%
> rename from debian/elbe-updated.default
> rename to debian/python3-elbe-updated.default
> diff --git a/debian/elbe-updated.init b/debian/python3-elbe-updated.init
> similarity index 100%
> rename from debian/elbe-updated.init
> rename to debian/python3-elbe-updated.init
> diff --git a/debian/elbe-updated.install b/debian/python3-elbe-updated.install
> similarity index 100%
> rename from debian/elbe-updated.install
> rename to debian/python3-elbe-updated.install
> diff --git a/debian/elbe-updated.postinst b/debian/python3-elbe-updated.postinst
> similarity index 100%
> rename from debian/elbe-updated.postinst
> rename to debian/python3-elbe-updated.postinst
> diff --git a/debian/elbe-updated.postrm b/debian/python3-elbe-updated.postrm
> similarity index 100%
> rename from debian/elbe-updated.postrm
> rename to debian/python3-elbe-updated.postrm
> diff --git a/debian/elbe-updated.prerm b/debian/python3-elbe-updated.prerm
> similarity index 100%
> rename from debian/elbe-updated.prerm
> rename to debian/python3-elbe-updated.prerm
> diff --git a/debian/elbe-updated.service b/debian/python3-elbe-updated.service
> similarity index 100%
> rename from debian/elbe-updated.service
> rename to debian/python3-elbe-updated.service
> diff --git a/elbepack/version.py b/elbepack/version.py
> index 3d311d178..fd6647d76 100644
> --- a/elbepack/version.py
> +++ b/elbepack/version.py
> @@ -10,9 +10,9 @@ from elbepack.directories import pack_dir
>  elbe_version = "12.5"
>  
>  elbe_initvm_packagelist = ['python3-elbe-buildenv',
> -                           'elbe-soap',
> +                           'python3-elbe-soap',
>                             'python3-elbe-common',
> -                           'elbe-daemon',
> +                           'python3-elbe-daemon',
>                             'elbe-schema',
>                             'python3-elbe-bin']