diff options
| author | John Klug <john.klug@multitech.com> | 2020-09-22 18:05:09 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2020-11-12 09:30:36 -0600 |
| commit | 883121429553a87fd47129a04454c0e875004809 (patch) | |
| tree | 7f4103f8286ee48381e327278ed5ec4f7b1811c9 /recipes-support | |
| parent | 11a92afb6d3bba51a66155d4bc0bbf1fad9b33e5 (diff) | |
| download | meta-mlinux-883121429553a87fd47129a04454c0e875004809.tar.gz meta-mlinux-883121429553a87fd47129a04454c0e875004809.tar.bz2 meta-mlinux-883121429553a87fd47129a04454c0e875004809.zip | |
Workaround for busybox patch -N failures, files missing from backup list
Diffstat (limited to 'recipes-support')
| -rw-r--r-- | recipes-support/libpwquality/libpwquality_1.3.0.bb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/recipes-support/libpwquality/libpwquality_1.3.0.bb b/recipes-support/libpwquality/libpwquality_1.3.0.bb index e5179c9..d7b04d4 100644 --- a/recipes-support/libpwquality/libpwquality_1.3.0.bb +++ b/recipes-support/libpwquality/libpwquality_1.3.0.bb @@ -83,12 +83,14 @@ pkg_postinst_${PN}() { LOG="logger -s -p user.info -t opkg\ libpwquality" cd / fi - logsave=$(patch -p1 -N < "$PAM_CONFIGURE" 2>&1 || true) - if [[ -n ${logsave} ]] ; then - ${LOG} "In directory $(pwd)" - ${LOG} "patch -p1 -N < $PAM_CONFIGURE" - ${LOG} "${PN} patch: ${logsave}" - + # -N busybox option for patch is broken + if patch --dry-run -p1 < "$PAM_CONFIGURE" ; then + logsave=$(patch -p1 < "$PAM_CONFIGURE" 2>&1 || true) + if [[ -n ${logsave} ]] ; then + ${LOG} "In directory $(pwd)" + ${LOG} "patch -p1 < $PAM_CONFIGURE" + ${LOG} "${PN} patch: ${logsave}" + fi fi } |