diff options
| author |   Derek Young <dyoung@nslu2-linux.org> | 2005-03-01 18:55:39 +0000 |
|---|---|---|
| committer | Derek Young <dyoung@nslu2-linux.org> | 2005-03-01 18:55:39 +0000 |
| commit | bae07f485b55b4038b65e117016ea6ff7498eca9 (patch) | |
| tree | b416292c9b3703857d5796b3fe9258353a39916f /classes/package_ipk.bbclass | |
| parent | 67b3dee160db2d18ca9f9dfd43376182b35774d9 (diff) | |
| download | openembedded-bae07f485b55b4038b65e117016ea6ff7498eca9.tar.gz | |
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into builder.(none):/home/dereky/bbroot/openembedded
2005/02/28 04:40:13-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/28 12:37:13+00:00 nexus.co.uk!pb
straighten out new x11 snapshot
2005/02/28 12:18:18+00:00 reciva.com!pb
add new version of xproto
2005/02/28 12:16:45+00:00 reciva.com!pb
Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded
into mebius.reciva.com:/home/pb/oe/oe
2005/03/01 18:55:34+00:00 (none)!pb
collapse multiple spaces in SRC_URI to a single space.
replace some inefficient string concatenation with %-substitution
2005/03/01 18:54:47+00:00 (none)!pb
suppress circular dependency when package contains both binaries and libraries
move pkgconfig shlibs data into new location; consider old files first so that new ones override them
2005/03/01 18:53:46+00:00 (none)!pb
add missing patch to gstreamer SRC_URI
BKrev: 4224baabcSg6J2wzDfVE30KMAuYbQA
Diffstat (limited to 'classes/package_ipk.bbclass')
| -rw-r--r-- | classes/package_ipk.bbclass | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 513e4639b5..a029d088fb 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -63,6 +63,7 @@ python package_ipk_install () { python do_package_ipk () { import copy # to back up env data import sys + import re workdir = bb.data.getVar('WORKDIR', d, 1) if not workdir: @@ -145,7 +146,6 @@ python do_package_ipk () { fields.append(["Maintainer: %s\n", ['MAINTAINER']]) fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']]) fields.append(["OE: %s\n", ['P']]) - fields.append(["Source: %s\n", ['SRC_URI']]) def pullData(l, d): l2 = [] @@ -173,17 +173,21 @@ python do_package_ipk () { rreplaces = (bb.data.getVar("RREPLACES", localdata, 1) or "").split() rconflicts = (bb.data.getVar("RCONFLICTS", localdata, 1) or "").split() if rdepends: - ctrlfile.write("Depends: " + ", ".join(rdepends) + "\n") + ctrlfile.write("Depends: %s\n" % ", ".join(rdepends)) if rsuggests: - ctrlfile.write("Suggests: " + ", ".join(rsuggests) + "\n") + ctrlfile.write("Suggests: %s\n" % ", ".join(rsuggests)) if rrecommends: - ctrlfile.write("Recommends: " + ", ".join(rrecommends) + "\n") + ctrlfile.write("Recommends: %s\n" % ", ".join(rrecommends)) if rprovides: - ctrlfile.write("Provides: " + ", ".join(rprovides) + "\n") + ctrlfile.write("Provides: %s\n" % ", ".join(rprovides)) if rreplaces: - ctrlfile.write("Replaces: " + ", ".join(rreplaces) + "\n") + ctrlfile.write("Replaces: %s\n" % ", ".join(rreplaces)) if rconflicts: - ctrlfile.write("Conflicts: " + ", ".join(rconflicts) + "\n") + ctrlfile.write("Conflicts: %s\n" % ", ".join(rconflicts)) + src_uri = bb.data.getVar("SRC_URI", localdata, 1) + if src_uri: + src_uri = re.sub("\s+", " ", src_uri) + ctrlfile.write("Source: %s\n" % src_uri) ctrlfile.close() for script in ["preinst", "postinst", "prerm", "postrm"]: |