On Fri, Sep 8, 2017 at 2:17 PM, Mark Asselstine < [email protected]> wrote:
> On Thu, Aug 31, 2017 at 3:24 PM, Bruce Ashfield > <[email protected]> wrote: > > merged > > > Bruce, > > Can you please revert this change? This will cause a patch failure for > the criu package as there is already a change which addresses this > issue (see commit d3c6004e92bf21f7f2b425d062b6276ff53c8c18 -- criu: > force python to install in ${libdir}). > > Unfortunately Jianchuan's commit log for the commit and the patch > itself provide no information on what is being fixed. The obvious > patch conflict leads me to believe this was not actually tested with > the existing fix. > Agreed. This is now reverted and your uprev pushed. Bruce > > Thanks, > Mark > > > > > > Bruce > > > > On Wed, Aug 30, 2017 at 3:55 AM, <[email protected]> wrote: > >> > >> From: Jianchuan Wang <[email protected]> > >> > >> Signed-off-by: Jianchuan Wang <[email protected]> > >> --- > >> recipes-containers/criu/criu_git.bb | 2 ++ > >> ...t-the-installation-directory-for-python-m.patch | 29 > >> ++++++++++++++++++++++ > >> 2 files changed, 31 insertions(+) > >> create mode 100644 > >> recipes-containers/criu/files/0001-criu-Correct-the- > installation-directory-for-python-m.patch > >> > >> diff --git a/recipes-containers/criu/criu_git.bb > >> b/recipes-containers/criu/criu_git.bb > >> index 849a832..2df203e 100644 > >> --- a/recipes-containers/criu/criu_git.bb > >> +++ b/recipes-containers/criu/criu_git.bb > >> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/xemul/criu. > git;protocol=git > >> \ > >> file://0001-criu-Fix-toolchain-hardcode.patch \ > >> file://0002-criu-Skip-documentation-install.patch \ > >> file://0001-criu-Change-libraries-install-directory.patch \ > >> + > >> file://0001-criu-Correct-the-installation-directory-for-python-m.patch > \ > >> ${@bb.utils.contains('PACKAGECONFIG', 'selinux', '', > >> 'file://disable-selinux.patch', d)} \ > >> > >> file://lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch \ > >> " > >> @@ -43,6 +44,7 @@ EXTRA_OEMAKE_aarch64 += "ARCH=arm64 WERROR=0" > >> > >> EXTRA_OEMAKE_append += "SBINDIR=${sbindir} LIBDIR=${libdir} > >> INCLUDEDIR=${includedir} PIEGEN=no" > >> EXTRA_OEMAKE_append += "LOGROTATEDIR=${sysconfdir} > >> SYSTEMDUNITDIR=${systemd_unitdir}" > >> +EXTRA_OEMAKE_append += > >> "PYTHON_SITEPACKAGES_DIR=${PYTHON_SITEPACKAGES_DIR}" > >> > >> CFLAGS += "-D__USE_GNU -D_GNU_SOURCE " > >> > >> diff --git > >> a/recipes-containers/criu/files/0001-criu-Correct-the- > installation-directory-for-python-m.patch > >> b/recipes-containers/criu/files/0001-criu-Correct-the- > installation-directory-for-python-m.patch > >> new file mode 100644 > >> index 0000000..0439b3c > >> --- /dev/null > >> +++ > >> b/recipes-containers/criu/files/0001-criu-Correct-the- > installation-directory-for-python-m.patch > >> @@ -0,0 +1,29 @@ > >> +From 29865b7e9288a60aca151df323ee89c0952e8158 Mon Sep 17 00:00:00 2001 > >> +From: Jianchuan Wang <[email protected]> > >> +Date: Thu, 3 Nov 2016 01:33:57 -0400 > >> +Subject: [PATCH] criu: Correct the installation directory for python > >> module > >> + distributions > >> + > >> +Signed-off-by: Jianchuan Wang <[email protected]> > >> +--- > >> + lib/Makefile | 4 ++-- > >> + 1 file changed, 2 insertions(+), 2 deletions(-) > >> + > >> +diff --git a/lib/Makefile b/lib/Makefile > >> +index f1c0821..c3003a5 100644 > >> +--- a/lib/Makefile > >> ++++ b/lib/Makefile > >> +@@ -55,8 +55,8 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in > >> + $(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig > >> + $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e > >> 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' > >> c/criu.pc.in > c/criu.pc > >> + $(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig > >> +- $(E) " INSTALL " crit > >> +- $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) > >> --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES) > >> ++ $(E) " INSTALL " crit > >> ++ $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) > >> --prefix=$(PREFIX) --install-lib=$(PYTHON_SITEPACKAGES_DIR) --record > >> $(CRIT_SETUP_FILES) > >> + .PHONY: install > >> + > >> + uninstall: > >> +-- > >> +2.8.1 > >> + > >> -- > >> 2.7.4 > >> > >> -- > >> _______________________________________________ > >> meta-virtualization mailing list > >> [email protected] > >> https://lists.yoctoproject.org/listinfo/meta-virtualization > > > > > > > > > > -- > > "Thou shalt not follow the NULL pointer, for chaos and madness await > thee at > > its end" > > > > -- > > _______________________________________________ > > meta-virtualization mailing list > > [email protected] > > https://lists.yoctoproject.org/listinfo/meta-virtualization > > > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
-- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
