summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Wagner <rw@handhelds.org>2005-04-02 15:12:17 +0000
committerRene Wagner <rw@handhelds.org>2005-04-02 15:12:17 +0000
commit4124851298cd7ec159e3d2ef05077e3520df9c55 (patch)
treebabb17a99f63f0aa56649c0a61b2b2a4ff1276a4
parent206507d70fd14b69d9ae24a570b8f8643fd1eac5 (diff)
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
-rw-r--r--classes/package_ipk.bbclass2
-rw-r--r--packages/sablevm/sablevm-classpath/disable-automake-checks.patch (renamed from packages/sablevm/sablevm-classpath-1.1.9/disable-automake-checks.patch)0
-rw-r--r--packages/sablevm/sablevm-classpath_1.11.3.bb0
-rw-r--r--packages/sablevm/sablevm_1.11.3.bb0
4 files changed, 1 insertions, 1 deletions
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
index e69de29bb2..e69de29bb2 100644
--- a/packages/sablevm/sablevm-classpath-1.1.9/disable-automake-checks.patch
+++ b/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
--- /dev/null
+++ b/packages/sablevm/sablevm-classpath_1.11.3.bb
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
--- /dev/null
+++ b/packages/sablevm/sablevm_1.11.3.bb