As far as I can tell, this patch is a no-op and doens't change the code. As such, I think it just complicates things and can be removed. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- ...nexpected-open-failure-in-chroot-env.patch | 48 ------------------- meta/recipes-extended/shadow/shadow_4.19.4.bb | 1 - 2 files changed, 49 deletions(-) delete mode 100644 meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch diff --git a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch deleted file mode 100644 index 699269ed643..00000000000 --- a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f7b765c022e4cad9140ac44712885c66e149abdc Mon Sep 17 00:00:00 2001 -From: Chen Qi <Qi.Chen@windriver.com> -Date: Thu, 17 Jul 2014 15:53:34 +0800 -Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env - -Upstream-Status: Inappropriate [OE specific] - -commonio.c: fix unexpected open failure in chroot environment - -When using commands with '-R <newroot>' option in our pseudo environment, -we would usually get the 'Pemission Denied' error. This patch serves as -a workaround to this problem. - -Note that this patch doesn't change the logic in the code, it just expands -the codes. - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - lib/commonio.c | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/lib/commonio.c b/lib/commonio.c -index 4d83e83..9ee0e13 100644 ---- a/lib/commonio.c -+++ b/lib/commonio.c -@@ -604,10 +604,18 @@ int commonio_open (struct commonio_db *db, int mode) - db->cursor = NULL; - db->changed = false; - -- fd = open (db->filename, -- (db->readonly ? O_RDONLY : O_RDWR) -- | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW | O_CLOEXEC); -- saved_errno = errno; -+ if (db->readonly) { -+ fd = open (db->filename, -+ (true ? O_RDONLY : O_RDWR) -+ | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW | O_CLOEXEC); -+ saved_errno = errno; -+ } else { -+ fd = open (db->filename, -+ (false ? O_RDONLY : O_RDWR) -+ | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW| O_CLOEXEC); -+ saved_errno = errno; -+ } -+ - db->fp = NULL; - if (fd >= 0) { - #ifdef WITH_TCB diff --git a/meta/recipes-extended/shadow/shadow_4.19.4.bb b/meta/recipes-extended/shadow/shadow_4.19.4.bb index 3ab9ae9c287..94f155641cc 100644 --- a/meta/recipes-extended/shadow/shadow_4.19.4.bb +++ b/meta/recipes-extended/shadow/shadow_4.19.4.bb @@ -23,7 +23,6 @@ SRC_URI:append:class-target = " \ " SRC_URI:append:class-native = " \ - file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ file://disable_syslog.patch \ file://notallylog.patch \ "
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#235665): https://lists.openembedded.org/g/openembedded-core/message/235665 Mute This Topic: https://lists.openembedded.org/mt/118935407/7304865 Group Owner: openembedded-core+owner@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [Qi.Chen@eng.windriver.com] -=-=-=-=-=-=-=-=-=-=-=-