3 files changed, 25 insertions, 1 deletions
diff --git a/packages/jamvm/jamvm-initial_1.5.0.bb b/packages/jamvm/jamvm-initial_1.5.0.bb
index 3369733340..a1c415dd62 100644
--- a/packages/jamvm/jamvm-initial_1.5.0.bb
+++ b/packages/jamvm/jamvm-initial_1.5.0.bb
@@ -4,6 +4,8 @@ LICENSE = "GPL"
 
 DEPENDS = "zlib-native classpath-initial jikes-initial"
 
+PR = "r1"
+
 PROVIDES = "virtual/java-initial"
 
 S = "${WORKDIR}/jamvm-${PV}"
@@ -18,7 +20,7 @@ ARM_INSTRUCTION_SET = "arm"
 inherit native autotools
 
 EXTRA_OECONF = "\
-  --with-classpath-install-dir=${STAGING_DIR_NATIVE}\
+  --with-classpath-install-dir=${prefix} \
   --program-suffix=-initial \
   "
 
diff --git a/packages/jamvm/jamvm-native.inc b/packages/jamvm/jamvm-native.inc
new file mode 100644
index 0000000000..07eecb52b3
--- /dev/null
+++ b/packages/jamvm/jamvm-native.inc
@@ -0,0 +1,18 @@
+require jamvm.inc 
+
+DEPENDS = "zlib-native classpath-native virtual/javac-native"
+
+PROVIDES_jamvm = "virtual/java-native"
+
+RPROVIDES_jamvm = ""
+
+# This uses 32 bit arm, so force the instruction set to arm, not thumb
+ARM_INSTRUCTION_SET = "arm"
+
+inherit native
+
+S = "${WORKDIR}/jamvm-${PV}"
+
+do_install_append() {
+  ln -sf jamvm ${STAGING_BINDIR}/java
+}
diff --git a/packages/jamvm/jamvm-native_1.5.1.bb b/packages/jamvm/jamvm-native_1.5.1.bb
new file mode 100644
index 0000000000..e174e2a312
--- /dev/null
+++ b/packages/jamvm/jamvm-native_1.5.1.bb
@@ -0,0 +1,4 @@
+require jamvm-native.inc
+
+PR = "r0"
+