summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-10-06 09:05:08 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-06 16:03:03 +0100
commit16cedc3bce6fc37543e9ef053cd7c589e523ca1c (patch)
tree9e4e2e1f516308239c3c7b56735f1f1e9e285671
parenta2709547644ae417fbd5435e1372068c7cd5db4c (diff)
downloadopenembedded-core-contrib-16cedc3bce6fc37543e9ef053cd7c589e523ca1c.tar.gz
openembedded-core-contrib-16cedc3bce6fc37543e9ef053cd7c589e523ca1c.tar.bz2
openembedded-core-contrib-16cedc3bce6fc37543e9ef053cd7c589e523ca1c.zip
package_ipk.bbclass: Fix SRC_URI whitespace handling
The SRC_URI may contain whitespace, but be otherwise empty. This can happen in the case: MYSRC = "" MYSRC_arm = "file://myarm.patch" SRC_URI += "${MYSRC}" Unless we strip blank spaces, to determine if it is empty, we can end up generating a "Source: " line which in invalid. This leads to the error: invalid Source: field is speified in the generated CONTROL file Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_ipk.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 9586e06b2e..44fd3eb29c 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -207,7 +207,7 @@ python do_package_ipk () {
ctrlfile.write("Replaces: %s\n" % bb.utils.join_deps(rreplaces))
if rconflicts:
ctrlfile.write("Conflicts: %s\n" % bb.utils.join_deps(rconflicts))
- src_uri = localdata.getVar("SRC_URI", True) or "None"
+ src_uri = localdata.getVar("SRC_URI", True).strip() or "None"
if src_uri:
src_uri = re.sub("\s+", " ", src_uri)
ctrlfile.write("Source: %s\n" % " ".join(src_uri.split()))