diff options
Diffstat (limited to 'meta-yerba/recipes-core')
| -rw-r--r-- | meta-yerba/recipes-core/images/yerba-image.bb | 5 | ||||
| -rw-r--r-- | meta-yerba/recipes-core/libpam/libpam_%.bbappend | 16 |
2 files changed, 7 insertions, 14 deletions
diff --git a/meta-yerba/recipes-core/images/yerba-image.bb b/meta-yerba/recipes-core/images/yerba-image.bb index b5b5bbd..437803c 100644 --- a/meta-yerba/recipes-core/images/yerba-image.bb +++ b/meta-yerba/recipes-core/images/yerba-image.bb @@ -8,7 +8,6 @@ IMAGE_FEATURES += "ssh-server-dropbear" # Not using packagegroup-core-base-utils anymore because chimerautils IMAGE_INSTALL = "\ packagegroup-yerba-boot \ - ${CORE_IMAGE_EXTRA_INSTALL} \ yerba-user \ runit \ runit-serialgetty \ @@ -27,4 +26,8 @@ IMAGE_INSTALL = "\ doas \ pipewire \ wireplumber \ + iproute2 \ + iputils \ + procps \ + ncurses-terminfo-base \ " diff --git a/meta-yerba/recipes-core/libpam/libpam_%.bbappend b/meta-yerba/recipes-core/libpam/libpam_%.bbappend index 573fe1c..8f36da1 100644 --- a/meta-yerba/recipes-core/libpam/libpam_%.bbappend +++ b/meta-yerba/recipes-core/libpam/libpam_%.bbappend @@ -1,13 +1,3 @@ -RDEPENDS:${PN}-runtime = "${PN}-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-deny-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-permit-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-warn-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-unix-${libpam_suffix} \ - " -RDEPENDS:${PN}-xtests = "${PN}-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-access-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-debug-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-succeed-if-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-time-${libpam_suffix} \ - bash chimerautils" +# Replace coreutils with chimerautils +RDEPENDS:${PN}-xtests:remove = "coreutils" +RDEPENDS:${PN}-xtests:append = " chimerautils" |