Signed-off-by: Ross Burton <ross.bur...@intel.com> --- recipes-security/AppArmor/apparmor_2.12.bb | 4 ++-- recipes-security/AppArmor/files/py-libdir.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/recipes-security/AppArmor/apparmor_2.12.bb b/recipes-security/AppArmor/apparmor_2.12.bb index 1e3a223..073b62d 100644 --- a/recipes-security/AppArmor/apparmor_2.12.bb +++ b/recipes-security/AppArmor/apparmor_2.12.bb @@ -80,9 +80,9 @@ do_install () { install -d ${D}/${INIT_D_DIR} install -d ${D}/lib/apparmor - oe_runmake -C ${B}/libraries/libapparmor DESTDIR="${D}" install + oe_runmake -C ${B}/libraries/libapparmor DESTDIR="${D}" PYLIBDIR=${PYTHON_SITEPACKAGES_DIR} install oe_runmake -C ${B}/binutils DESTDIR="${D}" install - oe_runmake -C ${B}/utils DESTDIR="${D}" PYLIBDIR=${libdir} install + oe_runmake -C ${B}/utils DESTDIR="${D}" PYLIBDIR=${PYTHON_SITEPACKAGES_DIR} install oe_runmake -C ${B}/parser DESTDIR="${D}" install oe_runmake -C ${B}/profiles DESTDIR="${D}" install diff --git a/recipes-security/AppArmor/files/py-libdir.patch b/recipes-security/AppArmor/files/py-libdir.patch index fc617fb..2b88e54 100644 --- a/recipes-security/AppArmor/files/py-libdir.patch +++ b/recipes-security/AppArmor/files/py-libdir.patch @@ -4,6 +4,19 @@ python3-native's idea of $libdir may not match the target's $libdir. Upstream-Status: Pending Signed-off-by: Ross Burton <ross.bur...@intel.com> +diff --git a/libraries/libapparmor/swig/python/Makefile.am b/libraries/libapparmor/swig/python/Makefile.am +index 421acba9..d2b842a6 100644 +--- a/libraries/libapparmor/swig/python/Makefile.am ++++ b/libraries/libapparmor/swig/python/Makefile.am +@@ -14,7 +14,7 @@ all-local: libapparmor_wrap.c setup.py + $(PYTHON) setup.py build + + install-exec-local: +- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)" ++ $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)" --install-lib="$(PYLIBDIR)" + + clean-local: + if test -x "$(PYTHON)"; then $(PYTHON) setup.py clean; fi diff --git a/utils/Makefile b/utils/Makefile index 68f8c376..025f9da5 100644 --- a/utils/Makefile -- 2.11.0 -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto