[oe] [meta-java][PATCH] openjdk-8: fix the alternative for javac
jackie.huang at windriver.com
jackie.huang at windriver.com
Wed Dec 30 07:14:11 UTC 2015
From: Jackie Huang <jackie.huang at windriver.com>
* ${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 at windriver.com>
---
recipes-core/openjdk/openjdk-8_72b05.bb | 6 +-----
recipes-core/openjdk/openjre-8_72b05.bb | 2 --
2 files changed, 1 insertion(+), 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
ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE_${PN} = "java"
+ALTERNATIVE_${PN} = "java javac"
ALTERNATIVE_LINK_NAME[java] = "${bindir}/java"
ALTERNATIVE_TARGET[java] = "${JDK_HOME}/bin/java"
-ALTERNATIVE_${PN}-jdk = "javac"
ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac"
ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac"
-
-
-# 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"
ALTERNATIVE_LINK_NAME[java] = "${bindir}/java"
ALTERNATIVE_TARGET[java] = "${JRE_HOME}/bin/java"
ALTERNATIVE_PRIORITY[java] = "100"
-
-# PR = "${INC_PR}.1"
--
2.3.5
More information about the Openembedded-devel
mailing list