diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2023-10-08 20:24:27 -0700 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2023-10-08 22:20:50 -0700 |
| commit | a76f0b1f7c9fc7ecb4ebaaf9862fff3624fdef53 (patch) | |
| tree | 79e69eaefbe52c4b0356e1c8192260a20f73c652 | |
| parent | 719042228998484b9022676a2726002d10593343 (diff) | |
| download | meta-openembedded-a76f0b1f7c9fc7ecb4ebaaf9862fff3624fdef53.tar.gz | |
libblockdev: fix QA error in case of multilib
Fix the following QA error.
ERROR: QA Issue: libblockdev: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/python3.11
/usr/lib/python3.11/site-packages
/usr/lib/python3.11/site-packages/gi
/usr/lib/python3.11/site-packages/gi/overrides
/usr/lib/python3.11/site-packages/gi/overrides/BlockDev.py
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/libblockdev/files/0001-fix-pythondir-for-multilib-when-cross-compiling.patch | 32 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/libblockdev/libblockdev_3.03.bb | 3 |
2 files changed, 34 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/libblockdev/files/0001-fix-pythondir-for-multilib-when-cross-compiling.patch b/meta-oe/recipes-extended/libblockdev/files/0001-fix-pythondir-for-multilib-when-cross-compiling.patch new file mode 100644 index 0000000000..ec3a9fe470 --- /dev/null +++ b/meta-oe/recipes-extended/libblockdev/files/0001-fix-pythondir-for-multilib-when-cross-compiling.patch @@ -0,0 +1,32 @@ +From 297abed277ce3aa0cf12adbfda3c8581afdba850 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Sun, 8 Oct 2023 19:30:29 -0700 +Subject: [PATCH] fix pythondir for multilib when cross compiling + +In case of cross compiling + multilib, the 'shell python3' line is +not likely to give out correct result. Make use of pythondir instead. + +This patch is related to meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch +in oe-core, so this one is marked as oe specific. + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + src/python/gi/overrides/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/python/gi/overrides/Makefile.am b/src/python/gi/overrides/Makefile.am +index 5e8e75f7..7c30601c 100644 +--- a/src/python/gi/overrides/Makefile.am ++++ b/src/python/gi/overrides/Makefile.am +@@ -1,5 +1,5 @@ + if WITH_PYTHON3 +-py3libdir = $(shell python3 -c "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '${exec_prefix}'}))") ++py3libdir = $(pythondir) + py3overridesdir = $(py3libdir)/gi/overrides + dist_py3overrides_DATA = BlockDev.py + endif +-- +2.42.0 + diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_3.03.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_3.03.bb index 670bebd37b..99175e6112 100644 --- a/meta-oe/recipes-extended/libblockdev/libblockdev_3.03.bb +++ b/meta-oe/recipes-extended/libblockdev/libblockdev_3.03.bb @@ -13,7 +13,8 @@ inherit autotools gobject-introspection pkgconfig lib_package DEPENDS = "autoconf-archive-native glib-2.0 kmod udev libnvme" SRC_URI = "git://github.com/storaged-project/libblockdev;branch=master;protocol=https \ -" + file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \ + " SRCREV = "38378931d285b91333ff2e2a391b1fe91072f9bb" S = "${WORKDIR}/git" |