From: Andre McCurdy <armccurdy@gmail.com>
Date: Wed, 25 Oct 2017 04:55:04 +0000 (-0700)
Subject: package_ipk.bbclass: handle only whitespace in PACKAGE_EXCLUDE
X-Git-Tag: uninative-1.8~1119
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f832f57ba9f6babb946fbde580004acfd85667e1;p=openembedded-core.git

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.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 8439cda6dd..6c1fdaa390 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"