[meta-python] python3-blivet: fix up base_libdir and update licence

Message ID 20220304093850.10998-1-kai.kang@windriver.com
State New
Headers show
Series [meta-python] python3-blivet: fix up base_libdir and update licence | expand

Commit Message

Kai March 4, 2022, 9:38 a.m. UTC
From: Kai Kang <kai.kang@windriver.com>

It fails to run do_install when multilib enabled that systemd service
files are installed in ${nonarch_base_libdir}.

And update LICENSE variable to use SPDX license identifiers as well.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../recipes-extended/python-blivet/python3-blivet_3.4.3.bb    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 85575df7b..1d2add87a 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
@@ -1,6 +1,6 @@ 
 DESCRIPTION = "A python module for system storage configuration"
 HOMEPAGE = "http://fedoraproject.org/wiki/blivet"
-LICENSE = "LGPLv2+"
+LICENSE = "LGPL-2.0-or-later"
 SECTION = "devel/python"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
@@ -26,7 +26,7 @@  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}
+    mv ${D}${PYTHON_SITEPACKAGES_DIR}${nonarch_base_libdir} ${D}
 }
 
 RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \