diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2015-12-30 15:14:11 +0800 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-01-04 09:22:08 -0200 |
commit | 3f634889bc81bcb928e5669631d094df79d14cae (patch) | |
tree | 3f5ba357e5007aad79d0980204693662ef77cab4 | |
parent | 1f7db1fce7b141811de90662407525619fefa29f (diff) | |
download | meta-java-3f634889bc81bcb928e5669631d094df79d14cae.tar.gz |
openjdk-8: fix the alternative for javac
* ${PN}-jdk doesn't exist at all so the alternative
for javac is invalid.
* remove the useless commented lines as well.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | recipes-core/openjdk/openjdk-8_72b05.bb | 6 | ||||
-rw-r--r-- | recipes-core/openjdk/openjre-8_72b05.bb | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/recipes-core/openjdk/openjdk-8_72b05.bb b/recipes-core/openjdk/openjdk-8_72b05.bb index d962b1f..e0a786a 100644 --- a/recipes-core/openjdk/openjdk-8_72b05.bb +++ b/recipes-core/openjdk/openjdk-8_72b05.bb | |||
@@ -96,13 +96,9 @@ inherit update-alternatives | |||
96 | 96 | ||
97 | ALTERNATIVE_PRIORITY = "100" | 97 | ALTERNATIVE_PRIORITY = "100" |
98 | 98 | ||
99 | ALTERNATIVE_${PN} = "java" | 99 | ALTERNATIVE_${PN} = "java javac" |
100 | ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" | 100 | ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" |
101 | ALTERNATIVE_TARGET[java] = "${JDK_HOME}/bin/java" | 101 | ALTERNATIVE_TARGET[java] = "${JDK_HOME}/bin/java" |
102 | 102 | ||
103 | ALTERNATIVE_${PN}-jdk = "javac" | ||
104 | ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac" | 103 | ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac" |
105 | ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac" | 104 | ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac" |
106 | |||
107 | |||
108 | # PR = "${INC_PR}.1" | ||
diff --git a/recipes-core/openjdk/openjre-8_72b05.bb b/recipes-core/openjdk/openjre-8_72b05.bb index f99d25b..6202498 100644 --- a/recipes-core/openjdk/openjre-8_72b05.bb +++ b/recipes-core/openjdk/openjre-8_72b05.bb | |||
@@ -57,5 +57,3 @@ ALTERNATIVE_${PN} = "java" | |||
57 | ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" | 57 | ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" |
58 | ALTERNATIVE_TARGET[java] = "${JRE_HOME}/bin/java" | 58 | ALTERNATIVE_TARGET[java] = "${JRE_HOME}/bin/java" |
59 | ALTERNATIVE_PRIORITY[java] = "100" | 59 | ALTERNATIVE_PRIORITY[java] = "100" |
60 | |||
61 | # PR = "${INC_PR}.1" | ||