Re: [yocto][meta-anaconda][PATCH 1/2] anaconda: fix duplicate RDEPENDS entry and remove orphaned patches

On 4/15/26 17:06, Haitao Liu wrote:
> Remove the duplicate `python3-crypt-r` entry in RDEPENDS:${PN} in
> python3-anaconda_42.27.11.bb. The duplication appears to be a
> copy-paste error and may be masking a missing dependency.
>
> Also remove the following unreferenced patch files from the
> files/ directory, as they are not listed in SRC_URI:
>
>     - 0029-support-user-account-creation.patch
>     - 0035-set-keyboard-xlayouts-with-us-by-default.patch
>     - 0043-fix-hang-while-installed-system-reboot.patch

Good catch. Thanks.

Merged.

Kai

>
> Signed-off-by: Haitao Liu <[email protected]>
> ---
>   .../0029-support-user-account-creation.patch  | 82 -------------------
>   ...keyboard-xlayouts-with-us-by-default.patch | 50 -----------
>   ...x-hang-while-installed-system-reboot.patch | 31 -------
>   .../anaconda/python3-anaconda_42.27.11.bb     |  1 -
>   4 files changed, 164 deletions(-)
>   delete mode 100644 recipes-installer/anaconda/files/0029-support-user-account-creation.patch
>   delete mode 100644 recipes-installer/anaconda/files/0035-set-keyboard-xlayouts-with-us-by-default.patch
>   delete mode 100644 recipes-installer/anaconda/files/0043-fix-hang-while-installed-system-reboot.patch
>
> diff --git a/recipes-installer/anaconda/files/0029-support-user-account-creation.patch b/recipes-installer/anaconda/files/0029-support-user-account-creation.patch
> deleted file mode 100644
> index 937c51e..0000000
> --- a/recipes-installer/anaconda/files/0029-support-user-account-creation.patch
> +++ /dev/null
> @@ -1,82 +0,0 @@
> -From b93bf80525624fd7038b370f35ace90a3b3bdb1b Mon Sep 17 00:00:00 2001
> -From: Hongxu Jia <[email protected]>
> -Date: Tue, 24 Jul 2018 15:05:25 +0800
> -Subject: [PATCH] support user account creation
> -
> -- Do not support user accout advanced setting
> -
> -- Add main for debugging test
> -
> -Upstream-Status: Inappropriate [oe specific]
> -
> -Signed-off-by: Hongxu Jia <[email protected]>
> ----
> - pyanaconda/ui/gui/spokes/user.py |  7 +------
> - pyanaconda/users.py              | 15 +++++++++++++++
> - 2 files changed, 16 insertions(+), 6 deletions(-)
> -
> -diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py
> -index 2398810..9d7de2a 100644
> ---- a/pyanaconda/ui/gui/spokes/user.py
> -+++ b/pyanaconda/ui/gui/spokes/user.py
> -@@ -267,6 +267,7 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler):
> -         self._password_required_checkbox = self.builder.get_object("password_required_checkbox")
> -         # advanced user configration dialog button
> -         self._advanced_button = self.builder.get_object("advanced_button")
> -+        self._advanced_button.set_sensitive(False)
> -         # password checking status bar & label
> -         self._password_bar = self.builder.get_object("password_bar")
> -         self._password_label = self.builder.get_object("password_label")
> -@@ -500,12 +501,6 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler):
> -         """Called by Gtk on all username changes."""
> -         new_username = editable.get_text()
> -
> --        # Disable the advanced user dialog button when no username is set
> --        if editable.get_text():
> --            self._advanced_button.set_sensitive(True)
> --        else:
> --            self._advanced_button.set_sensitive(False)
> --
> -         # update the username in checker
> -         self.checker.username = new_username
> -
> -diff --git a/pyanaconda/users.py b/pyanaconda/users.py
> -index 3db06dd..edf3469 100644
> ---- a/pyanaconda/users.py
> -+++ b/pyanaconda/users.py
> -@@ -28,6 +28,8 @@ from pyanaconda.errors import errorHandler, PasswordCryptError, ERROR_RAISE
> - from pyanaconda.core.regexes import GROUPLIST_FANCY_PARSE, NAME_VALID, PORTABLE_FS_CHARS, GROUPLIST_SIMPLE_VALID
> - import crypt
> - from pyanaconda.core.i18n import _
> -+from pyanaconda.core import constants
> -+
> - import re
> -
> - from pyanaconda.anaconda_loggers import get_module_logger
> -@@ -200,6 +202,7 @@ class Users(object):
> -                           homedir will be interpreted relative to this. Defaults
> -                           to util.getSysroot().
> -         """
> -+        log.info("kwargs %s" % kwargs)
> -         root = kwargs.get("root", util.getSysroot())
> -
> -         if self._getgrnam(group_name, root):
> -@@ -431,3 +434,15 @@ class Users(object):
> -         if not authfile_existed:
> -             os.chown(authfile, int(uid), int(gid))
> -             util.execWithRedirect("restorecon", ["-r", sshdir])
> -+
> -+# For testing
> -+if __name__ == "__main__":
> -+    from pyanaconda import anaconda_logging
> -+    anaconda_logging.init()
> -+    anaconda_logging.logger.setupVirtio(constants.VIRTIO_PORT)
> -+
> -+    from pyanaconda.anaconda_loggers import get_anaconda_root_logger
> -+    log = get_anaconda_root_logger()
> -+
> -+    users = Users()
> -+    users.createUser("test", password="123456", shell="/bin/bash", groups=["wheel"])
> ---
> -2.7.4
> -
> diff --git a/recipes-installer/anaconda/files/0035-set-keyboard-xlayouts-with-us-by-default.patch b/recipes-installer/anaconda/files/0035-set-keyboard-xlayouts-with-us-by-default.patch
> deleted file mode 100644
> index 46b9993..0000000
> --- a/recipes-installer/anaconda/files/0035-set-keyboard-xlayouts-with-us-by-default.patch
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -From 8d69d02b27190c90dc5fd6dcf37420c221ec5660 Mon Sep 17 00:00:00 2001
> -From: Hongxu Jia <[email protected]>
> -Date: Tue, 24 Jul 2018 17:02:45 +0800
> -Subject: [PATCH 35/65] set keyboard xlayouts with 'us' by default
> -
> -Previously only graphic set keyboard xlayouts with 'us' by default,
> -and text mode did not have the setting and it caused 100% cpu when
> -loadkey invoked. The hung of loadkey also caused reboot failed.
> -
> -The setting in default ks works on both of graphic and text.
> -
> -Revert the following fix:
> ----------
> -commit ec53ff6e4a7a06d190925a482371031a2f48509d
> -Author: Martin Kolman <[email protected]>
> -Date:   Thu Jan 19 18:37:29 2017 +0100
> -
> -    Use correct default password quality value
> ----------
> -
> -Upstream-Status: Inappropriate [oe specific]
> -
> -Signed-off-by: Hongxu Jia <[email protected]>
> ----
> - data/interactive-defaults.ks | 12 +-----------
> - 1 file changed, 1 insertion(+), 11 deletions(-)
> -
> -diff --git a/data/interactive-defaults.ks b/data/interactive-defaults.ks
> -index a906c8c..a2f0555 100644
> ---- a/data/interactive-defaults.ks
> -+++ b/data/interactive-defaults.ks
> -@@ -1,14 +1,4 @@
> - # Kickstart defaults file for an interative install.
> - # This is not loaded if a kickstart file is provided on the command line.
> - firstboot --enable
> --
> --%anaconda
> --# Default password policies
> --pwpolicy root --notstrict --minlen=6 --minquality=1 --nochanges --notempty
> --pwpolicy user --notstrict --minlen=6 --minquality=1 --nochanges --emptyok
> --pwpolicy luks --notstrict --minlen=6 --minquality=1 --nochanges --notempty
> --# NOTE: This applies only to *fully* interactive installations, partial kickstart
> --#       installations use defaults specified in pyanaconda/pwpolicy.py.
> --#       Automated kickstart installs simply ignore the password policy as the policy
> --#       only applies to the UI, not for passwords specified in kickstart.
> --%end
> -+keyboard --xlayouts='us'
> ---
> -2.7.4
> -
> diff --git a/recipes-installer/anaconda/files/0043-fix-hang-while-installed-system-reboot.patch b/recipes-installer/anaconda/files/0043-fix-hang-while-installed-system-reboot.patch
> deleted file mode 100644
> index 64d2c07..0000000
> --- a/recipes-installer/anaconda/files/0043-fix-hang-while-installed-system-reboot.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From fabbb3751d64f56a01fca1981d0c0ff45fbd228c Mon Sep 17 00:00:00 2001
> -From: Hongxu Jia <[email protected]>
> -Date: Wed, 25 Jul 2018 10:29:23 +0800
> -Subject: [PATCH 43/65] fix hang while installed system reboot
> -
> -The lvm2 installed to target system, and it disabled by
> -default which caused target system reboot hang.
> -
> -Enable service lvm2-monitor.service could fix the issue.
> -
> -Upstream-Status: Inappropriate [oe specific]
> -
> -Signed-off-by: Hongxu Jia <[email protected]>
> ----
> - data/interactive-defaults.ks | 3 +++
> - 1 file changed, 3 insertions(+)
> -
> -diff --git a/data/interactive-defaults.ks b/data/interactive-defaults.ks
> -index a2f0555..0deb059 100644
> ---- a/data/interactive-defaults.ks
> -+++ b/data/interactive-defaults.ks
> -@@ -2,3 +2,6 @@
> - # This is not loaded if a kickstart file is provided on the command line.
> - firstboot --enable
> - keyboard --xlayouts='us'
> -+
> -+# Fix hang while installed system reboot
> -+services --enabled lvm2-monitor.service
> ---
> -2.7.4
> -
> diff --git a/recipes-installer/anaconda/python3-anaconda_42.27.11.bb b/recipes-installer/anaconda/python3-anaconda_42.27.11.bb
> index aa4f93a..1e6751a 100755
> --- a/recipes-installer/anaconda/python3-anaconda_42.27.11.bb
> +++ b/recipes-installer/anaconda/python3-anaconda_42.27.11.bb
> @@ -158,7 +158,6 @@ RDEPENDS:${PN} = "bash \
>                     python3-core \
>                     python3-coverage \
>                     python3-crypt-r \
> -                  python3-crypt-r \
>                     python3-dasbus \
>                     python3-dbus-next \
>                     python3-iso639 \


-- 
Kai Kang
Wind River Linux