Skip to content

Commit 098dc60

Browse files
shr-projectkraj
authored andcommitted
libpwquality: respect PYTHONSITEDIR
* fixes installed-vs-shipped e.g. in multilib builds with libdir set to /usr/lib32: ERROR: QA Issue: lib32-libpwquality: Files/directories were installed but not shipped in any package: /usr/lib/python3.11/site-packages/pwquality.cpython-311-arm-linux-gnueabi.so /usr/lib/python3.11/site-packages/pwquality-1.4.5-py3.11.egg-info /usr/lib/python3.11/site-packages/pwquality-1.4.5-py3.11.egg-info/SOURCES.txt /usr/lib/python3.11/site-packages/pwquality-1.4.5-py3.11.egg-info/PKG-INFO /usr/lib/python3.11/site-packages/pwquality-1.4.5-py3.11.egg-info/dependency_links.txt /usr/lib/python3.11/site-packages/pwquality-1.4.5-py3.11.egg-info/top_level.txt Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. lib32-libpwquality: 6 installed and not shipped files. [installed-vs-shipped] Signed-off-by: Martin Jansa <martin.jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 parent 6fd9eac commit 098dc60

2 files changed

Lines changed: 29 additions & 2 deletions

File tree

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From edc51ba1b446913232cdf2945f485392bca72dc7 Mon Sep 17 00:00:00 2001
2+
From: Hongxu Jia <hongxu.jia@windriver.com>
3+
Date: Mon, 3 Aug 2015 13:43:14 +0800
4+
Subject: [PATCH] Makefile.am: respect ${PYTHONSITEDIR}
5+
6+
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
7+
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
8+
---
9+
Upstream-Status: Backport [https://github.com/libpwquality/libpwquality/commit/5192eab011ada47b0157f8d0524bf5b18bba3bd0]
10+
11+
python/Makefile.am | 2 +-
12+
1 file changed, 1 insertion(+), 1 deletion(-)
13+
14+
diff --git a/python/Makefile.am b/python/Makefile.am
15+
index 6e51744..0a3bad5 100644
16+
--- a/python/Makefile.am
17+
+++ b/python/Makefile.am
18+
@@ -14,7 +14,7 @@ all-local:
19+
CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV)
20+
21+
install-exec-local:
22+
- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix}
23+
+ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix} --install-lib=$(pythonsitedir)
24+
25+
clean-local:
26+
rm -rf py$(PYTHONREV)

meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bd2f1386df813a459a0c34fde676fc2"
88
DEPENDS = "cracklib python3-setuptools-native"
99

1010
SRC_URI = "git://github.com/libpwquality/libpwquality;branch=master;protocol=https \
11-
file://0001-Use-setuptools-instead-of-distutils.patch \
12-
"
11+
file://0001-Use-setuptools-instead-of-distutils.patch \
12+
file://0002-Makefile.am-respect-PYTHONSITEDIR.patch \
13+
"
1314
SRCREV = "5490e96a3dd6ed7371435ca5b3ccef98bdb48b5a"
1415

1516
S = "${WORKDIR}/git"

0 commit comments

Comments
 (0)