From: Rene Wagner Date: Sat, 2 Apr 2005 15:12:17 +0000 (+0000) Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded X-Git-Tag: Release-2010-05/1~14551 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4124851298cd7ec159e3d2ef05077e3520df9c55;p=openembedded.git Merge oe-devel@oe-devel.bkbits.net:openembedded into sugarcube.dyndns.org:/home2/oe/bakery/openembedded 2005/04/02 17:11:59+02:00 dyndns.org!reenoo sablevm(-classpath): upgrade to 1.11.3. fix versioned dependencies. use zip for jar compression. 2005/04/02 17:10:31+02:00 dyndns.org!reenoo package_ipk.bbclass: allow versioned RRECOMMENDS. BKrev: 424eb651FaWc3ZkLUZeBYeGhOE0BzA --- diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 2d1d2e1422..e1d87f6d9f 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -167,8 +167,8 @@ python do_package_ipk () { raise bb.build.FuncFailed("Missing field for ipk generation: %s" % value) # more fields rdepends = explode_deps(bb.data.getVar("RDEPENDS", localdata, 1) or "") + rrecommends = explode_deps(bb.data.getVar("RRECOMMENDS", localdata, 1) or "") rsuggests = (bb.data.getVar("RSUGGESTS", localdata, 1) or "").split() - rrecommends = (bb.data.getVar("RRECOMMENDS", localdata, 1) or "").split() rprovides = (bb.data.getVar("RPROVIDES", localdata, 1) or "").split() rreplaces = (bb.data.getVar("RREPLACES", localdata, 1) or "").split() rconflicts = (bb.data.getVar("RCONFLICTS", localdata, 1) or "").split() diff --git a/packages/sablevm/sablevm-classpath-1.1.9/disable-automake-checks.patch b/packages/sablevm/sablevm-classpath/disable-automake-checks.patch similarity index 100% rename from packages/sablevm/sablevm-classpath-1.1.9/disable-automake-checks.patch rename to packages/sablevm/sablevm-classpath/disable-automake-checks.patch diff --git a/packages/sablevm/sablevm-classpath_1.11.3.bb b/packages/sablevm/sablevm-classpath_1.11.3.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sablevm/sablevm_1.11.3.bb b/packages/sablevm/sablevm_1.11.3.bb new file mode 100644 index 0000000000..e69de29bb2