merged Bruce
On Fri, Mar 22, 2019 at 2:09 AM Dengke Du <[email protected]> wrote: > > Remove the following patch, because the 3.11 version already contain it. > 0001-kdat-Don-t-open-run-criu.kdat-if-doesn-t-exists.patch > > Signed-off-by: Dengke Du <[email protected]> > --- > recipes-containers/criu/criu_git.bb | 5 ++- > ...on-t-open-run-criu.kdat-if-doesn-t-exists.patch | 42 > ---------------------- > 2 files changed, 2 insertions(+), 45 deletions(-) > delete mode 100644 > recipes-containers/criu/files/0001-kdat-Don-t-open-run-criu.kdat-if-doesn-t-exists.patch > > diff --git a/recipes-containers/criu/criu_git.bb > b/recipes-containers/criu/criu_git.bb > index 123f6a3..c6981c9 100644 > --- a/recipes-containers/criu/criu_git.bb > +++ b/recipes-containers/criu/criu_git.bb > @@ -13,15 +13,14 @@ EXCLUDE_FROM_WORLD = "1" > > LIC_FILES_CHKSUM = "file://COPYING;md5=412de458544c1cb6a2b512cd399286e2" > > -SRCREV = "c49eab368a68682475c4e693258246e04232e6d2" > -PV = "3.10+git${SRCPV}" > +SRCREV = "c74b83cd49c00589c0c0468ba5fe685b67fdbd0a" > +PV = "3.11+git${SRCPV}" > > 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://lib-Makefile-overwrite-install-lib-to-allow-multiarc.patch > \ > - file://0001-kdat-Don-t-open-run-criu.kdat-if-doesn-t-exists.patch > \ > " > > COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux" > diff --git > a/recipes-containers/criu/files/0001-kdat-Don-t-open-run-criu.kdat-if-doesn-t-exists.patch > > b/recipes-containers/criu/files/0001-kdat-Don-t-open-run-criu.kdat-if-doesn-t-exists.patch > deleted file mode 100644 > index 805f799..0000000 > --- > a/recipes-containers/criu/files/0001-kdat-Don-t-open-run-criu.kdat-if-doesn-t-exists.patch > +++ /dev/null > @@ -1,42 +0,0 @@ > -From b9760919eb3f805dd3d2af5692b49cba9c468595 Mon Sep 17 00:00:00 2001 > -From: "Hongzhi.Song" <[email protected]> > -Date: Mon, 26 Nov 2018 02:39:59 -0500 > -Subject: [PATCH] kdat: Don't open /run/criu.kdat if doesn't exists > - > -When CRIU is called for a first time and the /run/criu.kdat file does > -not exists, the following warning is shown: > - Warn (criu/kerndat.c:847): Can't load /run/criu.kdat > - > -This patch is replacing this warning with a more appropriate debug > -message. > - File /run/criu.kdat does not exist > - > -Signed-off-by: Radostin Stoyanov <[email protected]> > -Signed-off-by: Andrei Vagin <[email protected]> > - > -Upstream-Status: Backport > [https://github.com/checkpoint-restore/criu/commit/868de91a099c00f099d8a41557d660d173f72521] > - > -Signed-off-by: Hongzhi.Song <[email protected]> > ---- > - criu/kerndat.c | 5 ++++- > - 1 file changed, 4 insertions(+), 1 deletion(-) > - > -diff --git a/criu/kerndat.c b/criu/kerndat.c > -index 8cb5690..9fb475c 100644 > ---- a/criu/kerndat.c > -+++ b/criu/kerndat.c > -@@ -789,7 +789,10 @@ static int kerndat_try_load_cache(void) > - > - fd = open(KERNDAT_CACHE_FILE, O_RDONLY); > - if (fd < 0) { > -- pr_warn("Can't load %s\n", KERNDAT_CACHE_FILE); > -+ if(ENOENT == errno) > -+ pr_debug("File %s does not exist\n", > KERNDAT_CACHE_FILE); > -+ else > -+ pr_warn("Can't load %s\n", KERNDAT_CACHE_FILE); > - return 1; > - } > - > --- > -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 - "Use the force Harry" - Gandalf, Star Trek II -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
