[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3936/8267] opkg-utils: Do not use --ignore-fail-on-non-empty with rmdir

[Emmanuele Bassi <ebassi src gnome org>]

commit aaaa25022b8694949a95cc15d9cdbcb80e11291c
Author: Khem Raj <raj khem gmail com>
Date:   Wed Dec 21 09:34:12 2016 -0800

    opkg-utils: Do not use --ignore-fail-on-non-empty with rmdir
    
    --ignore-fail-on-non-empty is coreutils specific, and you
    are not always going to have coreutils on target systems
    especially small ones. They will use the busybox applet which
    does not support --ignore-fail-on-non-empty, use pipe and true
    to ignore the errorcode from rmdir instead
    
    Fixes upgrade errors on target e.g.
    
    rmdir: unrecognized option '--ignore-fail-on-non-empty'
    BusyBox v1.24.1 (2016-12-20 10:41:39 PST) multi-call binary.
    
    Usage: rmdir [OPTIONS] DIRECTORY...
    To remove package debris, try `opkg remove update-alternatives-opkg`.
    To re-attempt the install, try `opkg install update-alternatives-opkg`.
    Collected errors:
     * pkg_run_script: package "update-alternatives-opkg" postrm script returned status 1.
     * postrm_upgrade_old_pkg: postrm script for package "update-alternatives-opkg" failed
    
    (From OE-Core rev: 5ec8934a495e9b9a782889bc3a84936c8a381165)
    
    Signed-off-by: Khem Raj <raj khem gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb 
b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 7b01bfc..4f90bcd 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -46,7 +46,7 @@ RCONFLICTS_update-alternatives-opkg = "update-alternatives-cworth"
 
 pkg_postrm_update-alternatives-opkg() {
        rm -rf $OPKG_OFFLINE_ROOT${nonarch_libdir}/opkg/alternatives
-       rmdir --ignore-fail-on-non-empty $OPKG_OFFLINE_ROOT${nonarch_libdir}/opkg
+       rmdir $OPKG_OFFLINE_ROOT${nonarch_libdir}/opkg || true
 }
 
 BBCLASSEXTEND = "native nativesdk"