diff options
author | Jens Rehsack <rehsack@gmail.com> | 2015-12-12 10:36:02 +0100 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-12-17 10:39:21 -0200 |
commit | bf6405846903e2e5495a337c8f2076eb915b15f6 (patch) | |
tree | 0c089048b84f05ce17104aea80e8b3392e762063 /recipes-core/openjdk/openjre-8_72b05.bb | |
parent | a3c5d358836b40fa44edb300cc687130131683dd (diff) | |
download | meta-java-bf6405846903e2e5495a337c8f2076eb915b15f6.tar.gz |
openjdk-8: fix rewrite QA warnings
Fix bitbake warnings from variable renaming like
Variable key FILES_${PN} (${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} ${sysconfdir} ${sharedstatedir} ${localstatedir} ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*${SOLIBS} ${base_prefix}/lib/udev/rules.d ${prefix}/lib/udev/rules.d ${datadir}/${BPN} ${libdir}/${BPN}/* ${datadir}/pixmaps ${datadir}/applications ${datadir}/idl ${datadir}/omf ${datadir}/sounds ${libdir}/bonobo/servers) replaces original key FILES_openjre-8 ( ${JRE_HOME}/bin/[a-z]* ${JRE_HOME}/lib/[a-z]* ${JRE_HOME}/LICENSE ${JRE_HOME}/release ).
It is caused by using FILES_${PN} and FILES_{JDKPN} or FILES_${JREPN},
respectively. Moving FILES_{JDKPN} to openjdk-8_%.bb and FILES_${JREPN} to
openjre-8_%.bb to allow consequently use FILES_${PN}.
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk/openjre-8_72b05.bb')
-rw-r--r-- | recipes-core/openjdk/openjre-8_72b05.bb | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/recipes-core/openjdk/openjre-8_72b05.bb b/recipes-core/openjdk/openjre-8_72b05.bb index 67eb1d3..1543652 100644 --- a/recipes-core/openjdk/openjre-8_72b05.bb +++ b/recipes-core/openjdk/openjre-8_72b05.bb | |||
@@ -11,20 +11,50 @@ PATCHES_URI_append = "\ | |||
11 | file://openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch;apply=no \ | 11 | file://openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch;apply=no \ |
12 | " | 12 | " |
13 | 13 | ||
14 | do_compile_append() { | ||
15 | find ${B}/images/j2re-image -name "*.jar" -print0 | \ | ||
16 | xargs -0 -n1 ${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/bin/pack200 --repack --effort=9 --segment-limit=-1 --modification-time=latest --strip-debug | ||
17 | } | ||
18 | |||
14 | do_install() { | 19 | do_install() { |
15 | do_install_jre | 20 | rm -rf ${D}${JRE_HOME} |
21 | mkdir -p ${D}${JRE_HOME} | ||
22 | cp -rp ${B}/images/j2re-image/* ${D}${JRE_HOME} | ||
23 | install -m644 ${WORKDIR}/jvm.cfg ${D}${JRE_HOME}/lib/${JDK_ARCH}/ | ||
24 | find ${D}${JRE_HOME} -name "*.debuginfo" -print0 | xargs -0 rm | ||
16 | } | 25 | } |
17 | 26 | ||
18 | RPROVIDES_${JREPN} = "java2-vm" | 27 | FILES_${PN}_append = "\ |
19 | PROVIDES_${JREPN} = "java2-vm" | 28 | ${JRE_HOME}/bin/[a-z]* \ |
20 | RPROVIDES_${JREPN} = "java2-runtime" | 29 | ${JRE_HOME}/lib/[a-z]* \ |
21 | PROVIDES_${JREPN} = "java2-runtime" | 30 | ${JRE_HOME}/LICENSE \ |
31 | ${JRE_HOME}/release \ | ||
32 | " | ||
33 | |||
34 | FILES_${PN}-dbg_append = "\ | ||
35 | ${JRE_HOME}/bin/.debug/ \ | ||
36 | ${JRE_HOME}/lib/.debug/ \ | ||
37 | ${JRE_HOME}/lib/${JDK_ARCH}/.debug/ \ | ||
38 | ${JRE_HOME}/lib/${JDK_ARCH}/jli/.debug/ \ | ||
39 | ${JRE_HOME}/lib/${JDK_ARCH}/server/.debug/ \ | ||
40 | " | ||
41 | |||
42 | FILES_${PN}-doc_append = "\ | ||
43 | ${JRE_HOME}/man \ | ||
44 | ${JRE_HOME}/ASSEMBLY_EXCEPTION \ | ||
45 | ${JRE_HOME}/THIRD_PARTY_README \ | ||
46 | " | ||
47 | |||
48 | RPROVIDES_${PN} = "java2-vm" | ||
49 | PROVIDES_${PN} = "java2-vm" | ||
50 | RPROVIDES_${PN} = "java2-runtime" | ||
51 | PROVIDES_${PN} = "java2-runtime" | ||
22 | 52 | ||
23 | inherit update-alternatives | 53 | inherit update-alternatives |
24 | 54 | ||
25 | ALTERNATIVE_${PN} = "java" | 55 | ALTERNATIVE_${PN} = "java" |
26 | ALTERNATIVE_LINK = "${bindir}/java" | 56 | ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" |
27 | ALTERNATIVE_TARGET = "${JRE_HOME}/bin/java" | 57 | ALTERNATIVE_TARGET[java] = "${JRE_HOME}/bin/java" |
28 | ALTERNATIVE_PRIORITY = "100" | 58 | ALTERNATIVE_PRIORITY[java] = "100" |
29 | 59 | ||
30 | # PR = "${INC_PR}.1" | 60 | # PR = "${INC_PR}.1" |