Skip to contentSkip to conversation

pseudo: Update to 1.7.4

PATCH In review Richard Purdie 4 participants 7 messages Apr 21 – Apr 22

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 pseudo: Update to 1.7.4

Update to pull in a full openat2 wrapper which works on Fedora 44.

This update includes the commits:
* Makefile.in: Bump version to 1.9.4
* test: Add renameat2 test cases
* test: Add openat2 test cases
* makewrappers/openat2: Add preserve_path option
* openat2: Implement openat2 wrapper
* ports/linux/guts/renameat2.c: Add comment why this isn't implemented
* Add b4 configuration
* pseudo_setupenvp: Handle malloc failure safely
* pseudo_setupenvp: Allocate space for new env vars if needed

---
 meta/recipes-devtools/pseudo/pseudo_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/pseudo/pseudo_git.bb +2 -2
index 4d316299033..68b311cb916 100644
@@ -12,8 +12,8 @@ SRC_URI:append:class-nativesdk = " \
     file://older-glibc-symbols.patch"
 SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa"
 
-SRCREV = "56e1f8df4761da60e41812fc32b1de797d1765e9"
-PV = "1.9.3+git"
+SRCREV = "6c0d8c6b81ca7c2ef2b5a9a996605e1a51814442"
+PV = "1.9.4"
 
 # largefile and 64bit time_t support adds these macros via compiler flags globally
 # remove them for pseudo since pseudo intercepts some of the functions which will be
#1 lore raw

PATCH 2/3 shadow: Disable tallylog execution

We don't want to be calling tallylog from our native tools, disable it.

---
 .../shadow/files/notallylog.patch             | 19 +++++++++++++++++++
 meta/recipes-extended/shadow/shadow_4.19.4.bb |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 meta/recipes-extended/shadow/files/notallylog.patch
