From 2538fdffd3f5728b788ede09e2b0b576ad362ce2 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 4 Apr 2012 05:20:56 +0000 Subject: classpath-initial: fix installation of tools.zip file This fixes an unpredicability of sysroot tools.zip version as classpath-initial and classpath-native were installing the tools.zip at same path. We also bump PR of affected recipes to force them to rebuild. Signed-off-by: Otavio Salvador --- recipes-core/classpath/classpath-initial_0.93.bb | 3 +++ recipes-core/classpath/classpath-native.inc | 2 ++ recipes-core/classpath/classpath.inc | 2 ++ recipes-core/icedtea/icedtea6-native.inc | 2 +- recipes-core/jamvm/jamvm-initial_1.4.5.bb | 2 ++ recipes-core/jamvm/jamvm_git.bb | 2 ++ 6 files changed, 12 insertions(+), 1 deletion(-) diff --git a/recipes-core/classpath/classpath-initial_0.93.bb b/recipes-core/classpath/classpath-initial_0.93.bb index 77831c1..13ede10 100644 --- a/recipes-core/classpath/classpath-initial_0.93.bb +++ b/recipes-core/classpath/classpath-initial_0.93.bb @@ -32,6 +32,9 @@ EXTRA_OECONF = " \ --with-vm=java \ " +# Ensure tools.zip is not installed at same path as classpath-native +EXTRA_OEMAKE += "pkgdatadir=${STAGING_DATADIR_NATIVE}/classpath-initial" + SRC_URI[md5sum] = "ffa9e9cac31c5acbf0ea9eff9efa923d" SRC_URI[sha256sum] = "df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945" diff --git a/recipes-core/classpath/classpath-native.inc b/recipes-core/classpath/classpath-native.inc index aefbf6d..16c1498 100644 --- a/recipes-core/classpath/classpath-native.inc +++ b/recipes-core/classpath/classpath-native.inc @@ -4,6 +4,8 @@ LICENSE = "Classpath" DEPENDS = "ecj-initial fastjar-native zip-native gettext-native" +PR = "r1" + inherit autotools native SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" diff --git a/recipes-core/classpath/classpath.inc b/recipes-core/classpath/classpath.inc index 38037f3..55a3f6c 100644 --- a/recipes-core/classpath/classpath.inc +++ b/recipes-core/classpath/classpath.inc @@ -21,6 +21,8 @@ RPROVIDES_${PN} = "${PBN}" RPROVIDES_${PN}-common = "${PBN}-common" RPROVIDES_${PN}-gtk = "${PBN}-awt" +PR = "r1" + SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" S = "${WORKDIR}/${PBN}-${PV}" diff --git a/recipes-core/icedtea/icedtea6-native.inc b/recipes-core/icedtea/icedtea6-native.inc index 7287462..700bfb0 100644 --- a/recipes-core/icedtea/icedtea6-native.inc +++ b/recipes-core/icedtea/icedtea6-native.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Harness to build the source code from OpenJDK using Free Software build tools" HOMEPAGE = "http://icedtea.classpath.org" LICENSE = "GPL with Classpath Exception" -INC_PR = "r4" +INC_PR = "r5" DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ xalan-j-native xerces-j-native rhino-native \ diff --git a/recipes-core/jamvm/jamvm-initial_1.4.5.bb b/recipes-core/jamvm/jamvm-initial_1.4.5.bb index 5fa9080..ea5a9d2 100644 --- a/recipes-core/jamvm/jamvm-initial_1.4.5.bb +++ b/recipes-core/jamvm/jamvm-initial_1.4.5.bb @@ -7,6 +7,8 @@ DEPENDS = "zlib-native classpath-initial jikes-initial libffi-native" PROVIDES = "virtual/java-initial" +PR = "r1" + S = "${WORKDIR}/jamvm-${PV}" SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb index e6b6132..2a4213b 100644 --- a/recipes-core/jamvm/jamvm_git.bb +++ b/recipes-core/jamvm/jamvm_git.bb @@ -6,6 +6,8 @@ require jamvm.inc SRCREV = "4617da717ecb05654ea5bb9572338061106a414d" PV = "1.5.5+1.6.0-devel+git${SRCPV}" +PR = "r1" + SRC_URI = "git://git.berlios.de/jamvm;protocol=git \ file://jamvm-jni_h-noinst.patch \ file://libffi.patch \ -- cgit v1.2.3-54-g00ecf