From 210800f123e7fc7531e59bf136c27e0c1480f1db Mon Sep 17 00:00:00 2001 From: Lei Maohui Date: Fri, 13 Oct 2023 11:55:06 +0800 Subject: [PATCH] gexiv2: Fix do_package QA issue when usrmerge enabled. ERROR: gexiv2-0.14.2-r0 do_package: QA Issue: gexiv2: 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/GExiv2.py /usr/lib/python3.11/site-packages/gi/overrides/__pycache__ /usr/lib/python3.11/site-packages/gi/overrides/__pycache__/GExiv2.cpython-311.pyc Signed-off-by: Lei Maohui Signed-off-by: Khem Raj (cherry picked from commit eddc2571a759f208cd8e3e05f3ca14457b9169dc) Signed-off-by: Armin Kuster --- meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb index 15091d4cd4..19d31f4286 100644 --- a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb +++ b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb @@ -25,3 +25,11 @@ src_package_preprocess () { sed -i -e "s,${B}/../${BPN}-${PV}/${BPN}/,,g" \ ${B}/gexiv2/gexiv2-enums.cpp } + +do_install:append() { + # gexiv2 harcodes usr/lib as install path, so this corrects it to actual libdir + if [ "${prefix}/lib" != "${libdir}" ]; then + mv ${D}/${prefix}/lib/* ${D}/${libdir}/ + rm -rf ${D}/${prefix}/lib + fi +}