meta/recipes-extended/shadow/files/notallylog.patch new file +19 -0
new file mode 100644
index 00000000000..94773ace2ba
@@ -0,0 +1,19 @@
+We don't want to call /sbin/pam_tally2 in the native tools case so
+disable this function.
+
+Upstream-Status: Inappropriate [OE cross configuration specific]
+
+Index: shadow-4.19.4/src/useradd.c
+===================================================================
+--- shadow-4.19.4.orig/src/useradd.c
++++ shadow-4.19.4/src/useradd.c
+@@ -2046,6 +2046,9 @@ static void tallylog_reset (const char *
+ 	int failed;
+ 	int status;
+ 
++	/* Don't call /sbin/pam_tally2 in native builds */
++	return;
++
+ 	if (access(pam_tally2, X_OK) == -1)
+ 		return;
+ 
meta/recipes-extended/shadow/shadow_4.19.4.bb +1 -0
index 9fe6a27e411..3ab9ae9c287 100644
@@ -25,6 +25,7 @@ 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 \
            "
 SRC_URI[sha256sum] = "ba7e9aed1c5420203ac549583d6e6f485a819ac7505af9c7cd8c13b2013210b8"
 UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$"
#2 lore raw

Patchtest results for [PATCH 2/3] shadow: Disable tallylog execution

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/2-3-shadow-Disable-tallylog-execution.patch

FAIL: test Signed-off-by presence: A patch file has been added without a Signed-off-by tag: 'notallylog.patch' (test_patch.TestPatch.test_signed_off_by_presence)

PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Upstream-Status presence (test_patch.TestPatch.test_upstream_status_presence_format)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!

#3 lore raw

PATCH 3/3 shadow: Drop pointless patch

In reply to Richard Purdie

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.

---
 ...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
meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch deleted +0 -48
deleted file mode 100644
index 699269ed643..00000000000
@@ -1,48 +0,0 @@
-From f7b765c022e4cad9140ac44712885c66e149abdc Mon Sep 17 00:00:00 2001
-From: Chen Qi <[email protected]>
-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 <[email protected]>
----
- 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
meta/recipes-extended/shadow/shadow_4.19.4.bb +0 -1
index 3ab9ae9c287..94f155641cc 100644
@@ -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 \
            "
#4 lore raw

Re: [OE-core] [PATCH 3/3] shadow: Drop pointless patch

Hi Richard,

I'm the author of the original patch, so I just double checked it.
This might be counter-intuitive, but this patch does solve some problem in pseudo environment.

Without this patch, running a simple 'bitbake ptest-runner' fails. The error message is like:
/NOTE: ptest-runner: Performing useradd with [--root /path/to/build/tmp/work/x86-64-v3-poky-linux/ptest-runner/2.5.1/recipe-sysroot --system --no-create -home --home / --user-group ptest]
useradd: cannot open /etc/passwd
ERROR: ptest-runner: useradd command did not succeed./

Anyway, I see in another patch, you switched from '--root' to '--prefix', so I guess this patch is not needed after the switch.

Regards,
Qi

Quoted 85 lines · Richard Purdie via lists.openembedded.org

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.

---
  ...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

meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch deleted +0 -48
deleted file mode 100644
index 699269ed643..00000000000
@@ -1,48 +0,0 @@
-From f7b765c022e4cad9140ac44712885c66e149abdc Mon Sep 17 00:00:00 2001
-From: Chen Qi<[email protected]>
-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<[email protected]>
----
- 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
meta/recipes-extended/shadow/shadow_4.19.4.bb +0 -2
index 3ab9ae9c287..94f155641cc 100644
@@ -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:[email protected] Unsubscribe:https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#5 lore raw

Re: [OE-core] [PATCH 3/3] shadow: Drop pointless patch

Hi Qi,

Quoted 15 lines · ChenQi

 I'm the author of the original patch, so I just double checked it.

This might be counter-intuitive, but this patch does solve some problem in pseudo environment.

Without this patch, running a simple 'bitbake ptest-runner' fails. The error message is like:

NOTE: ptest-runner: Performing useradd with [--root /path/to/build/tmp/work/x86-64-v3-poky-linux/ptest- runner/2.5.1/recipe-sysroot --system --no-create -home --home / -- user-group ptest]
 useradd: cannot open /etc/passwd
 ERROR: ptest-runner: useradd command did not succeed.

Quoted 2 lines

Anyway, I see in another patch, you switched from '--root' to '-- prefix', so I guess this patch is not needed after the switch.

I did suspect it was working around some issue but the patch does not explain what and in theory it should be no change. I therefore sent a "remove it " patch to work out if it was still needed after 12 years and if so, what the real issue was.

It turns out that shadow-native on systems using fortify source would break when building something like ptest-runner. Initially I tested on a system without fortify source where you don't see the issue.

Looking at the useradd binary from shadow, it was optimising open() to call __open_2(), and it turns out we're missing a wrapper for that in pseudo.

I've therefore added it to pseudo and that should remove the need for the patch. A local test on a system I reproduced it on did show it being fixed.

We still needed to do this even with the --prefix change, I'll probably hold off that until the next development cycle though.

Cheers,

Richard

#6 lore raw
In reply to Richard Purdie
Quoted 13 lines · Richard Purdie via lists.openembedded.org

Update to pull in a full openat2 wrapper which works on Fedora 44.

This update includes the commits:
* Makefile.in: Bump version to 1.9.4
* test: Add renameat2 test cases
* test: Add openat2 test cases
* makewrappers/openat2: Add preserve_path option
* openat2: Implement openat2 wrapper
* ports/linux/guts/renameat2.c: Add comment why this isn't implemented
* Add b4 configuration
* pseudo_setupenvp: Handle malloc failure safely
* pseudo_setupenvp: Allocate space for new env vars if needed

Quoted 2 lines

---

There is a typo in the commit title : 1.7.4 -> 1.9.4

Quoted 18 lines
 meta/recipes-devtools/pseudo/pseudo_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/pseudo/pseudo_git.bb +2 -2
index 4d316299033..68b311cb916 100644
@@ -12,8 +12,8 @@ SRC_URI:append:class-nativesdk = " \
     file://older-glibc-symbols.patch"
 SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa"
 
-SRCREV = "56e1f8df4761da60e41812fc32b1de797d1765e9"
-PV = "1.9.3+git"
+SRCREV = "6c0d8c6b81ca7c2ef2b5a9a996605e1a51814442"
+PV = "1.9.4"
 
 # largefile and 64bit time_t support adds these macros via compiler flags globally
 # remove them for pseudo since pseudo intercepts some of the functions which will be
Signature · 2 lines
Yoann Congal
Smile ECS