summaryrefslogtreecommitdiffstats
path: root/meta/classes
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:13 +0100
commit09a51b9976f1ea3f0442778a615442b40bcdce95 (patch)
tree5a7942f3a1d3c6fdaa6a37f93ee53c7d55f03c39 /meta/classes
parentfc37a44a011d63fab394e0cbca2a0494b4d5721b (diff)
downloadpoky-09a51b9976f1ea3f0442778a615442b40bcdce95.tar.gz
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 (From OE-Core rev: 16cedc3bce6fc37543e9ef053cd7c589e523ca1c) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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 () {
207 ctrlfile.write("Replaces: %s\n" % bb.utils.join_deps(rreplaces)) 207 ctrlfile.write("Replaces: %s\n" % bb.utils.join_deps(rreplaces))
208 if rconflicts: 208 if rconflicts:
209 ctrlfile.write("Conflicts: %s\n" % bb.utils.join_deps(rconflicts)) 209 ctrlfile.write("Conflicts: %s\n" % bb.utils.join_deps(rconflicts))
210 src_uri = localdata.getVar("SRC_URI", True) or "None" 210 src_uri = localdata.getVar("SRC_URI", True).strip() or "None"
211 if src_uri: 211 if src_uri:
212 src_uri = re.sub("\s+", " ", src_uri) 212 src_uri = re.sub("\s+", " ", src_uri)
213 ctrlfile.write("Source: %s\n" % " ".join(src_uri.split())) 213 ctrlfile.write("Source: %s\n" % " ".join(src_uri.split()))