[meta-python] python3-blivet: Adjust install location for binaries and systemd units

Message ID 20220303040416.874842-1-raj.khem@gmail.com
State New
Headers show
Series [meta-python] python3-blivet: Adjust install location for binaries and systemd units | expand

Commit Message

Khem Raj March 3, 2022, 4:04 a.m. UTC
With wheels changes it is also getting installed under PYTHON_SITEPACKAGES_DIR
perhaps something to fix in setup.py but this fix works better from a
packager point of view.

Moves the systemd unit files and daemon into /usr/lib and /usr/libexec
dirs

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-extended/python-blivet/python3-blivet_3.4.3.bb  | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Ross Burton March 3, 2022, 11:06 a.m. UTC | #1
FWIW, this happens with ufw too when it's ported to use setuptools.

Ross

On Thu, 3 Mar 2022 at 04:04, Khem Raj <raj.khem@gmail.com> wrote:
>
> With wheels changes it is also getting installed under PYTHON_SITEPACKAGES_DIR
> perhaps something to fix in setup.py but this fix works better from a
> packager point of view.
>
> Moves the systemd unit files and daemon into /usr/lib and /usr/libexec
> dirs
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../recipes-extended/python-blivet/python3-blivet_3.4.3.bb  | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb
> index d79fc7d003..85575df7b5 100644
> --- a/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb
> +++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb
> @@ -23,6 +23,12 @@ inherit pypi features_check systemd setuptools3
>
>  REQUIRED_DISTRO_FEATURES = "systemd"
>
> +do_install:append() {
> +    mv ${D}${PYTHON_SITEPACKAGES_DIR}${exec_prefix}/* ${D}${exec_prefix}
> +    mv ${D}${PYTHON_SITEPACKAGES_DIR}${sysconfdir} ${D}
> +    mv ${D}${PYTHON_SITEPACKAGES_DIR}${base_libdir} ${D}
> +}
> +
>  RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \
>                    parted python3-pyparted multipath-tools \
>                    lsof cryptsetup libblockdev \
> --
> 2.35.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#95725): https://lists.openembedded.org/g/openembedded-devel/message/95725
> Mute This Topic: https://lists.openembedded.org/mt/89519129/1676615
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ross@burtonini.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Patch

diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb
index d79fc7d003..85575df7b5 100644
--- a/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb
+++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb
@@ -23,6 +23,12 @@  inherit pypi features_check systemd setuptools3
 
 REQUIRED_DISTRO_FEATURES = "systemd"
 
+do_install:append() {
+    mv ${D}${PYTHON_SITEPACKAGES_DIR}${exec_prefix}/* ${D}${exec_prefix}
+    mv ${D}${PYTHON_SITEPACKAGES_DIR}${sysconfdir} ${D}
+    mv ${D}${PYTHON_SITEPACKAGES_DIR}${base_libdir} ${D}
+}
+
 RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \
                   parted python3-pyparted multipath-tools \
                   lsof cryptsetup libblockdev \