From 6c1f0a51c700839be1ecca52ab06ec890c13762f Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 22 Sep 2020 18:05:09 -0500
Subject: Workaround for busybox patch -N failures, files missing from backup
 list

---
 recipes-support/libpwquality/libpwquality_1.3.0.bb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'recipes-support')

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
 }
 
-- 
cgit v1.2.3