[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8209/8267] package_ipk.bbclass: handle only whitespace in PACKAGE_EXCLUDE



commit 994e3674a841ea00ef41509060a7551a4bd6c867
Author: Andre McCurdy <armccurdy gmail com>
Date:   Tue Oct 24 21:55:04 2017 -0700

    package_ipk.bbclass: handle only whitespace in PACKAGE_EXCLUDE
    
    If PACKAGE_EXCLUDE is constructed using _append then it's possible
    that the final value will contain only a space. Currently that
    results in build failures due to an invalid opkg command line.
    
    (From OE-Core rev: 809fda77324c5d4949b6490412f43d4bb95e4a94)
    
    Signed-off-by: Andre McCurdy <armccurdy gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Armin Kuster <akuster mvista com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/package_ipk.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 8439cda..6c1fdaa 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -12,7 +12,7 @@ OPKGBUILDCMD ??= "opkg-build"
 
 OPKG_ARGS += "--force_postinstall --prefer-arch-to-version"
 OPKG_ARGS += "${@['', '--no-install-recommends'][d.getVar("NO_RECOMMENDATIONS") == "1"]}"
-OPKG_ARGS += "${@['', '--add-exclude ' + ' --add-exclude '.join((d.getVar('PACKAGE_EXCLUDE') or 
"").split())][(d.getVar("PACKAGE_EXCLUDE") or "") != ""]}"
+OPKG_ARGS += "${@['', '--add-exclude ' + ' --add-exclude '.join((d.getVar('PACKAGE_EXCLUDE') or 
"").split())][(d.getVar("PACKAGE_EXCLUDE") or "").strip() != ""]}"
 
 OPKGLIBDIR = "${localstatedir}/lib"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]