Hi Richard Thanks for testing it out. Seems that I am either not very clever or I should not work on Sundays (or both), v1, and v2 where exactly the same. I am terribly sorry to spam you.
I know it is abusing your patience, but can you try again. I would love to try it on my setup , but I cannot replicate the bug. As we speak I am running oe-selftest --run-tests wic.Wic on poky/fedora-30... Thanks, and sorry again. On Sun, Apr 5, 2020 at 5:29 PM Richard Purdie <[email protected]> wrote: > > On Sun, 2020-04-05 at 14:01 +0200, Ricardo Ribalda Delgado wrote: > > Ups, wrong version > > > > This is the one, sorry. > > It didn't build unfortunately: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/837 > > Cheers, > > Richard > -- Ricardo Ribalda
From 9c2bd9553e81fd16a9e3aad2f20b7a86918de4be Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado <[email protected]> Date: Sun, 5 Apr 2020 13:47:12 +0200 Subject: [PATCH v2] pseudo: During DB fix, remove files that do not exist If a file does not exist, either because it has been removed outside bitbake, or because only some of the files have been moved to a different location, delete it from the pseudo-db is the user decides to fix the database. Signed-off-by: Ricardo Ribalda Delgado <[email protected]> --- ...ixup-remove-files-that-do-not-exist-.patch | 48 +++++++++++++++++++ meta/recipes-devtools/pseudo/pseudo_git.bb | 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/pseudo/files/0001-pseudo-On-a-DB-fixup-remove-files-that-do-not-exist-.patch diff --git a/meta/recipes-devtools/pseudo/files/0001-pseudo-On-a-DB-fixup-remove-files-that-do-not-exist-.patch b/meta/recipes-devtools/pseudo/files/0001-pseudo-On-a-DB-fixup-remove-files-that-do-not-exist-.patch new file mode 100644 index 0000000000..26efb0a113 --- /dev/null +++ b/meta/recipes-devtools/pseudo/files/0001-pseudo-On-a-DB-fixup-remove-files-that-do-not-exist-.patch @@ -0,0 +1,48 @@ +From b0902e36108b49e6bc88d6b251cc2f8cffcd5a13 Mon Sep 17 00:00:00 2001 +From: Ricardo Ribalda <[email protected]> +Date: Sun, 5 Apr 2020 11:40:30 +0000 +Subject: [PATCH] pseudo: On a DB fixup remove files that do not exist anymore + +If the user decides to fix a database, remove the files that do not +exist anymore. +If only DB test is selected do not change the behaviour (return error). + +Signed-off-by: Ricardo Ribalda <[email protected]> +--- + pseudo.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/pseudo.c b/pseudo.c +index 0f5850e..98e5b0c 100644 +--- a/pseudo.c ++++ b/pseudo.c +@@ -1087,9 +1087,15 @@ pseudo_db_check(int fix) { + int fixup_needed = 0; + pseudo_debug(PDBGF_DB, "Checking <%s>\n", m->path); + if (lstat(m->path, &buf)) { +- errors = EXIT_FAILURE; +- pseudo_diag("can't stat <%s>\n", m->path); +- continue; ++ if (!fix) { ++ pseudo_diag("can't stat <%s>\n", m->path); ++ errors = EXIT_FAILURE; ++ continue; ++ } else { ++ pseudo_debug(PDBGF_DB, "can't stat <%s>\n", m->path); ++ fixup_needed = 2; ++ goto do_fixup; ++ } + } + /* can't check for device type mismatches, uid/gid, or + * permissions, because those are the very things we +@@ -1125,6 +1131,7 @@ pseudo_db_check(int fix) { + S_ISDIR(m->mode)); + fixup_needed = 2; + } ++ do_fixup: + if (fixup_needed) { + /* in fixup mode, either delete (mismatches) or + * correct (dev/ino). +-- +2.21.1 + diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 89e43c5996..a3049c5e6c 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -11,6 +11,7 @@ SRC_URI = "git://git.yoctoproject.org/pseudo \ file://0001-realpath.c-Remove-trailing-slashes.patch \ file://0006-xattr-adjust-for-attr-2.4.48-release.patch \ file://seccomp.patch \ + file://0001-pseudo-On-a-DB-fixup-remove-files-that-do-not-exist-.patch \ " SRCREV = "060058bb29f70b244e685b3c704eb0641b736f73" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#137036): https://lists.openembedded.org/g/openembedded-core/message/137036 Mute This Topic: https://lists.openembedded.org/mt/72395318/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
