diff options
Diffstat (limited to 'meta-google')
| -rw-r--r-- | meta-google/recipes-extended/pam/libpam_%.bbappend | 18 | ||||
| -rw-r--r-- | meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend | 4 |
2 files changed, 8 insertions, 14 deletions
diff --git a/meta-google/recipes-extended/pam/libpam_%.bbappend b/meta-google/recipes-extended/pam/libpam_%.bbappend index d57b0eab15..3b35e56355 100644 --- a/meta-google/recipes-extended/pam/libpam_%.bbappend +++ b/meta-google/recipes-extended/pam/libpam_%.bbappend @@ -1,20 +1,14 @@ -# Remove cracklib from PAM, to avoid breaking PAM and further dependencies -# This allows cracklib to be neatly severed from the system. +# Remove pwquality from PAM, to avoid breaking PAM and further dependencies +# This allows pwquality to be neatly severed from the system. -EXTRA_OECONF:append:gbmc = " --disable-cracklib" - -DEPENDS:remove:gbmc = "cracklib" - -RDEPENDS:${PN}-runtime:remove:gbmc = "pam-plugin-cracklib-suffix" - -RDEPENDS:${PN}-xtests:remove:gbmc = "${MLPREFIX}pam-plugin-cracklib-${libpam_suffix}" +RDEPENDS:${PN}-runtime:remove:gbmc = "libpwquality" do_install:append:gbmc() { - # Remove reference to cracklib library from PAM config file - sed -i '/pam_cracklib.so/d' ${D}${sysconfdir}/pam.d/common-password + # Remove reference to pwquality library from PAM config file + sed -i '/pam_pwquality.so/d' ${D}${sysconfdir}/pam.d/common-password # Remove the first occurrence of "use_authtok" in the first line starting - # with "password". This makes sure that if pam_cracklib.so was the first + # with "password". This makes sure that if pam_pwquality.so was the first # entry, we didn't invalidate the next entry in the stack. If the first # entry has the "use_authtok" set, this "forces the module to not prompt # the user for a new password but use the one provided by the previously diff --git a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend index 68ae2708c6..862701152b 100644 --- a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -29,5 +29,5 @@ OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " dummy-gbmc-update" OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " virtual/bmc-update" # Jettison the cracklib package to save space. -PACKAGE_INSTALL:remove:gbmc = "cracklib pam-plugin-cracklib" -PACKAGE_EXCLUDE:gbmc = "cracklib pam-plugin-cracklib" +PACKAGE_INSTALL:remove:gbmc = "cracklib libpwquality" +PACKAGE_EXCLUDE:gbmc = "cracklib libpwquality" |