From 4bb222e0d71a4cb159b8a4f1a90b65b1af32ac10 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 9 Dec 2023 15:28:11 +0000 Subject: useradd: Fix useradd do_populate_sysroot dependency bug If a task is adde which has a dependency on the do_populate_sysroot task of the recipe, it will cause it to be installed into the sysroot (similar to do_addto_recipe_sysroot). This fails since the postinst script is an overlapping file: Exception: FileExistsError: [Errno 17] File exists: 'tmp/sysroots-components/all/useraddbadtask/usr/bin/postinst-useradd-useraddbadtask' -> 'tmp/work/all-poky-linux/useraddbadtask/1.0/recipe-sysroot/usr/bin/postinst-useradd-useraddbadtask' The copy written out at do_prepare_recipe_sysroot time is just for debug so rename it, meaning there are no longer overlapping files and the installation can be successful, removing the error. [YCOTO #14961] With the bug fixed, enable the test. (From OE-Core rev: 564339afb73fc52a66c1a08437587cad1c4d46e7) Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/usergrouptests.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oeqa/selftest/cases/usergrouptests.py b/meta/lib/oeqa/selftest/cases/usergrouptests.py index f6a40b21e7..a331ca9f2c 100644 --- a/meta/lib/oeqa/selftest/cases/usergrouptests.py +++ b/meta/lib/oeqa/selftest/cases/usergrouptests.py @@ -18,11 +18,9 @@ class UserGroupTests(OESelftestTestCase): self.logger.info("Packaging creategroup2") self.assertTrue(bitbake(' creategroup2 -c package')) - def _test_add_task_between_p_sysroot_and_package(self): - self.logger.info("Cleaning sstate for useraddbadtask") - self.logger.info("Building useraddbadtask") - # fails due to bug #14961 - self.assertTrue(bitbake(' useraddbadtask -C fetch')) + def test_add_task_between_p_sysroot_and_package(self): + # Test for YOCTO #14961 + self.assertTrue(bitbake('useraddbadtask -C fetch')) def test_static_useradd_from_dynamic(self): metaselftestpath = get_test_layer() -- cgit v1.2.3-54-g00ecf