typo in the shortlog, but I've fixed it here. Merged to master.
Bruce In message: [meta-virtualization] [PATCH] crir: fix patch fuzz and remove unused patch on 30/05/2022 Changqing Li wrote: > From: Changqing Li <[email protected]> > > Signed-off-by: Changqing Li <[email protected]> > --- > recipes-containers/criu/criu_git.bb | 6 +-- > ...001-criu-Skip-documentation-install.patch} | 14 +++--- > ...-Change-libraries-install-directory.patch} | 16 ++++--- > ...write-install-lib-to-allow-multiarc.patch} | 12 ++--- > ...-building-on-newest-glibc-and-kernel.patch | 45 ------------------- > 5 files changed, 27 insertions(+), 66 deletions(-) > rename > recipes-containers/criu/files/{0002-criu-Skip-documentation-install.patch => > 0001-criu-Skip-documentation-install.patch} (66%) > rename > recipes-containers/criu/files/{0001-criu-Change-libraries-install-directory.patch > => 0002-criu-Change-libraries-install-directory.patch} (83%) > rename > recipes-containers/criu/files/{lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch > => 0003-lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch} (79%) > delete mode 100644 > recipes-containers/criu/files/fix-building-on-newest-glibc-and-kernel.patch > > diff --git a/recipes-containers/criu/criu_git.bb > b/recipes-containers/criu/criu_git.bb > index 4b616cc..353f3e0 100644 > --- a/recipes-containers/criu/criu_git.bb > +++ b/recipes-containers/criu/criu_git.bb > @@ -17,9 +17,9 @@ SRCREV = "4f8f295e57e68740699479d12c1ad251e6dd859f" > PV = "3.17+git${SRCPV}" > > SRC_URI = > "git://github.com/checkpoint-restore/criu.git;branch=master;protocol=https \ > - file://0002-criu-Skip-documentation-install.patch \ > - file://0001-criu-Change-libraries-install-directory.patch \ > - file://lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch > \ > + file://0001-criu-Skip-documentation-install.patch \ > + file://0002-criu-Change-libraries-install-directory.patch \ > + > file://0003-lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch \ > " > > COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux" > diff --git > a/recipes-containers/criu/files/0002-criu-Skip-documentation-install.patch > b/recipes-containers/criu/files/0001-criu-Skip-documentation-install.patch > similarity index 66% > rename from > recipes-containers/criu/files/0002-criu-Skip-documentation-install.patch > rename to > recipes-containers/criu/files/0001-criu-Skip-documentation-install.patch > index af45db7..43e2704 100644 > --- a/recipes-containers/criu/files/0002-criu-Skip-documentation-install.patch > +++ b/recipes-containers/criu/files/0001-criu-Skip-documentation-install.patch > @@ -1,22 +1,21 @@ > -From 45d74ae8a314c481398ba91a3697ffbd074cd98b Mon Sep 17 00:00:00 2001 > +From 485e957a4c3289d105dd6203af31c0e4e1438ac6 Mon Sep 17 00:00:00 2001 > From: Jianchuan Wang <[email protected]> > Date: Tue, 16 Aug 2016 09:42:24 +0800 > -Subject: [PATCH] criu: Skip documentation install > +Subject: [PATCH 1/3] criu: Skip documentation install > > asciidoc is needed to generate CRIU documentation, so skip it in install. > > Signed-off-by: Jianchuan Wang <[email protected]> > - > --- > Makefile.install | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile.install b/Makefile.install > -index 3987bcc..1def3cf 100644 > +index aafb95469..1b02b70af 100644 > --- a/Makefile.install > +++ b/Makefile.install > -@@ -29,7 +29,7 @@ export PREFIX BINDIR SBINDIR MANDIR RUNDIR > - export LIBDIR INCLUDEDIR LIBEXECDIR > +@@ -30,7 +30,7 @@ export PREFIX BINDIR SBINDIR MANDIR RUNDIR > + export LIBDIR INCLUDEDIR LIBEXECDIR PLUGINDIR > > install-man: > - $(Q) $(MAKE) -C Documentation install > @@ -24,3 +23,6 @@ index 3987bcc..1def3cf 100644 > .PHONY: install-man > > install-lib: lib > +-- > +2.25.1 > + > diff --git > a/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch > > b/recipes-containers/criu/files/0002-criu-Change-libraries-install-directory.patch > similarity index 83% > rename from > recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch > rename to > recipes-containers/criu/files/0002-criu-Change-libraries-install-directory.patch > index afb1332..453be13 100644 > --- > a/recipes-containers/criu/files/0001-criu-Change-libraries-install-directory.patch > +++ > b/recipes-containers/criu/files/0002-criu-Change-libraries-install-directory.patch > @@ -1,25 +1,25 @@ > -From f64fbca70e6049dad3c404d871f2383d97725d2d Mon Sep 17 00:00:00 2001 > +From dcbf7f8ad1b07ff718eac2ce79ed522ac1cee189 Mon Sep 17 00:00:00 2001 > From: Mark Asselstine <[email protected]> > Date: Fri, 8 Sep 2017 15:11:31 -0400 > -Subject: [PATCH] criu: Change libraries install directory > +Subject: [PATCH 2/3] criu: Change libraries install directory > > Install the libraries into /usr/lib(or /usr/lib64) > > Signed-off-by: Jianchuan Wang <[email protected]> > Signed-off-by: Mark Asselstine <[email protected]> > - > --- > Makefile.install | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/Makefile.install b/Makefile.install > -index 1def3cf..d020eef 100644 > +index 1b02b70af..2839ef5fe 100644 > --- a/Makefile.install > +++ b/Makefile.install > @@ -9,19 +9,6 @@ LIBEXECDIR ?= $(PREFIX)/libexec > RUNDIR ?= /run > + PLUGINDIR ?= /var/lib/criu > > - # > +-# > -# For recent Debian/Ubuntu with multiarch support. > -DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH > 2>/dev/null) > -ifneq "$(DEB_HOST_MULTIARCH)" "" > @@ -32,7 +32,9 @@ index 1def3cf..d020eef 100644 > - endif > -endif > - > --# > + # > # LIBDIR falls back to the standard path. > LIBDIR ?= $(PREFIX)/lib > - > +-- > +2.25.1 > + > diff --git > a/recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch > > b/recipes-containers/criu/files/0003-lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch > similarity index 79% > rename from > recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch > rename to > recipes-containers/criu/files/0003-lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch > index 70ccb28..210fbe7 100644 > --- > a/recipes-containers/criu/files/lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch > +++ > b/recipes-containers/criu/files/0003-lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch > @@ -1,23 +1,22 @@ > -From 6caf90592d61c8c45b32cb7ff76709f9326030e2 Mon Sep 17 00:00:00 2001 > +From 0a04c5bc80319485e17e9a86e799fe2c5bfa3d38 Mon Sep 17 00:00:00 2001 > From: Mark Asselstine <[email protected]> > Date: Fri, 8 Sep 2017 15:40:49 -0400 > -Subject: [PATCH] lib/Makefile: overwrite install-lib, to allow multiarch > +Subject: [PATCH 3/3] lib/Makefile: overwrite install-lib, to allow multiarch > > I am not sure why Yocto installs python modules in arch specific > /usr/libXX directories but it does. Allow the recipe to pass this via > INSTALL_LIB. > > Signed-off-by: Mark Asselstine <[email protected]> > - > --- > lib/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/Makefile b/lib/Makefile > -index b1bb057..06f5c5d 100644 > +index 575a7bad3..f503d430b 100644 > --- a/lib/Makefile > +++ b/lib/Makefile > -@@ -53,7 +53,7 @@ install: lib-c lib-py crit/crit lib/c/criu.pc.in > +@@ -59,7 +59,7 @@ install: lib-c lib-a lib-py crit/crit lib/c/criu.pc.in > $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' > -e 's,@includedir@,$(dir $(INCLUDEDIR)/criu/),' lib/c/criu.pc.in > > lib/c/criu.pc > $(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig > $(E) " INSTALL " crit > @@ -26,3 +25,6 @@ index b1bb057..06f5c5d 100644 > .PHONY: install > > uninstall: > +-- > +2.25.1 > + > diff --git > a/recipes-containers/criu/files/fix-building-on-newest-glibc-and-kernel.patch > b/recipes-containers/criu/files/fix-building-on-newest-glibc-and-kernel.patch > deleted file mode 100644 > index 9361adc..0000000 > --- > a/recipes-containers/criu/files/fix-building-on-newest-glibc-and-kernel.patch > +++ /dev/null > @@ -1,45 +0,0 @@ > -From b59947007362b53e9f41f1e5a33071dedf1c59ac Mon Sep 17 00:00:00 2001 > -From: Adrian Reber <[email protected]> > -Date: Thu, 28 Sep 2017 09:13:33 +0000 > -Subject: [PATCH] fix building on newest glibc and kernel > - > -On Fedora rawhide with kernel-headers-4.14.0-0.rc2.git0.1.fc28.x86_64 > -glibc-devel-2.26.90-15.fc28.x86_64 criu does not build any more: > - > -In file included from /usr/include/linux/aio_abi.h:31:0, > - from criu/cr-check.c:24: > -/usr/include/sys/mount.h:35:3: error: expected identifier before numeric > constant > - MS_RDONLY = 1, /* Mount read-only. */ > - ^ > -make[2]: *** > [/builddir/build/BUILD/criu-3.5/scripts/nmk/scripts/build.mk:111: > criu/cr-check.o] Error 1 > -make[1]: *** [criu/Makefile:73: criu/built-in.o] Error 2 > -make: *** [Makefile:233: criu] Error 2 > - > -This simple re-ordering of includes fixes it for me. > - > -Signed-off-by: Adrian Reber <[email protected]> > -Signed-off-by: Andrei Vagin <[email protected]> > - > -Upstream-Status: Backport > -[https://github.com/checkpoint-restore/criu/commit/f41e386d4d40e3e26b0cfdc85a812b7edb337f1d#diff-cc847b1cc975358c6582595be92d48db] > - > -Signed-off-by: Yi Zhao <[email protected]> > - > ---- > - criu/cr-check.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/criu/cr-check.c b/criu/cr-check.c > -index 1dd887a..93df2ab 100644 > ---- a/criu/cr-check.c > -+++ b/criu/cr-check.c > -@@ -21,8 +21,8 @@ > - #include <netinet/in.h> > - #include <sys/prctl.h> > - #include <sched.h> > --#include <linux/aio_abi.h> > - #include <sys/mount.h> > -+#include <linux/aio_abi.h> > - > - #include "../soccr/soccr.h" > - > -- > 2.25.1 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7339): https://lists.yoctoproject.org/g/meta-virtualization/message/7339 Mute This Topic: https://lists.yoctoproject.org/mt/91426054/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
