diff options
Diffstat (limited to 'recipes-core/openjdk')
-rw-r--r-- | recipes-core/openjdk/openjdk-7-common.inc | 76 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb | 2 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-common.inc | 16 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-cross.inc | 14 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-native.inc | 18 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-release-aarch32.inc | 30 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-release-aarch64.inc | 16 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-release-common.inc | 54 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-release.inc | 4 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8_272.bb | 24 | ||||
-rw-r--r-- | recipes-core/openjdk/openjre-8_272.bb | 16 |
11 files changed, 135 insertions, 135 deletions
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index c87266d..61b62b9 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc | |||
@@ -8,13 +8,13 @@ ICEDTEA_VERSION = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False), | |||
8 | 8 | ||
9 | S = "${WORKDIR}/${ICEDTEA}" | 9 | S = "${WORKDIR}/${ICEDTEA}" |
10 | 10 | ||
11 | DEPENDS_append_libc-uclibc = " virtual/libiconv " | 11 | DEPENDS:append_libc-uclibc = " virtual/libiconv " |
12 | 12 | ||
13 | # The OpenJDK build with interpreter optimizations for ARM depends on a binary | 13 | # The OpenJDK build with interpreter optimizations for ARM depends on a binary |
14 | # that generates constants for an assembler source file. There is no other | 14 | # that generates constants for an assembler source file. There is no other |
15 | # way than to generate this on a pseudo machine. Cross-compiling would not help | 15 | # way than to generate this on a pseudo machine. Cross-compiling would not help |
16 | # because structure sizes and/or alignment may differ. | 16 | # because structure sizes and/or alignment may differ. |
17 | DEPENDS_append = " qemu-native " | 17 | DEPENDS:append = " qemu-native " |
18 | 18 | ||
19 | B = "${S}/build" | 19 | B = "${S}/build" |
20 | 20 | ||
@@ -138,14 +138,14 @@ EXTRA_OECONF += " \ | |||
138 | --disable-system-sctp \ | 138 | --disable-system-sctp \ |
139 | " | 139 | " |
140 | 140 | ||
141 | do_configure_prepend() { | 141 | do_configure:prepend() { |
142 | # Automatically copy everything that starts with "icedtea" (or "cacao") and ends with | 142 | # Automatically copy everything that starts with "icedtea" (or "cacao") and ends with |
143 | # ".patch" into the patches directory. | 143 | # ".patch" into the patches directory. |
144 | find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \; | 144 | find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \; |
145 | find ${WORKDIR} -maxdepth 1 -name "cacao*.patch" -exec cp {} ${S}/patches \; | 145 | find ${WORKDIR} -maxdepth 1 -name "cacao*.patch" -exec cp {} ${S}/patches \; |
146 | } | 146 | } |
147 | 147 | ||
148 | do_configure_append() { | 148 | do_configure:append() { |
149 | oe_runmake patch | 149 | oe_runmake patch |
150 | } | 150 | } |
151 | 151 | ||
@@ -168,7 +168,7 @@ EXTRA_OEMAKE += ' \ | |||
168 | 168 | ||
169 | OE_LAUNCHER_LDFLAGS = "-Wl,-rpath-link,${STAGING_LIBDIR}/llvm${WANT_LLVM_RELEASE} -Wl,-rpath,${libdir}/llvm${WANT_LLVM_RELEASE}" | 169 | OE_LAUNCHER_LDFLAGS = "-Wl,-rpath-link,${STAGING_LIBDIR}/llvm${WANT_LLVM_RELEASE} -Wl,-rpath,${libdir}/llvm${WANT_LLVM_RELEASE}" |
170 | 170 | ||
171 | OE_LAUNCHER_LDFLAGS_arm = "" | 171 | OE_LAUNCHER_LDFLAGS:arm = "" |
172 | 172 | ||
173 | EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"' | 173 | EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"' |
174 | 174 | ||
@@ -229,7 +229,7 @@ PACKAGES = " \ | |||
229 | ${JDKPN}-common \ | 229 | ${JDKPN}-common \ |
230 | " | 230 | " |
231 | 231 | ||
232 | FILES_${JDKPN}-dbg = "\ | 232 | FILES:${JDKPN}-dbg = "\ |
233 | ${JDK_HOME}/bin/.debug \ | 233 | ${JDK_HOME}/bin/.debug \ |
234 | ${JDK_HOME}/lib/.debug \ | 234 | ${JDK_HOME}/lib/.debug \ |
235 | ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug \ | 235 | ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug \ |
@@ -244,9 +244,9 @@ FILES_${JDKPN}-dbg = "\ | |||
244 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug \ | 244 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug \ |
245 | " | 245 | " |
246 | 246 | ||
247 | FILES_${JDKPN}-demo = "${JDK_HOME}/demo ${JDK_HOME}/sample" | 247 | FILES:${JDKPN}-demo = "${JDK_HOME}/demo ${JDK_HOME}/sample" |
248 | RDEPENDS_${JDKPN}-demo = "${JDKPN}-jre" | 248 | RDEPENDS:${JDKPN}-demo = "${JDKPN}-jre" |
249 | FILES_${JDKPN}-demo-dbg = "\ | 249 | FILES:${JDKPN}-demo-dbg = "\ |
250 | ${JDK_HOME}/demo/jvmti/gctest/lib/.debug \ | 250 | ${JDK_HOME}/demo/jvmti/gctest/lib/.debug \ |
251 | ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug \ | 251 | ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug \ |
252 | ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug \ | 252 | ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug \ |
@@ -258,13 +258,13 @@ FILES_${JDKPN}-demo-dbg = "\ | |||
258 | ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug \ | 258 | ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug \ |
259 | " | 259 | " |
260 | 260 | ||
261 | FILES_${JDKPN}-source = "${JDK_HOME}/src.zip" | 261 | FILES:${JDKPN}-source = "${JDK_HOME}/src.zip" |
262 | 262 | ||
263 | FILES_${JDKPN}-java = "${JDK_HOME}/jre/bin/java" | 263 | FILES:${JDKPN}-java = "${JDK_HOME}/jre/bin/java" |
264 | 264 | ||
265 | FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/" | 265 | FILES:${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/" |
266 | 266 | ||
267 | FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ | 267 | FILES:${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ |
268 | ${JDK_HOME}/jre/THIRD_PARTY_README \ | 268 | ${JDK_HOME}/jre/THIRD_PARTY_README \ |
269 | ${JDK_HOME}/jre/LICENSE \ | 269 | ${JDK_HOME}/jre/LICENSE \ |
270 | ${JDK_HOME}/ASSEMBLY_EXCEPTION \ | 270 | ${JDK_HOME}/ASSEMBLY_EXCEPTION \ |
@@ -274,7 +274,7 @@ FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ | |||
274 | ${JDK_HOME}/jre/lib \ | 274 | ${JDK_HOME}/jre/lib \ |
275 | " | 275 | " |
276 | 276 | ||
277 | FILES_${PN}_append = " \ | 277 | FILES:${PN}:append = " \ |
278 | ${JDK_HOME}/jre/bin/keytool \ | 278 | ${JDK_HOME}/jre/bin/keytool \ |
279 | ${JDK_HOME}/jre/bin/orbd \ | 279 | ${JDK_HOME}/jre/bin/orbd \ |
280 | ${JDK_HOME}/jre/bin/pack200 \ | 280 | ${JDK_HOME}/jre/bin/pack200 \ |
@@ -287,9 +287,9 @@ FILES_${PN}_append = " \ | |||
287 | ${JDK_HOME}/jre/bin/javaws \ | 287 | ${JDK_HOME}/jre/bin/javaws \ |
288 | " | 288 | " |
289 | 289 | ||
290 | RDEPENDS_${JDKPN}-common = "librhino-java" | 290 | RDEPENDS:${JDKPN}-common = "librhino-java" |
291 | 291 | ||
292 | RPROVIDES_${JDKPN}-vm-zero = "java2-vm" | 292 | RPROVIDES:${JDKPN}-vm-zero = "java2-vm" |
293 | 293 | ||
294 | # Even though a vm is a hard dependency it is set as RRECOMMENDS so a single vm can get uninstalled: | 294 | # Even though a vm is a hard dependency it is set as RRECOMMENDS so a single vm can get uninstalled: |
295 | # root@beaglebone:~/java# opkg remove openjdk-7-vm-shark | 295 | # root@beaglebone:~/java# opkg remove openjdk-7-vm-shark |
@@ -298,39 +298,39 @@ RPROVIDES_${JDKPN}-vm-zero = "java2-vm" | |||
298 | # * print_dependents_warning: Package openjdk-7-vm-shark is depended upon by packages: | 298 | # * print_dependents_warning: Package openjdk-7-vm-shark is depended upon by packages: |
299 | # * print_dependents_warning: openjdk-7-java | 299 | # * print_dependents_warning: openjdk-7-java |
300 | # * print_dependents_warning: These might cease to work if package openjdk-7-vm-shark is removed. | 300 | # * print_dependents_warning: These might cease to work if package openjdk-7-vm-shark is removed. |
301 | RRECOMMENDS_${JDKPN}-java = "java2-vm" | 301 | RRECOMMENDS:${JDKPN}-java = "java2-vm" |
302 | 302 | ||
303 | # For some reason shark and cacao do not automatically depends on -common. | 303 | # For some reason shark and cacao do not automatically depends on -common. |
304 | # So we add that manually. | 304 | # So we add that manually. |
305 | 305 | ||
306 | # There is a symlink to a .so but this one is valid. | 306 | # There is a symlink to a .so but this one is valid. |
307 | INSANE_SKIP_${JDKPN}-vm-zero = "dev-so" | 307 | INSANE_SKIP:${JDKPN}-vm-zero = "dev-so" |
308 | INSANE_SKIP_${JDKPN}-common = "dev-so" | 308 | INSANE_SKIP:${JDKPN}-common = "dev-so" |
309 | 309 | ||
310 | # libfreetype.so.6 is copied from STAGING_LIBDIR | 310 | # libfreetype.so.6 is copied from STAGING_LIBDIR |
311 | # which is already stripped. | 311 | # which is already stripped. |
312 | INSANE_SKIP_${JDKPN}-jre = "already-stripped" | 312 | INSANE_SKIP:${JDKPN}-jre = "already-stripped" |
313 | 313 | ||
314 | FILES_${JDKPN}-jdk = " \ | 314 | FILES:${JDKPN}-jdk = " \ |
315 | ${JDK_HOME}/bin \ | 315 | ${JDK_HOME}/bin \ |
316 | ${JDK_HOME}/lib \ | 316 | ${JDK_HOME}/lib \ |
317 | ${JDK_HOME}/include \ | 317 | ${JDK_HOME}/include \ |
318 | ${JDK_HOME}${libdir}/jvm \ | 318 | ${JDK_HOME}${libdir}/jvm \ |
319 | " | 319 | " |
320 | RDEPENDS_${JDKPN}-jre = "${JDKPN}-java ${JDKPN}-common" | 320 | RDEPENDS:${JDKPN}-jre = "${JDKPN}-java ${JDKPN}-common" |
321 | RDEPENDS_${JDKPN}-java = "${JDKPN}-common" | 321 | RDEPENDS:${JDKPN}-java = "${JDKPN}-common" |
322 | RPROVIDES_${JDKPN}-jre = "java2-runtime" | 322 | RPROVIDES:${JDKPN}-jre = "java2-runtime" |
323 | 323 | ||
324 | RDEPENDS_${JDKPN}-jdk = "${JDKPN}-jre" | 324 | RDEPENDS:${JDKPN}-jdk = "${JDKPN}-jre" |
325 | 325 | ||
326 | FILES_${JDKPN}-doc = "${JDK_HOME}/man" | 326 | FILES:${JDKPN}-doc = "${JDK_HOME}/man" |
327 | 327 | ||
328 | # Name of the directory containing the compiled output | 328 | # Name of the directory containing the compiled output |
329 | BUILD_DIR = "openjdk.build" | 329 | BUILD_DIR = "openjdk.build" |
330 | BUILD_DIR_ECJ = "openjdk.build-ecj" | 330 | BUILD_DIR_ECJ = "openjdk.build-ecj" |
331 | 331 | ||
332 | # Force arm mode for now | 332 | # Force arm mode for now |
333 | ARM_INSTRUCTION_SET_armv4t = "ARM" | 333 | ARM_INSTRUCTION_SET:armv4t = "ARM" |
334 | 334 | ||
335 | ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced" | 335 | ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced" |
336 | 336 | ||
@@ -361,7 +361,7 @@ LANGTOOLS_URI = "${ICEDTEA_DROP_URL}/${LANGTOOLS_FILE};name=langtools;unpack=fal | |||
361 | # handles all postinst action for openjdk | 361 | # handles all postinst action for openjdk |
362 | # some of the former results in a build error because "ERR" is in the first line. | 362 | # some of the former results in a build error because "ERR" is in the first line. |
363 | 363 | ||
364 | pkg_postinst_ontarget_${JDKPN}-vm-shark () { | 364 | pkg_postinst_ontarget:${JDKPN}-vm-shark () { |
365 | true | 365 | true |
366 | if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then | 366 | if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then |
367 | sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 367 | sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
@@ -370,7 +370,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-shark () { | |||
370 | fi | 370 | fi |
371 | } | 371 | } |
372 | 372 | ||
373 | pkg_prerm_${JDKPN}-vm-shark () { | 373 | pkg_prerm:${JDKPN}-vm-shark () { |
374 | true | 374 | true |
375 | sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 375 | sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
376 | if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then | 376 | if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then |
@@ -381,7 +381,7 @@ pkg_prerm_${JDKPN}-vm-shark () { | |||
381 | echo "-shark ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 381 | echo "-shark ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
382 | } | 382 | } |
383 | 383 | ||
384 | pkg_postinst_ontarget_${JDKPN}-vm-cacao () { | 384 | pkg_postinst_ontarget:${JDKPN}-vm-cacao () { |
385 | true | 385 | true |
386 | if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then | 386 | if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then |
387 | sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 387 | sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
@@ -390,7 +390,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-cacao () { | |||
390 | fi | 390 | fi |
391 | } | 391 | } |
392 | 392 | ||
393 | pkg_prerm_${JDKPN}-vm-cacao () { | 393 | pkg_prerm:${JDKPN}-vm-cacao () { |
394 | true | 394 | true |
395 | sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 395 | sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
396 | if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then | 396 | if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then |
@@ -401,7 +401,7 @@ pkg_prerm_${JDKPN}-vm-cacao () { | |||
401 | echo "-cacao ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 401 | echo "-cacao ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
402 | } | 402 | } |
403 | 403 | ||
404 | pkg_postinst_ontarget_${JDKPN}-vm-jamvm () { | 404 | pkg_postinst_ontarget:${JDKPN}-vm-jamvm () { |
405 | true | 405 | true |
406 | if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then | 406 | if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then |
407 | sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 407 | sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
@@ -410,7 +410,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-jamvm () { | |||
410 | fi | 410 | fi |
411 | } | 411 | } |
412 | 412 | ||
413 | pkg_prerm_${JDKPN}-vm-jamvm () { | 413 | pkg_prerm:${JDKPN}-vm-jamvm () { |
414 | true | 414 | true |
415 | sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 415 | sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
416 | if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then | 416 | if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then |
@@ -421,7 +421,7 @@ pkg_prerm_${JDKPN}-vm-jamvm () { | |||
421 | echo "-jamvm ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 421 | echo "-jamvm ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
422 | } | 422 | } |
423 | 423 | ||
424 | pkg_postinst_ontarget_${JDKPN}-vm-zero () { | 424 | pkg_postinst_ontarget:${JDKPN}-vm-zero () { |
425 | true | 425 | true |
426 | if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then | 426 | if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then |
427 | FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1` | 427 | FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1` |
@@ -432,7 +432,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-zero () { | |||
432 | sed -i -e "s|^\-server.*|\-server KNOWN|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 432 | sed -i -e "s|^\-server.*|\-server KNOWN|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
433 | } | 433 | } |
434 | 434 | ||
435 | pkg_prerm_${JDKPN}-vm-zero () { | 435 | pkg_prerm:${JDKPN}-vm-zero () { |
436 | true | 436 | true |
437 | sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | 437 | sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg |
438 | if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then | 438 | if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then |
@@ -441,14 +441,14 @@ pkg_prerm_${JDKPN}-vm-zero () { | |||
441 | fi | 441 | fi |
442 | } | 442 | } |
443 | 443 | ||
444 | pkg_postinst_${JDKPN}-jre () { | 444 | pkg_postinst:${JDKPN}-jre () { |
445 | ln -s ${JDK_HOME}/jre $D/${libdir}/jvm/jre | 445 | ln -s ${JDK_HOME}/jre $D/${libdir}/jvm/jre |
446 | } | 446 | } |
447 | 447 | ||
448 | inherit update-alternatives | 448 | inherit update-alternatives |
449 | 449 | ||
450 | ALTERNATIVE_${JDKPN}-jre = "java keytool" | 450 | ALTERNATIVE:${JDKPN}-jre = "java keytool" |
451 | ALTERNATIVE_${JDKPN}-jdk = "javac" | 451 | ALTERNATIVE:${JDKPN}-jdk = "javac" |
452 | 452 | ||
453 | ALTERNATIVE_TARGET[java] = "${JDK_HOME}/jre/bin/java" | 453 | ALTERNATIVE_TARGET[java] = "${JDK_HOME}/jre/bin/java" |
454 | ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac" | 454 | ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac" |
diff --git a/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb b/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb index d774cc2..57827d9 100644 --- a/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb +++ b/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb | |||
@@ -80,4 +80,4 @@ export DISTRIBUTION_PATCHES | |||
80 | # to avoid this error add -fpermissive | 80 | # to avoid this error add -fpermissive |
81 | # | 81 | # |
82 | # NOTE: When updating the recipe, please check if this is still needed | 82 | # NOTE: When updating the recipe, please check if this is still needed |
83 | CFLAGS_append = " -Wno-error=deprecated-declarations -Wno-error=narrowing -fpermissive" | 83 | CFLAGS:append = " -Wno-error=deprecated-declarations -Wno-error=narrowing -fpermissive" |
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index 7d45585..16e3816 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc | |||
@@ -26,7 +26,7 @@ SRC_URI = "\ | |||
26 | ${PATCHES_URI} \ | 26 | ${PATCHES_URI} \ |
27 | " | 27 | " |
28 | 28 | ||
29 | do_configure_prepend () { | 29 | do_configure:prepend () { |
30 | export TOPDIR=${S} | 30 | export TOPDIR=${S} |
31 | sed -i 's#\$TOPDIR#${S}#g' ${S}/common/autoconf/configure.ac | 31 | sed -i 's#\$TOPDIR#${S}#g' ${S}/common/autoconf/configure.ac |
32 | } | 32 | } |
@@ -43,8 +43,8 @@ do_unpack_extract_submodules () { | |||
43 | tar xjf ${WORKDIR}/${NASHORN_FILE_LOCAL} --transform "s,-${NASHORN_CHANGESET},,g" | 43 | tar xjf ${WORKDIR}/${NASHORN_FILE_LOCAL} --transform "s,-${NASHORN_CHANGESET},,g" |
44 | } | 44 | } |
45 | 45 | ||
46 | do_patch_prepend() { | 46 | do_patch:prepend() { |
47 | # use do_patch_prepend syntax and not pre/postfuncs to | 47 | # use do_patch:prepend syntax and not pre/postfuncs to |
48 | # call do_unpack_extract_submodules | 48 | # call do_unpack_extract_submodules |
49 | # *) the archiver.bbclass modifies WORKDIR, S, B,... | 49 | # *) the archiver.bbclass modifies WORKDIR, S, B,... |
50 | # and those modifications are lost otherwise, | 50 | # and those modifications are lost otherwise, |
@@ -177,7 +177,7 @@ ALTERNATIVE_PRIORITY = "50" | |||
177 | 177 | ||
178 | OPENJDK_UPDATE_VERSION = "${PV}" | 178 | OPENJDK_UPDATE_VERSION = "${PV}" |
179 | OPENJDK_BUILD_NUMBER = "ga" | 179 | OPENJDK_BUILD_NUMBER = "ga" |
180 | EXTRA_OECONF_append = "\ | 180 | EXTRA_OECONF:append = "\ |
181 | --with-build-number=${OPENJDK_BUILD_NUMBER} \ | 181 | --with-build-number=${OPENJDK_BUILD_NUMBER} \ |
182 | --with-update-version=${OPENJDK_UPDATE_VERSION} \ | 182 | --with-update-version=${OPENJDK_UPDATE_VERSION} \ |
183 | " | 183 | " |
@@ -189,8 +189,8 @@ EXTRA_OECONF_append = "\ | |||
189 | GLOBAL_FLAGS = "-fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon" | 189 | GLOBAL_FLAGS = "-fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon" |
190 | 190 | ||
191 | # flags for -native, and for bits that need a host-tool during -cross | 191 | # flags for -native, and for bits that need a host-tool during -cross |
192 | BUILD_CFLAGS_append = " ${GLOBAL_FLAGS}" | 192 | BUILD_CFLAGS:append = " ${GLOBAL_FLAGS}" |
193 | BUILD_CXXFLAGS_append = " ${GLOBAL_FLAGS}" | 193 | BUILD_CXXFLAGS:append = " ${GLOBAL_FLAGS}" |
194 | # flags for -cross | 194 | # flags for -cross |
195 | TARGET_CFLAGS_append = " ${GLOBAL_FLAGS}" | 195 | TARGET_CFLAGS:append = " ${GLOBAL_FLAGS}" |
196 | TARGET_CXXFLAGS_append = " ${GLOBAL_FLAGS}" | 196 | TARGET_CXXFLAGS:append = " ${GLOBAL_FLAGS}" |
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index 25d971f..ff682f1 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc | |||
@@ -47,13 +47,13 @@ require openjdk-8-common.inc | |||
47 | 47 | ||
48 | JAVA_HOME[unexport] = "1" | 48 | JAVA_HOME[unexport] = "1" |
49 | 49 | ||
50 | SRC_URI_append = "\ | 50 | SRC_URI:append = "\ |
51 | file://jvm.cfg \ | 51 | file://jvm.cfg \ |
52 | file://0011-autoconf-fix-CC-with-arguments-detection.patch \ | 52 | file://0011-autoconf-fix-CC-with-arguments-detection.patch \ |
53 | file://0012-autoconf-NativeCompilation-remove-sysroot.patch \ | 53 | file://0012-autoconf-NativeCompilation-remove-sysroot.patch \ |
54 | " | 54 | " |
55 | 55 | ||
56 | EXTRA_OECONF_append = "\ | 56 | EXTRA_OECONF:append = "\ |
57 | --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ | 57 | --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ |
58 | \ | 58 | \ |
59 | --with-tools-dir=${STAGING_DIR_NATIVE} \ | 59 | --with-tools-dir=${STAGING_DIR_NATIVE} \ |
@@ -73,16 +73,16 @@ EXTRA_OECONF_append = "\ | |||
73 | ${@jdk_configure_options(d)} \ | 73 | ${@jdk_configure_options(d)} \ |
74 | " | 74 | " |
75 | 75 | ||
76 | do_configure_prepend() { | 76 | do_configure:prepend() { |
77 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" | 77 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" |
78 | export ${@jdk_environment_options(d)} | 78 | export ${@jdk_environment_options(d)} |
79 | } | 79 | } |
80 | 80 | ||
81 | do_configure_append() { | 81 | do_configure:append() { |
82 | sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk | 82 | sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk |
83 | } | 83 | } |
84 | 84 | ||
85 | do_install_append() { | 85 | do_install:append() { |
86 | if ${@bb.utils.contains('PACKAGECONFIG', 'repack', 'true', 'false', d)} ; then | 86 | if ${@bb.utils.contains('PACKAGECONFIG', 'repack', 'true', 'false', d)} ; then |
87 | if [ -d ${D}${JDK_HOME} ] ; then | 87 | if [ -d ${D}${JDK_HOME} ] ; then |
88 | find ${D}${JDK_HOME} -name "*.jar" -print0 | \ | 88 | find ${D}${JDK_HOME} -name "*.jar" -print0 | \ |
@@ -104,7 +104,7 @@ do_install[vardepsexclude] += "BB_NUMBER_THREADS" | |||
104 | export MAKE_VERBOSE = "y" | 104 | export MAKE_VERBOSE = "y" |
105 | export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip" | 105 | export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip" |
106 | 106 | ||
107 | EXTRA_OEMAKE_append = '\ | 107 | EXTRA_OEMAKE:append = '\ |
108 | ${@jdk_make_options(d)} \ | 108 | ${@jdk_make_options(d)} \ |
109 | ALT_SDT_H="${STAGING_INCDIR}" \ | 109 | ALT_SDT_H="${STAGING_INCDIR}" \ |
110 | ALT_CUPS_HEADERS_PATH="${STAGING_INCDIR}" \ | 110 | ALT_CUPS_HEADERS_PATH="${STAGING_INCDIR}" \ |
@@ -132,4 +132,4 @@ PACKAGE_PREPROCESS_FUNCS += "remove_debuglink" | |||
132 | 132 | ||
133 | # FIXME libjsig.so is a symlink to a .so but this one is valid | 133 | # FIXME libjsig.so is a symlink to a .so but this one is valid |
134 | # FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped | 134 | # FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped |
135 | INSANE_SKIP_${PN} = "dev-so already-stripped" | 135 | INSANE_SKIP:${PN} = "dev-so already-stripped" |
diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc index 3282257..c02e183 100644 --- a/recipes-core/openjdk/openjdk-8-native.inc +++ b/recipes-core/openjdk/openjdk-8-native.inc | |||
@@ -17,7 +17,7 @@ PACKAGECONFIG[jpeg] = "--with-libjpeg=system,--with-libjpeg=bundled,jpeg-native" | |||
17 | PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng-native" | 17 | PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng-native" |
18 | PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib-native" | 18 | PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib-native" |
19 | 19 | ||
20 | EXTRA_OECONF_append = "\ | 20 | EXTRA_OECONF:append = "\ |
21 | --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ | 21 | --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ |
22 | \ | 22 | \ |
23 | --with-tools-dir=${STAGING_DIR_NATIVE} \ | 23 | --with-tools-dir=${STAGING_DIR_NATIVE} \ |
@@ -36,32 +36,32 @@ require openjdk-8-common.inc | |||
36 | 36 | ||
37 | inherit native | 37 | inherit native |
38 | 38 | ||
39 | CFLAGS_append = " ${@jdk_cpp_options(d)}" | 39 | CFLAGS:append = " ${@jdk_cpp_options(d)}" |
40 | CPPFLAGS_append = "${@jdk_cpp_options(d)}" | 40 | CPPFLAGS:append = "${@jdk_cpp_options(d)}" |
41 | CXXFLAGS_append = " ${@jdk_cpp_options(d)}" | 41 | CXXFLAGS:append = " ${@jdk_cpp_options(d)}" |
42 | 42 | ||
43 | export MAKE_VERBOSE = "y" | 43 | export MAKE_VERBOSE = "y" |
44 | export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace" | 44 | export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace" |
45 | 45 | ||
46 | EXTRA_OEMAKE_append = ' \ | 46 | EXTRA_OEMAKE:append = ' \ |
47 | ${@jdk_make_options(d)} \ | 47 | ${@jdk_make_options(d)} \ |
48 | MAKE_VERBOSE=y VERBOSE=-s LOG_LEVEL=trace \ | 48 | MAKE_VERBOSE=y VERBOSE=-s LOG_LEVEL=trace \ |
49 | QUIETLY= \ | 49 | QUIETLY= \ |
50 | images \ | 50 | images \ |
51 | ' | 51 | ' |
52 | 52 | ||
53 | do_configure_prepend() { | 53 | do_configure:prepend() { |
54 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" | 54 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" |
55 | export ${@jdk_environment_options(d)} | 55 | export ${@jdk_environment_options(d)} |
56 | unset CC CXX | 56 | unset CC CXX |
57 | } | 57 | } |
58 | 58 | ||
59 | do_compile_prepend() { | 59 | do_compile:prepend() { |
60 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" | 60 | export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" |
61 | rm -f "${B}/images/j2sdk-image/jre/lib/security/cacerts" | 61 | rm -f "${B}/images/j2sdk-image/jre/lib/security/cacerts" |
62 | } | 62 | } |
63 | 63 | ||
64 | do_compile_append() { | 64 | do_compile:append() { |
65 | set -x | 65 | set -x |
66 | mkdir -p ${B}/certs | 66 | mkdir -p ${B}/certs |
67 | for pem in $(find ${STAGING_DATADIR}/ca-certificates -name "*.crt") | 67 | for pem in $(find ${STAGING_DATADIR}/ca-certificates -name "*.crt") |
@@ -90,4 +90,4 @@ do_install() { | |||
90 | } | 90 | } |
91 | 91 | ||
92 | # FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped | 92 | # FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped |
93 | INSANE_SKIP_${PN} = "already-stripped" | 93 | INSANE_SKIP:${PN} = "already-stripped" |
diff --git a/recipes-core/openjdk/openjdk-8-release-aarch32.inc b/recipes-core/openjdk/openjdk-8-release-aarch32.inc index 700a0f5..17e3a3d 100644 --- a/recipes-core/openjdk/openjdk-8-release-aarch32.inc +++ b/recipes-core/openjdk/openjdk-8-release-aarch32.inc | |||
@@ -1,39 +1,39 @@ | |||
1 | require openjdk-8-release-common.inc | 1 | require openjdk-8-release-common.inc |
2 | 2 | ||
3 | COMPATIBLE_HOST = "^$" | 3 | COMPATIBLE_HOST = "^$" |
4 | COMPATIBLE_HOST_armv7a = "arm" | 4 | COMPATIBLE_HOST:armv7a = "arm" |
5 | COMPATIBLE_HOST_armv7ve = "arm" | 5 | COMPATIBLE_HOST:armv7ve = "arm" |
6 | 6 | ||
7 | CHANGESET_ID="b09-aarch32-20200929" | 7 | CHANGESET_ID="b09-aarch32-20200929" |
8 | 8 | ||
9 | CORBA_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" | 9 | CORBA_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" |
10 | SRC_URI[corba.sha256sum] = "3675f043479c7e3ee7128651527d15c4e56f72d22dd953b8d0d8e5c9a2c68741" | 10 | SRC_URI[corba.sha256sum] = "3675f043479c7e3ee7128651527d15c4e56f72d22dd953b8d0d8e5c9a2c68741" |
11 | 11 | ||
12 | HOTSPOT_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" | 12 | HOTSPOT_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" |
13 | SRC_URI[hotspot.sha256sum] = "d5ea125d7e54fd3dd21bf1654c09b5ce17497d9327f770abd56ad1108a337b81" | 13 | SRC_URI[hotspot.sha256sum] = "d5ea125d7e54fd3dd21bf1654c09b5ce17497d9327f770abd56ad1108a337b81" |
14 | 14 | ||
15 | JAXP_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" | 15 | JAXP_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" |
16 | SRC_URI[jaxp.sha256sum] = "a025f9f047bc50947aa631641b2f836c3a3ec4a5f2c9019bc7b11ab8444f7b9e" | 16 | SRC_URI[jaxp.sha256sum] = "a025f9f047bc50947aa631641b2f836c3a3ec4a5f2c9019bc7b11ab8444f7b9e" |
17 | 17 | ||
18 | JAXWS_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" | 18 | JAXWS_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" |
19 | SRC_URI[jaxws.sha256sum] = "ad921e0f5cafab4c5b4bb248ea59bf1615864c4de17bfd7321759d063398dc3f" | 19 | SRC_URI[jaxws.sha256sum] = "ad921e0f5cafab4c5b4bb248ea59bf1615864c4de17bfd7321759d063398dc3f" |
20 | 20 | ||
21 | JDK_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" | 21 | JDK_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" |
22 | SRC_URI[jdk.sha256sum] = "835e81fc88b8c0e40df0d89be5d8a852638b3f5f29acad6997cbc36a2e8341fe" | 22 | SRC_URI[jdk.sha256sum] = "835e81fc88b8c0e40df0d89be5d8a852638b3f5f29acad6997cbc36a2e8341fe" |
23 | 23 | ||
24 | LANGTOOLS_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" | 24 | LANGTOOLS_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" |
25 | SRC_URI[langtools.sha256sum] = "554491026bb9fadb837d635d4beea3ca9cb73f034c1379d57fcd77787816139f" | 25 | SRC_URI[langtools.sha256sum] = "554491026bb9fadb837d635d4beea3ca9cb73f034c1379d57fcd77787816139f" |
26 | 26 | ||
27 | NASHORN_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" | 27 | NASHORN_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" |
28 | SRC_URI[nashorn.sha256sum] = "8358000a7e52fcfd046027319569d17f2e99b710acbfd1a1120b50ce93afe223" | 28 | SRC_URI[nashorn.sha256sum] = "8358000a7e52fcfd046027319569d17f2e99b710acbfd1a1120b50ce93afe223" |
29 | 29 | ||
30 | OPENJDK_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" | 30 | OPENJDK_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}" |
31 | SRC_URI[openjdk.sha256sum] = "4b38e672c82df5d18215849829a80a111b1c7b46567bc641e9fec92bedd0d32a" | 31 | SRC_URI[openjdk.sha256sum] = "4b38e672c82df5d18215849829a80a111b1c7b46567bc641e9fec92bedd0d32a" |
32 | 32 | ||
33 | PACKAGECONFIG_append_armv7a = " client" | 33 | PACKAGECONFIG:append:armv7a = " client" |
34 | PACKAGECONFIG_append_armv7ve = " client" | 34 | PACKAGECONFIG:append:armv7ve = " client" |
35 | 35 | ||
36 | do_install_append() { | 36 | do_install:append() { |
37 | if [ -d ${D}${JDK_HOME} ] ; then | 37 | if [ -d ${D}${JDK_HOME} ] ; then |
38 | sed -e 's,^\(-server ERROR$\),# \1,' \ | 38 | sed -e 's,^\(-server ERROR$\),# \1,' \ |
39 | -e 's,^-client IGNORE,-client ERROR,' \ | 39 | -e 's,^-client IGNORE,-client ERROR,' \ |
@@ -48,5 +48,5 @@ do_install_append() { | |||
48 | fi | 48 | fi |
49 | } | 49 | } |
50 | 50 | ||
51 | JDK_ARCH_armv7a = "aarch32" | 51 | JDK_ARCH:armv7a = "aarch32" |
52 | JDK_ARCH_armv7ve = "aarch32" | 52 | JDK_ARCH:armv7ve = "aarch32" |
diff --git a/recipes-core/openjdk/openjdk-8-release-aarch64.inc b/recipes-core/openjdk/openjdk-8-release-aarch64.inc index c71dd25..3aac110 100644 --- a/recipes-core/openjdk/openjdk-8-release-aarch64.inc +++ b/recipes-core/openjdk/openjdk-8-release-aarch64.inc | |||
@@ -4,26 +4,26 @@ COMPATIBLE_HOST = "aarch64" | |||
4 | 4 | ||
5 | CHANGESET_ID="b10" | 5 | CHANGESET_ID="b10" |
6 | 6 | ||
7 | CORBA_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | 7 | CORBA_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" |
8 | SRC_URI[corba.sha256sum] = "112143d935a94cb95a0f9dba19a86184d08e699a68a82db58cdd9f0de1baeeae" | 8 | SRC_URI[corba.sha256sum] = "112143d935a94cb95a0f9dba19a86184d08e699a68a82db58cdd9f0de1baeeae" |
9 | 9 | ||
10 | HOTSPOT_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | 10 | HOTSPOT_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" |
11 | SRC_URI[hotspot.sha256sum] = "16ed30b46279e2ffef04ab392502e32525451bea38f3af0d3c3782bcd33a0274" | 11 | SRC_URI[hotspot.sha256sum] = "16ed30b46279e2ffef04ab392502e32525451bea38f3af0d3c3782bcd33a0274" |
12 | 12 | ||
13 | JAXP_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | 13 | JAXP_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" |
14 | SRC_URI[jaxp.sha256sum] = "5dde165d7327b08f2ebc8d3081a1734d9ef737117dcaa417eb7dc39344220987" | 14 | SRC_URI[jaxp.sha256sum] = "5dde165d7327b08f2ebc8d3081a1734d9ef737117dcaa417eb7dc39344220987" |
15 | 15 | ||
16 | JAXWS_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | 16 | JAXWS_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" |
17 | SRC_URI[jaxws.sha256sum] = "cedde28264a85cb16ae46123091edb64f7c1d2cd5f3de6ba0d21cffff84c3ccf" | 17 | SRC_URI[jaxws.sha256sum] = "cedde28264a85cb16ae46123091edb64f7c1d2cd5f3de6ba0d21cffff84c3ccf" |
18 | 18 | ||
19 | JDK_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | 19 | JDK_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" |
20 | SRC_URI[jdk.sha256sum] = "7e53438e0506536fe373b7f8176512c701b87adda268831d180ead2695154a93" | 20 | SRC_URI[jdk.sha256sum] = "7e53438e0506536fe373b7f8176512c701b87adda268831d180ead2695154a93" |
21 | 21 | ||
22 | LANGTOOLS_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | 22 | LANGTOOLS_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" |
23 | SRC_URI[langtools.sha256sum] = "8dbcd45109d0c782a6cac5a1a310a5816d4dac8a9c095635832ab803bfdb861a" | 23 | SRC_URI[langtools.sha256sum] = "8dbcd45109d0c782a6cac5a1a310a5816d4dac8a9c095635832ab803bfdb861a" |
24 | 24 | ||
25 | NASHORN_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | 25 | NASHORN_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" |
26 | SRC_URI[nashorn.sha256sum] = "85497cdba0943644d838862761891d0a06dfaad5ea13b63af69f1a6d595e6387" | 26 | SRC_URI[nashorn.sha256sum] = "85497cdba0943644d838862761891d0a06dfaad5ea13b63af69f1a6d595e6387" |
27 | 27 | ||
28 | OPENJDK_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" | 28 | OPENJDK_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" |
29 | SRC_URI[openjdk.sha256sum] = "97175c78de4c82b78d3c80b1b0d22c44b195ca067f253cfaa3c235328b808760" | 29 | SRC_URI[openjdk.sha256sum] = "97175c78de4c82b78d3c80b1b0d22c44b195ca067f253cfaa3c235328b808760" |
diff --git a/recipes-core/openjdk/openjdk-8-release-common.inc b/recipes-core/openjdk/openjdk-8-release-common.inc index a3747cf..6c7bdd2 100644 --- a/recipes-core/openjdk/openjdk-8-release-common.inc +++ b/recipes-core/openjdk/openjdk-8-release-common.inc | |||
@@ -32,22 +32,22 @@ HOTSPOT_UB_PATCH = "\ | |||
32 | file://1008-hotspot-handle-format-error-for-GCC-7.patch \ | 32 | file://1008-hotspot-handle-format-error-for-GCC-7.patch \ |
33 | file://1012-hotspot-enable-Wno-error.patch \ | 33 | file://1012-hotspot-enable-Wno-error.patch \ |
34 | " | 34 | " |
35 | HOTSPOT_UB_PATCH_append_class-target = "\ | 35 | HOTSPOT_UB_PATCH:append:class-target = "\ |
36 | file://1009-hotspot-fix-adlc-flags.patch \ | 36 | file://1009-hotspot-fix-adlc-flags.patch \ |
37 | file://1010-hotspot-fix-shark-build-common.patch \ | 37 | file://1010-hotspot-fix-shark-build-common.patch \ |
38 | file://1011-hotspot-restrict-to-staging-dir.patch \ | 38 | file://1011-hotspot-restrict-to-staging-dir.patch \ |
39 | " | 39 | " |
40 | HOTSPOT_UB_PATCH_prepend_aarch64 = "\ | 40 | HOTSPOT_UB_PATCH:prepend:aarch64 = "\ |
41 | file://1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch \ | 41 | file://1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch \ |
42 | " | 42 | " |
43 | HOTSPOT_UB_PATCH_append_armv7a = " file://1201-hotspot-aarch32-fix-missing-return-values.patch" | 43 | HOTSPOT_UB_PATCH:append:armv7a = " file://1201-hotspot-aarch32-fix-missing-return-values.patch" |
44 | HOTSPOT_UB_PATCH_append_armv7ve = " file://1201-hotspot-aarch32-fix-missing-return-values.patch" | 44 | HOTSPOT_UB_PATCH:append:armv7ve = " file://1201-hotspot-aarch32-fix-missing-return-values.patch" |
45 | 45 | ||
46 | PATCHES_URI_append_class-target = "\ | 46 | PATCHES_URI:append:class-target = "\ |
47 | file://1013-hotspot-add-missing-includes-for-shark-build-pt2.patch \ | 47 | file://1013-hotspot-add-missing-includes-for-shark-build-pt2.patch \ |
48 | " | 48 | " |
49 | 49 | ||
50 | PATCHES_URI_append_libc-musl = "\ | 50 | PATCHES_URI:append:libc-musl = "\ |
51 | ${OBSOLETE_ISNANF_PATCH} \ | 51 | ${OBSOLETE_ISNANF_PATCH} \ |
52 | file://musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch \ | 52 | file://musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch \ |
53 | file://musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch \ | 53 | file://musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch \ |
@@ -56,50 +56,50 @@ PATCHES_URI_append_libc-musl = "\ | |||
56 | ${DISABLE_AGENT_BUILD_PT2} \ | 56 | ${DISABLE_AGENT_BUILD_PT2} \ |
57 | file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-common.patch \ | 57 | file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-common.patch \ |
58 | ${REMOVE_GLIBC_DEPENDENCIES_PT2} \ | 58 | ${REMOVE_GLIBC_DEPENDENCIES_PT2} \ |
59 | file://musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch \ | 59 | file://musl-0007-hotspot-os_linux:x86-remove-glibc-dependencies-fpu_c.patch \ |
60 | file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \ | 60 | file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \ |
61 | file://musl-0009-jdk-musl-has-gethostby_r.patch \ | 61 | file://musl-0009-jdk-musl-has-gethostby_r.patch \ |
62 | " | 62 | " |
63 | OBSOLETE_ISNANF_PATCH = "file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch" | 63 | OBSOLETE_ISNANF_PATCH = "file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch" |
64 | OBSOLETE_ISNANF_PATCH_armv7a = "" | 64 | OBSOLETE_ISNANF_PATCH:armv7a = "" |
65 | OBSOLETE_ISNANF_PATCH_armv7ve = "" | 65 | OBSOLETE_ISNANF_PATCH:armv7ve = "" |
66 | DISABLE_AGENT_BUILD_PT2 = "file://musl-0005-hotspot-disable-agent-build-pt2.patch" | 66 | DISABLE_AGENT_BUILD_PT2 = "file://musl-0005-hotspot-disable-agent-build-pt2.patch" |
67 | DISABLE_AGENT_BUILD_PT2_armv7a = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" | 67 | DISABLE_AGENT_BUILD_PT2:armv7a = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" |
68 | DISABLE_AGENT_BUILD_PT2_armv7ve = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" | 68 | DISABLE_AGENT_BUILD_PT2:armv7ve = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" |
69 | REMOVE_GLIBC_DEPENDENCIES_PT2 = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2.patch" | 69 | REMOVE_GLIBC_DEPENDENCIES_PT2 = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2.patch" |
70 | REMOVE_GLIBC_DEPENDENCIES_PT2_armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" | 70 | REMOVE_GLIBC_DEPENDENCIES_PT2:armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" |
71 | REMOVE_GLIBC_DEPENDENCIES_PT2_armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" | 71 | REMOVE_GLIBC_DEPENDENCIES_PT2:armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" |
72 | 72 | ||
73 | PATCHES_URI_append_libc-musl_armv7a = " file://1202-hotspot-aarch32-remaining-musl-fixes.patch" | 73 | PATCHES_URI:append:libc-musl:armv7a = " file://1202-hotspot-aarch32-remaining-musl-fixes.patch" |
74 | PATCHES_URI_append_libc-musl_armv7ve = " file://1202-hotspot-aarch32-remaining-musl-fixes.patch" | 74 | PATCHES_URI:append:libc-musl:armv7ve = " file://1202-hotspot-aarch32-remaining-musl-fixes.patch" |
75 | PATCHES_URI_append_libc-musl_aarch64 = " file://1402-hotspot-aarch64-remaining-musl-fixes.patch" | 75 | PATCHES_URI:append:libc-musl:aarch64 = " file://1402-hotspot-aarch64-remaining-musl-fixes.patch" |
76 | 76 | ||
77 | # remove aarch32 & aarch64 mainlined patches | 77 | # remove aarch32 & aarch64 mainlined patches |
78 | PATCHES_URI_remove_armv7a = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch" | 78 | PATCHES_URI:remove:armv7a = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch" |
79 | PATCHES_URI_remove_armv7ve = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch" | 79 | PATCHES_URI:remove:armv7ve = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch" |
80 | PATCHES_URI_remove_aarch64 = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch" | 80 | PATCHES_URI:remove:aarch64 = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch" |
81 | 81 | ||
82 | # Name of the directory containing the compiled output | 82 | # Name of the directory containing the compiled output |
83 | BUILD_DIR = "openjdk.build" | 83 | BUILD_DIR = "openjdk.build" |
84 | BUILD_DIR_ECJ = "openjdk.build-ecj" | 84 | BUILD_DIR_ECJ = "openjdk.build-ecj" |
85 | 85 | ||
86 | # Force arm mode for now | 86 | # Force arm mode for now |
87 | ARM_INSTRUCTION_SET_armv4t = "ARM" | 87 | ARM_INSTRUCTION_SET:armv4t = "ARM" |
88 | 88 | ||
89 | # Enable zero mode for arm based builds, as normal hotspot fails to build | 89 | # Enable zero mode for arm based builds, as normal hotspot fails to build |
90 | PACKAGECONFIG_append_armv4 = " zero" | 90 | PACKAGECONFIG:append:armv4 = " zero" |
91 | PACKAGECONFIG_append_armv5 = " zero" | 91 | PACKAGECONFIG:append:armv5 = " zero" |
92 | PACKAGECONFIG_append_armv6 = " zero" | 92 | PACKAGECONFIG:append:armv6 = " zero" |
93 | 93 | ||
94 | OPENJDK_ARCH_PORT = "jdk8u" | 94 | OPENJDK_ARCH_PORT = "jdk8u" |
95 | OPENJDK_ARCH_PORT_aarch64 = "aarch64-port" | 95 | OPENJDK_ARCH_PORT:aarch64 = "aarch64-port" |
96 | OPENJDK_ARCH_PORT_armv7a = "aarch32-port" | 96 | OPENJDK_ARCH_PORT:armv7a = "aarch32-port" |
97 | OPENJDK_ARCH_PORT_armv7ve = "aarch32-port" | 97 | OPENJDK_ARCH_PORT:armv7ve = "aarch32-port" |
98 | OPENJDK_HG_U = "jdk8u" | 98 | OPENJDK_HG_U = "jdk8u" |
99 | 99 | ||
100 | # the aarch64 port moved, for more information see: | 100 | # the aarch64 port moved, for more information see: |
101 | # https://mail.openjdk.java.net/pipermail/aarch64-port-dev/2018-August/006265.html | 101 | # https://mail.openjdk.java.net/pipermail/aarch64-port-dev/2018-August/006265.html |
102 | OPENJDK_HG_U_aarch64 = "jdk8u-shenandoah" | 102 | OPENJDK_HG_U:aarch64 = "jdk8u-shenandoah" |
103 | 103 | ||
104 | OPENJDK_HG_URL = "https://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" | 104 | OPENJDK_HG_URL = "https://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" |
105 | 105 | ||
diff --git a/recipes-core/openjdk/openjdk-8-release.inc b/recipes-core/openjdk/openjdk-8-release.inc index 28429f8..4cdd050 100644 --- a/recipes-core/openjdk/openjdk-8-release.inc +++ b/recipes-core/openjdk/openjdk-8-release.inc | |||
@@ -3,8 +3,8 @@ require openjdk-8-release-common.inc | |||
3 | # We do not yet work for aarch64, and we make sure | 3 | # We do not yet work for aarch64, and we make sure |
4 | # to use the aarch32 port for ARMv7. | 4 | # to use the aarch32 port for ARMv7. |
5 | COMPATIBLE_HOST = "^(?!(aarch64)).*$" | 5 | COMPATIBLE_HOST = "^(?!(aarch64)).*$" |
6 | COMPATIBLE_HOST_armv7a = "^$" | 6 | COMPATIBLE_HOST:armv7a = "^$" |
7 | COMPATIBLE_HOST_armv7ve = "^$" | 7 | COMPATIBLE_HOST:armv7ve = "^$" |
8 | 8 | ||
9 | CORBA_CHANGESET = "jdk8u${PV}-ga" | 9 | CORBA_CHANGESET = "jdk8u${PV}-ga" |
10 | SRC_URI[corba.sha256sum] = "28c487a49546ab1a592eaf229c13e1896b390958ac4e6fa19bf5da34a1977138" | 10 | SRC_URI[corba.sha256sum] = "28c487a49546ab1a592eaf229c13e1896b390958ac4e6fa19bf5da34a1977138" |
diff --git a/recipes-core/openjdk/openjdk-8_272.bb b/recipes-core/openjdk/openjdk-8_272.bb index f9049e5..0bfa102 100644 --- a/recipes-core/openjdk/openjdk-8_272.bb +++ b/recipes-core/openjdk/openjdk-8_272.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | INC_FILE_SUFFIX = "" | 1 | INC_FILE_SUFFIX = "" |
2 | INC_FILE_SUFFIX_aarch64 = "-aarch64" | 2 | INC_FILE_SUFFIX:aarch64 = "-aarch64" |
3 | INC_FILE_SUFFIX_armv7a = "-aarch32" | 3 | INC_FILE_SUFFIX:armv7a = "-aarch32" |
4 | INC_FILE_SUFFIX_armv7ve = "-aarch32" | 4 | INC_FILE_SUFFIX:armv7ve = "-aarch32" |
5 | require openjdk-8-release${INC_FILE_SUFFIX}.inc | 5 | require openjdk-8-release${INC_FILE_SUFFIX}.inc |
6 | require openjdk-8-cross.inc | 6 | require openjdk-8-cross.inc |
7 | 7 | ||
@@ -14,12 +14,12 @@ do_install() { | |||
14 | find ${D}${JDK_HOME} -name "*.debuginfo" -exec rm {} \; | 14 | find ${D}${JDK_HOME} -name "*.debuginfo" -exec rm {} \; |
15 | } | 15 | } |
16 | 16 | ||
17 | PACKAGES_append = " \ | 17 | PACKAGES:append = " \ |
18 | ${PN}-demo \ | 18 | ${PN}-demo \ |
19 | ${PN}-source \ | 19 | ${PN}-source \ |
20 | " | 20 | " |
21 | 21 | ||
22 | FILES_${PN}_append = "\ | 22 | FILES:${PN}:append = "\ |
23 | ${JDK_HOME}/bin/[a-z]* \ | 23 | ${JDK_HOME}/bin/[a-z]* \ |
24 | ${JDK_HOME}/lib/[a-z]* \ | 24 | ${JDK_HOME}/lib/[a-z]* \ |
25 | ${JDK_HOME}/jre/bin/[a-z]* \ | 25 | ${JDK_HOME}/jre/bin/[a-z]* \ |
@@ -29,14 +29,14 @@ FILES_${PN}_append = "\ | |||
29 | ${JDK_HOME}/release \ | 29 | ${JDK_HOME}/release \ |
30 | " | 30 | " |
31 | 31 | ||
32 | FILES_${PN}-dev_append = "\ | 32 | FILES:${PN}-dev:append = "\ |
33 | ${JDK_HOME}/include \ | 33 | ${JDK_HOME}/include \ |
34 | " | 34 | " |
35 | 35 | ||
36 | FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " | 36 | FILES:${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " |
37 | RDEPENDS_${PN}-demo = " ${PN} " | 37 | RDEPENDS:${PN}-demo = " ${PN} " |
38 | 38 | ||
39 | FILES_${PN}-doc_append = "\ | 39 | FILES:${PN}-doc:append = "\ |
40 | ${JDK_HOME}/man \ | 40 | ${JDK_HOME}/man \ |
41 | ${JDK_HOME}/ASSEMBLY_EXCEPTION \ | 41 | ${JDK_HOME}/ASSEMBLY_EXCEPTION \ |
42 | ${JDK_HOME}/THIRD_PARTY_README \ | 42 | ${JDK_HOME}/THIRD_PARTY_README \ |
@@ -45,15 +45,15 @@ FILES_${PN}-doc_append = "\ | |||
45 | ${JDK_HOME}/man \ | 45 | ${JDK_HOME}/man \ |
46 | " | 46 | " |
47 | 47 | ||
48 | FILES_${PN}-source = " ${JDK_HOME}/src.zip " | 48 | FILES:${PN}-source = " ${JDK_HOME}/src.zip " |
49 | 49 | ||
50 | RPROVIDES_${PN} = "java2-runtime" | 50 | RPROVIDES:${PN} = "java2-runtime" |
51 | 51 | ||
52 | inherit update-alternatives | 52 | inherit update-alternatives |
53 | 53 | ||
54 | ALTERNATIVE_PRIORITY = "100" | 54 | ALTERNATIVE_PRIORITY = "100" |
55 | 55 | ||
56 | ALTERNATIVE_${PN} = "java javac keytool" | 56 | ALTERNATIVE:${PN} = "java javac keytool" |
57 | ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" | 57 | ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" |
58 | ALTERNATIVE_TARGET[java] = "${JDK_HOME}/bin/java" | 58 | ALTERNATIVE_TARGET[java] = "${JDK_HOME}/bin/java" |
59 | 59 | ||
diff --git a/recipes-core/openjdk/openjre-8_272.bb b/recipes-core/openjdk/openjre-8_272.bb index 55ca1ec..c1789aa 100644 --- a/recipes-core/openjdk/openjre-8_272.bb +++ b/recipes-core/openjdk/openjre-8_272.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | INC_FILE_SUFFIX = "" | 1 | INC_FILE_SUFFIX = "" |
2 | INC_FILE_SUFFIX_aarch64 = "-aarch64" | 2 | INC_FILE_SUFFIX:aarch64 = "-aarch64" |
3 | INC_FILE_SUFFIX_armv7a = "-aarch32" | 3 | INC_FILE_SUFFIX:armv7a = "-aarch32" |
4 | INC_FILE_SUFFIX_armv7ve = "-aarch32" | 4 | INC_FILE_SUFFIX:armv7ve = "-aarch32" |
5 | require openjdk-8-release${INC_FILE_SUFFIX}.inc | 5 | require openjdk-8-release${INC_FILE_SUFFIX}.inc |
6 | require openjdk-8-cross.inc | 6 | require openjdk-8-cross.inc |
7 | 7 | ||
@@ -13,14 +13,14 @@ do_install() { | |||
13 | install -m644 ${WORKDIR}/jvm.cfg ${D}${JRE_HOME}/lib/${JDK_ARCH}/ | 13 | install -m644 ${WORKDIR}/jvm.cfg ${D}${JRE_HOME}/lib/${JDK_ARCH}/ |
14 | } | 14 | } |
15 | 15 | ||
16 | FILES_${PN}_append = "\ | 16 | FILES:${PN}:append = "\ |
17 | ${JRE_HOME}/bin/[a-z]* \ | 17 | ${JRE_HOME}/bin/[a-z]* \ |
18 | ${JRE_HOME}/lib/[a-z]* \ | 18 | ${JRE_HOME}/lib/[a-z]* \ |
19 | ${JRE_HOME}/LICENSE \ | 19 | ${JRE_HOME}/LICENSE \ |
20 | ${JRE_HOME}/release \ | 20 | ${JRE_HOME}/release \ |
21 | " | 21 | " |
22 | 22 | ||
23 | FILES_${PN}-dbg_append = "\ | 23 | FILES:${PN}-dbg:append = "\ |
24 | ${JRE_HOME}/bin/.debug/ \ | 24 | ${JRE_HOME}/bin/.debug/ \ |
25 | ${JRE_HOME}/lib/.debug/ \ | 25 | ${JRE_HOME}/lib/.debug/ \ |
26 | ${JRE_HOME}/lib/${JDK_ARCH}/.debug/ \ | 26 | ${JRE_HOME}/lib/${JDK_ARCH}/.debug/ \ |
@@ -28,19 +28,19 @@ FILES_${PN}-dbg_append = "\ | |||
28 | ${JRE_HOME}/lib/${JDK_ARCH}/server/.debug/ \ | 28 | ${JRE_HOME}/lib/${JDK_ARCH}/server/.debug/ \ |
29 | " | 29 | " |
30 | 30 | ||
31 | FILES_${PN}-doc_append = "\ | 31 | FILES:${PN}-doc:append = "\ |
32 | ${JRE_HOME}/man \ | 32 | ${JRE_HOME}/man \ |
33 | ${JRE_HOME}/ASSEMBLY_EXCEPTION \ | 33 | ${JRE_HOME}/ASSEMBLY_EXCEPTION \ |
34 | ${JRE_HOME}/THIRD_PARTY_README \ | 34 | ${JRE_HOME}/THIRD_PARTY_README \ |
35 | " | 35 | " |
36 | 36 | ||
37 | RPROVIDES_${PN} = "java2-runtime" | 37 | RPROVIDES:${PN} = "java2-runtime" |
38 | 38 | ||
39 | inherit update-alternatives | 39 | inherit update-alternatives |
40 | 40 | ||
41 | ALTERNATIVE_PRIORITY = "100" | 41 | ALTERNATIVE_PRIORITY = "100" |
42 | 42 | ||
43 | ALTERNATIVE_${PN} = "java keytool" | 43 | ALTERNATIVE:${PN} = "java keytool" |
44 | ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" | 44 | ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" |
45 | ALTERNATIVE_TARGET[java] = "${JRE_HOME}/bin/java" | 45 | ALTERNATIVE_TARGET[java] = "${JRE_HOME}/bin/java" |
46 | 46 | ||