diff options
-rw-r--r-- | recipes-core/openjdk/openjdk-7-common.inc | 31 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-7-release-85b01.inc | 12 | ||||
-rw-r--r-- | recipes-images/images/java-test-image.bb | 4 |
3 files changed, 1 insertions, 46 deletions
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index 6ff2a79..db47af4 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc | |||
@@ -12,8 +12,6 @@ SRC_URI = " \ | |||
12 | ${JAXWS_URI} \ | 12 | ${JAXWS_URI} \ |
13 | ${JDK_URI} \ | 13 | ${JDK_URI} \ |
14 | ${LANGTOOLS_URI} \ | 14 | ${LANGTOOLS_URI} \ |
15 | ${CACAO_URI} \ | ||
16 | ${JAMVM_URI} \ | ||
17 | ${OEPATCHES} \ | 15 | ${OEPATCHES} \ |
18 | ${ICEDTEAPATCHES} \ | 16 | ${ICEDTEAPATCHES} \ |
19 | file://jvm.cfg \ | 17 | file://jvm.cfg \ |
@@ -60,11 +58,6 @@ export CACAO_CONFIGURE_ARGS = " \ | |||
60 | 58 | ||
61 | JAVA_HOME[unexport] = "1" | 59 | JAVA_HOME[unexport] = "1" |
62 | 60 | ||
63 | # disable shark until it is fully working again | ||
64 | # WITH_ADDITIONAL_VMS ?= "--with-additional-vms=shark,cacao,jamvm" | ||
65 | |||
66 | WITH_ADDITIONAL_VMS ?= "--with-additional-vms=cacao,jamvm" | ||
67 | |||
68 | # OpenJDK supports parallel compilation but uses a plain number for this. | 61 | # OpenJDK supports parallel compilation but uses a plain number for this. |
69 | # In OE we have PARALLEL_MAKE which is the actual option passed to make, | 62 | # In OE we have PARALLEL_MAKE which is the actual option passed to make, |
70 | # e.g. "-j 4". | 63 | # e.g. "-j 4". |
@@ -110,9 +103,6 @@ EXTRA_OECONF = " \ | |||
110 | --with-jaxws-src-zip=${WORKDIR}/${JAXWS_FILE} \ | 103 | --with-jaxws-src-zip=${WORKDIR}/${JAXWS_FILE} \ |
111 | --with-jdk-src-zip=${WORKDIR}/${JDK_FILE} \ | 104 | --with-jdk-src-zip=${WORKDIR}/${JDK_FILE} \ |
112 | --with-langtools-src-zip=${WORKDIR}/${LANGTOOLS_FILE} \ | 105 | --with-langtools-src-zip=${WORKDIR}/${LANGTOOLS_FILE} \ |
113 | ${WITH_ADDITIONAL_VMS} \ | ||
114 | --with-cacao-src-zip=${WORKDIR}/${CACAO_FILE} \ | ||
115 | --with-jamvm-src-zip=${WORKDIR}/${JAMVM_FILE} \ | ||
116 | \ | 106 | \ |
117 | --with-parallel-jobs=${JDK_JOBS} \ | 107 | --with-parallel-jobs=${JDK_JOBS} \ |
118 | \ | 108 | \ |
@@ -223,10 +213,7 @@ PACKAGES = " \ | |||
223 | ${JDKPN}-doc \ | 213 | ${JDKPN}-doc \ |
224 | ${JDKPN}-jdk \ | 214 | ${JDKPN}-jdk \ |
225 | ${JDKPN}-java \ | 215 | ${JDKPN}-java \ |
226 | ${JDKPN}-vm-shark \ | ||
227 | ${JDKPN}-vm-zero \ | 216 | ${JDKPN}-vm-zero \ |
228 | ${JDKPN}-vm-cacao \ | ||
229 | ${JDKPN}-vm-jamvm \ | ||
230 | ${JDKPN}-common \ | 217 | ${JDKPN}-common \ |
231 | " | 218 | " |
232 | 219 | ||
@@ -240,9 +227,6 @@ FILES_${JDKPN}-dbg = "\ | |||
240 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/jli/.debug \ | 227 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/jli/.debug \ |
241 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug \ | 228 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug \ |
242 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug \ | 229 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug \ |
243 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/.debug \ | ||
244 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/cacao/.debug \ | ||
245 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/jamvm/.debug \ | ||
246 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug \ | 230 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug \ |
247 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug \ | 231 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug \ |
248 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug \ | 232 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug \ |
@@ -268,12 +252,6 @@ FILES_${JDKPN}-java = "${JDK_HOME}/jre/bin/java" | |||
268 | 252 | ||
269 | FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/" | 253 | FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/" |
270 | 254 | ||
271 | FILES_${JDKPN}-vm-shark = "${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/" | ||
272 | |||
273 | FILES_${JDKPN}-vm-cacao = "${JDK_HOME}/jre/lib/${JDK_ARCH}/cacao/" | ||
274 | |||
275 | FILES_${JDKPN}-vm-jamvm = "${JDK_HOME}/jre/lib/${JDK_ARCH}/jamvm/" | ||
276 | |||
277 | FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ | 255 | FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ |
278 | ${JDK_HOME}/jre/THIRD_PARTY_README \ | 256 | ${JDK_HOME}/jre/THIRD_PARTY_README \ |
279 | ${JDK_HOME}/jre/LICENSE \ | 257 | ${JDK_HOME}/jre/LICENSE \ |
@@ -299,10 +277,7 @@ FILES_${PN}_append = " \ | |||
299 | 277 | ||
300 | RDEPENDS_${JDKPN}-common = "librhino-java" | 278 | RDEPENDS_${JDKPN}-common = "librhino-java" |
301 | 279 | ||
302 | RPROVIDES_${JDKPN}-vm-shark = "java2-vm" | ||
303 | RPROVIDES_${JDKPN}-vm-zero = "java2-vm" | 280 | RPROVIDES_${JDKPN}-vm-zero = "java2-vm" |
304 | RPROVIDES_${JDKPN}-vm-cacao = "java2-vm" | ||
305 | RPROVIDES_${JDKPN}-vm-jamvm = "java2-vm" | ||
306 | 281 | ||
307 | # Even though a vm is a hard dependency it is set as RRECOMMENDS so a single vm can get uninstalled: | 282 | # Even though a vm is a hard dependency it is set as RRECOMMENDS so a single vm can get uninstalled: |
308 | # root@beaglebone:~/java# opkg remove openjdk-7-vm-shark | 283 | # root@beaglebone:~/java# opkg remove openjdk-7-vm-shark |
@@ -315,15 +290,9 @@ RRECOMMENDS_${JDKPN}-java = "java2-vm" | |||
315 | 290 | ||
316 | # For some reason shark and cacao do not automatically depends on -common. | 291 | # For some reason shark and cacao do not automatically depends on -common. |
317 | # So we add that manually. | 292 | # So we add that manually. |
318 | RDEPENDS_${JDKPN}-vm-shark = "${JDKPN}-common" | ||
319 | RDEPENDS_${JDKPN}-vm-cacao = "${JDKPN}-common" | ||
320 | RDEPENDS_${JDKPN}-vm-jamvm = "${JDKPN}-common" | ||
321 | 293 | ||
322 | # There is a symlink to a .so but this one is valid. | 294 | # There is a symlink to a .so but this one is valid. |
323 | INSANE_SKIP_${JDKPN}-vm-shark = "dev-so" | ||
324 | INSANE_SKIP_${JDKPN}-vm-zero = "dev-so" | 295 | INSANE_SKIP_${JDKPN}-vm-zero = "dev-so" |
325 | INSANE_SKIP_${JDKPN}-vm-cacao = "dev-so" | ||
326 | INSANE_SKIP_${JDKPN}-vm-jamvm = "dev-so" | ||
327 | INSANE_SKIP_${JDKPN}-common = "dev-so" | 296 | INSANE_SKIP_${JDKPN}-common = "dev-so" |
328 | 297 | ||
329 | FILES_${JDKPN}-jdk = " \ | 298 | FILES_${JDKPN}-jdk = " \ |
diff --git a/recipes-core/openjdk/openjdk-7-release-85b01.inc b/recipes-core/openjdk/openjdk-7-release-85b01.inc index 6a8b482..cbb28c7 100644 --- a/recipes-core/openjdk/openjdk-7-release-85b01.inc +++ b/recipes-core/openjdk/openjdk-7-release-85b01.inc | |||
@@ -38,18 +38,6 @@ JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false" | |||
38 | LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.bz2" | 38 | LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.bz2" |
39 | LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false" | 39 | LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false" |
40 | 40 | ||
41 | CACAO_VERSION = "c182f119eaad" | ||
42 | CACAO_FILE = "cacao-${CACAO_VERSION}.tar.gz" | ||
43 | CACAO_URI = "http://icedtea.classpath.org/download/drops/cacao/${CACAO_FILE};name=cacao;unpack=false" | ||
44 | SRC_URI[cacao.md5sum] = "df428cf98e5baf28c1d186bc9b92fb01" | ||
45 | SRC_URI[cacao.sha256sum] = "eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1" | ||
46 | |||
47 | JAMVM_VERSION = "ec18fb9e49e62dce16c5094ef1527eed619463aa" | ||
48 | JAMVM_FILE = "jamvm-${JAMVM_VERSION}.tar.gz" | ||
49 | JAMVM_URI = "http://icedtea.wildebeest.org/download/drops/jamvm/${JAMVM_FILE};name=jamvm;unpack=false" | ||
50 | SRC_URI[jamvm.md5sum] = "d50ae193d01a9251e10679c7a2cc6ff1" | ||
51 | SRC_URI[jamvm.sha256sum] = "31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc" | ||
52 | |||
53 | # Split up patches to allow overriding them separately | 41 | # Split up patches to allow overriding them separately |
54 | OEPATCHES = "\ | 42 | OEPATCHES = "\ |
55 | file://build-hacks.patch \ | 43 | file://build-hacks.patch \ |
diff --git a/recipes-images/images/java-test-image.bb b/recipes-images/images/java-test-image.bb index b8a729a..005e7a1 100644 --- a/recipes-images/images/java-test-image.bb +++ b/recipes-images/images/java-test-image.bb | |||
@@ -7,12 +7,10 @@ IMAGE_LINGUAS = " " | |||
7 | 7 | ||
8 | IMAGE_INSTALL = "busybox modutils-initscripts initscripts opkg udev sysvinit netbase base-files base-passwd \ | 8 | IMAGE_INSTALL = "busybox modutils-initscripts initscripts opkg udev sysvinit netbase base-files base-passwd \ |
9 | ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL} \ | 9 | ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL} \ |
10 | openjdk-7-jre openjdk-7-vm-zero openjdk-7-vm-jamvm openjdk-7-vm-cacao \ | 10 | openjdk-7-jre openjdk-7-vm-zero \ |
11 | strace dropbear binutils \ | 11 | strace dropbear binutils \ |
12 | classpath \ | 12 | classpath \ |
13 | classpath-common \ | 13 | classpath-common \ |
14 | classpath-examples \ | 14 | classpath-examples \ |
15 | classpath-tools \ | 15 | classpath-tools \ |
16 | jamvm \ | ||
17 | cacao \ | ||
18 | " | 16 | " |