From 041f009a85ed20cd2b6b123bc5ab80109697dd87 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Thu, 18 Jul 2019 23:03:34 +0100 Subject: [PATCH] python_install_dir From 830929096665eab2b910d676ccab1df90908cb02 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Mon, 15 Jul 2019 21:12:05 +0200 Subject: [PATCH] Install the python extension to the root package dir Commit 8ad3638ea9023c3948976dfadebd1554380a31c9 effectively added libseccomp/ to the install path of the python extension. This changed the import module name from "seccomp" to "libseccomp.seccomp", breaking existing users. Revert the install path like it was before 2.4.0 Signed-off-by: Felix Geyer Gbp-Pq: Name python_install_dir.patch --- src/python/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/python/Makefile.am b/src/python/Makefile.am index 3a34b0a..f71ec24 100644 --- a/src/python/Makefile.am +++ b/src/python/Makefile.am @@ -40,12 +40,12 @@ build: ../libseccomp.la libseccomp.pxd seccomp.pyx setup.py ${PY_BUILD} && touch build install-exec-local: build - ${PY_INSTALL} --install-lib=${DESTDIR}/${pkgpythondir} \ - --record=${DESTDIR}/${pkgpythondir}/install_files.txt + ${PY_INSTALL} --install-lib=${DESTDIR}/${pyexecdir} \ + --record=${DESTDIR}/${pyexecdir}/install_files.txt uninstall-local: - cat ${DESTDIR}/${pkgpythondir}/install_files.txt | xargs ${RM} -f - ${RM} -f ${DESTDIR}/${pkgpythondir}/install_files.txt + cat ${DESTDIR}/${pyexecdir}/install_files.txt | xargs ${RM} -f + ${RM} -f ${DESTDIR}/${pyexecdir}/install_files.txt clean-local: [ ${srcdir} == ${builddir} ] || ${RM} -f ${builddir}/seccomp.pyx -- 2.30.2