diff options
| -rw-r--r-- | recipes-core/openjdk/openjdk-8-cross.inc | 133 | ||||
| -rw-r--r-- | recipes-core/openjdk/openjdk-8_72b05.bb | 93 | ||||
| -rw-r--r-- | recipes-core/openjdk/openjre-8_72b05.bb | 46 |
3 files changed, 122 insertions, 150 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" | ||
diff --git a/recipes-core/openjdk/openjdk-8_72b05.bb b/recipes-core/openjdk/openjdk-8_72b05.bb index 4c8899e..96473f5 100644 --- a/recipes-core/openjdk/openjdk-8_72b05.bb +++ b/recipes-core/openjdk/openjdk-8_72b05.bb | |||
| @@ -11,26 +11,97 @@ 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/j2sdk-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 | ||
| 17 | } | ||
| 18 | |||
| 14 | do_install() { | 19 | do_install() { |
| 15 | do_install_jdk | 20 | rm -rf ${D}${JDK_HOME} |
| 21 | mkdir -p ${D}${JDK_HOME} | ||
| 22 | cp -rp ${B}/images/j2sdk-image/* ${D}${JDK_HOME} | ||
| 23 | install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/ | ||
| 24 | find ${D}${JDK_HOME} -name "*.debuginfo" -print0 | xargs -0 rm | ||
| 16 | } | 25 | } |
| 17 | 26 | ||
| 18 | PACKAGES_append = " \ | 27 | PACKAGES_append = " \ |
| 19 | ${JDKPN}-demo-dbg \ | 28 | ${PN}-demo-dbg \ |
| 20 | ${JDKPN}-demo \ | 29 | ${PN}-demo \ |
| 21 | ${JDKPN}-source \ | 30 | ${PN}-source \ |
| 31 | " | ||
| 32 | |||
| 33 | FILES_${PN}_append = "\ | ||
| 34 | ${JDK_HOME}/bin/[a-z]* \ | ||
| 35 | ${JDK_HOME}/lib/[a-z]* \ | ||
| 36 | ${JDK_HOME}/jre/bin/[a-z]* \ | ||
| 37 | ${JDK_HOME}/jre/lib/[a-z]* \ | ||
| 38 | ${JDK_HOME}/LICENSE \ | ||
| 39 | ${JDK_HOME}/jre/LICENSE \ | ||
| 40 | ${JDK_HOME}/release \ | ||
| 41 | " | ||
| 42 | |||
| 43 | FILES_${PN}-dev_append = "\ | ||
| 44 | ${JDK_HOME}/include \ | ||
| 45 | " | ||
| 46 | |||
| 47 | FILES_${PN}-dbg_append = "\ | ||
| 48 | ${JDK_HOME}/bin/.debug/ \ | ||
| 49 | ${JDK_HOME}/lib/.debug/ \ | ||
| 50 | ${JDK_HOME}/lib/${JDK_ARCH}/.debug/ \ | ||
| 51 | ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug/ \ | ||
| 52 | ${JDK_HOME}/jre/bin/.debug/ \ | ||
| 53 | ${JDK_HOME}/jre/lib/.debug/ \ | ||
| 54 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/.debug/ \ | ||
| 55 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/jli/.debug/ \ | ||
| 56 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug/ \ | ||
| 57 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug/ \ | ||
| 58 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug/ \ | ||
| 59 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug/ \ | ||
| 60 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug/ \ | ||
| 22 | " | 61 | " |
| 23 | 62 | ||
| 24 | RPROVIDES_${JDKPN} = "java2-vm" | 63 | FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " |
| 25 | PROVIDES_${JDKPN} = "java2-vm" | 64 | RDEPENDS_${PN}-demo = " ${PN} " |
| 26 | RPROVIDES_${JDKPN} = "java2-runtime" | 65 | |
| 27 | PROVIDES_${JDKPN} = "java2-runtime" | 66 | FILES_${PN}-demo-dbg = "\ |
| 67 | ${JDK_HOME}/demo/jvmti/gctest/lib/.debug/ \ | ||
| 68 | ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug/ \ | ||
| 69 | ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug/ \ | ||
| 70 | ${JDK_HOME}/demo/jvmti/hprof/lib/.debug/ \ | ||
| 71 | ${JDK_HOME}/demo/jvmti/minst/lib/.debug/ \ | ||
| 72 | ${JDK_HOME}/demo/jvmti/mtrace/lib/.debug/ \ | ||
| 73 | ${JDK_HOME}/demo/jvmti/versionCheck/lib/.debug/ \ | ||
| 74 | ${JDK_HOME}/demo/jvmti/waiters/lib/.debug/ \ | ||
| 75 | ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug/ \ | ||
| 76 | " | ||
| 77 | |||
| 78 | FILES_${PN}-doc_append = "\ | ||
| 79 | ${JDK_HOME}/man \ | ||
| 80 | ${JDK_HOME}/ASSEMBLY_EXCEPTION \ | ||
| 81 | ${JDK_HOME}/THIRD_PARTY_README \ | ||
| 82 | ${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ | ||
| 83 | ${JDK_HOME}/jre/THIRD_PARTY_README \ | ||
| 84 | ${JDK_HOME}/man \ | ||
| 85 | " | ||
| 86 | |||
| 87 | FILES_${PN}-source = " ${JDK_HOME}/src.zip " | ||
| 88 | |||
| 89 | RPROVIDES_${PN} = "java2-vm" | ||
| 90 | PROVIDES_${PN} = "java2-vm" | ||
| 91 | RPROVIDES_${PN} = "java2-runtime" | ||
| 92 | PROVIDES_${PN} = "java2-runtime" | ||
| 28 | 93 | ||
| 29 | inherit update-alternatives | 94 | inherit update-alternatives |
| 30 | 95 | ||
| 31 | ALTERNATIVE_${PN} = "java" | ||
| 32 | ALTERNATIVE_LINK = "${bindir}/java" | ||
| 33 | ALTERNATIVE_TARGET = "${JDK_HOME}/bin/java" | ||
| 34 | ALTERNATIVE_PRIORITY = "100" | 96 | ALTERNATIVE_PRIORITY = "100" |
| 35 | 97 | ||
| 98 | ALTERNATIVE_${PN} = "java" | ||
| 99 | ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" | ||
| 100 | ALTERNATIVE_TARGET[java] = "${JDK_HOME}/bin/java" | ||
| 101 | |||
| 102 | ALTERNATIVE_${PN}-jdk = "javac" | ||
| 103 | ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac" | ||
| 104 | ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac" | ||
| 105 | |||
| 106 | |||
| 36 | # PR = "${INC_PR}.1" | 107 | # PR = "${INC_PR}.1" |
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" |
