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/openjdk-8-cross.inc | |
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/openjdk-8-cross.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-cross.inc | 133 |
1 files changed, 2 insertions, 131 deletions
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index 20ac194..457a010 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc | |||
@@ -1,8 +1,5 @@ | |||
1 | JDKPN = "openjdk-8" | 1 | JDK_HOME = "${libdir_jvm}/openjdk-8" |
2 | JREPN = "openjre-8" | 2 | JRE_HOME = "${libdir_jvm}/openjre-8" |
3 | |||
4 | JDK_HOME = "${libdir_jvm}/${JDKPN}" | ||
5 | JRE_HOME = "${libdir_jvm}/${JREPN}" | ||
6 | 3 | ||
7 | DEPENDS = "\ | 4 | DEPENDS = "\ |
8 | openjdk-8-native zip-native ant-native libxslt \ | 5 | openjdk-8-native zip-native ant-native libxslt \ |
@@ -72,129 +69,3 @@ EXTRA_OEMAKE_append = '\ | |||
72 | QUIETLY= \ | 69 | QUIETLY= \ |
73 | images \ | 70 | images \ |
74 | ' | 71 | ' |
75 | |||
76 | FILES_${JREPN}_append = "\ | ||
77 | ${JRE_HOME}/bin/[a-z]* \ | ||
78 | ${JRE_HOME}/lib/[a-z]* \ | ||
79 | ${JRE_HOME}/LICENSE \ | ||
80 | ${JRE_HOME}/release \ | ||
81 | " | ||
82 | |||
83 | FILES_${JDKPN}_append = "\ | ||
84 | ${JDK_HOME}/bin/[a-z]* \ | ||
85 | ${JDK_HOME}/lib/[a-z]* \ | ||
86 | ${JDK_HOME}/jre/bin/[a-z]* \ | ||
87 | ${JDK_HOME}/jre/lib/[a-z]* \ | ||
88 | ${JDK_HOME}/LICENSE \ | ||
89 | ${JDK_HOME}/jre/LICENSE \ | ||
90 | ${JDK_HOME}/release \ | ||
91 | " | ||
92 | |||
93 | FILES_${JDKPN}-dev_append = "\ | ||
94 | ${JDK_HOME}/include \ | ||
95 | " | ||
96 | |||
97 | FILES_${JDKPN}-dbg_append = "\ | ||
98 | ${JDK_HOME}/bin/.debug/ \ | ||
99 | ${JDK_HOME}/lib/.debug/ \ | ||
100 | ${JDK_HOME}/lib/${JDK_ARCH}/.debug/ \ | ||
101 | ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug/ \ | ||
102 | ${JDK_HOME}/jre/bin/.debug/ \ | ||
103 | ${JDK_HOME}/jre/lib/.debug/ \ | ||
104 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/.debug/ \ | ||
105 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/jli/.debug/ \ | ||
106 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug/ \ | ||
107 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug/ \ | ||
108 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug/ \ | ||
109 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug/ \ | ||
110 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug/ \ | ||
111 | " | ||
112 | |||
113 | FILES_${JREPN}-dbg_append = "\ | ||
114 | ${JRE_HOME}/bin/.debug/ \ | ||
115 | ${JRE_HOME}/lib/.debug/ \ | ||
116 | ${JRE_HOME}/lib/${JDK_ARCH}/.debug/ \ | ||
117 | ${JRE_HOME}/lib/${JDK_ARCH}/jli/.debug/ \ | ||
118 | ${JRE_HOME}/lib/${JDK_ARCH}/server/.debug/ \ | ||
119 | " | ||
120 | |||
121 | FILES_${JDKPN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " | ||
122 | RDEPENDS_${JDKPN}-demo = " ${JDKPN} " | ||
123 | |||
124 | FILES_${JDKPN}-demo-dbg = "\ | ||
125 | ${JDK_HOME}/demo/jvmti/gctest/lib/.debug/ \ | ||
126 | ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug/ \ | ||
127 | ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug/ \ | ||
128 | ${JDK_HOME}/demo/jvmti/hprof/lib/.debug/ \ | ||
129 | ${JDK_HOME}/demo/jvmti/minst/lib/.debug/ \ | ||
130 | ${JDK_HOME}/demo/jvmti/mtrace/lib/.debug/ \ | ||
131 | ${JDK_HOME}/demo/jvmti/versionCheck/lib/.debug/ \ | ||
132 | ${JDK_HOME}/demo/jvmti/waiters/lib/.debug/ \ | ||
133 | ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug/ \ | ||
134 | " | ||
135 | |||
136 | FILES_${JDKPN}-doc_append = "\ | ||
137 | ${JDK_HOME}/man \ | ||
138 | ${JDK_HOME}/ASSEMBLY_EXCEPTION \ | ||
139 | ${JDK_HOME}/THIRD_PARTY_README \ | ||
140 | ${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ | ||
141 | ${JDK_HOME}/jre/THIRD_PARTY_README \ | ||
142 | " | ||
143 | FILES_${JREPN}-doc_append = "\ | ||
144 | ${JRE_HOME}/man \ | ||
145 | ${JRE_HOME}/ASSEMBLY_EXCEPTION \ | ||
146 | ${JRE_HOME}/THIRD_PARTY_README \ | ||
147 | " | ||
148 | |||
149 | FILES_${JDKPN}-source = " ${JDK_HOME}/src.zip " | ||
150 | |||
151 | # Even though a vm is a hard dependency it is set as RRECOMMENDS so a single vm can get uninstalled: | ||
152 | # root@beaglebone:~/java# opkg remove openjdk-7-vm-shark | ||
153 | # No packages removed. | ||
154 | # Collected errors: | ||
155 | # * print_dependents_warning: Package openjdk-7-vm-shark is depended upon by packages: | ||
156 | # * print_dependents_warning: openjdk-7-java | ||
157 | # * print_dependents_warning: These might cease to work if package openjdk-7-vm-shark is removed. | ||
158 | #RRECOMMENDS_${JDKPN}-java = "java2-vm" | ||
159 | |||
160 | # There is a symlink to a .so but this one is valid. | ||
161 | INSANE_SKIP_${JDKPN}-common = "dev-so" | ||
162 | |||
163 | FILES_${JDKPN}-doc_append = "${JDK_HOME}/man" | ||
164 | |||
165 | do_compile_append() { | ||
166 | find ${B}/images/j2sdk-image -name "*.jar" -print0 | \ | ||
167 | xargs -0 -n1 ${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/bin/pack200 --repack --effort=9 --segment-limit=-1 --modification-time=latest | ||
168 | find ${B}/images/j2re-image -name "*.jar" -print0 | \ | ||
169 | xargs -0 -n1 ${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/bin/pack200 --repack --effort=9 --segment-limit=-1 --modification-time=latest --strip-debug | ||
170 | } | ||
171 | |||
172 | do_install_jdk() { | ||
173 | rm -rf ${D}${JDK_HOME} | ||
174 | mkdir -p ${D}${JDK_HOME} | ||
175 | cp -rp ${B}/images/j2sdk-image/* ${D}${JDK_HOME} | ||
176 | install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/ | ||
177 | find ${D}${JDK_HOME} -name "*.debuginfo" -print0 | xargs -0 rm | ||
178 | } | ||
179 | |||
180 | do_install_jre() { | ||
181 | rm -rf ${D}${JRE_HOME} | ||
182 | mkdir -p ${D}${JRE_HOME} | ||
183 | cp -rp ${B}/images/j2re-image/* ${D}${JRE_HOME} | ||
184 | install -m644 ${WORKDIR}/jvm.cfg ${D}${JRE_HOME}/lib/${JDK_ARCH}/ | ||
185 | find ${D}${JRE_HOME} -name "*.debuginfo" -print0 | xargs -0 rm | ||
186 | } | ||
187 | |||
188 | inherit update-alternatives | ||
189 | |||
190 | ALTERNATIVE_${JDKPN} = "java" | ||
191 | ALTERNATIVE_TARGET_${JDKPN} = "${JDK_HOME}/bin/java" | ||
192 | |||
193 | ALTERNATIVE_${JREPN} = "java" | ||
194 | ALTERNATIVE_TARGET_${JREPN} = "${JRE_HOME}/bin/java" | ||
195 | |||
196 | ALTERNATIVE_${JDKPN}-jdk = "javac" | ||
197 | ALTERNATIVE_TARGET_${JDKPN}-jdk = "${JDK_HOME}/bin/javac" | ||
198 | |||
199 | ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" | ||
200 | ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac" | ||