aboutsummaryrefslogtreecommitdiff
path: root/meta-aarch64
diff options
context:
space:
mode:
authorAndrew McDermott <andrew.mcdermott@linaro.org>2013-08-05 10:42:31 +0100
committerAndrew McDermott <andrew.mcdermott@linaro.org>2013-08-05 10:42:45 +0100
commitb59a7047d8c477536888cecb107a41762972c400 (patch)
treeb68b804204f7503ba40e2291ac7b8086ebe3db78 /meta-aarch64
parent920b51f95dea45ffa823c4abff72a59aade99650 (diff)
Revert "aarch64: openjdk-8: add openjdk-7 as dependency"
This reverts commit 35b751f6802713f015b31c3012d545656c94365b. Conflicts: meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc Signed-off-by: Andrew McDermott <andrew.mcdermott@linaro.org>
Diffstat (limited to 'meta-aarch64')
-rw-r--r--meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc b/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc
index d7c42a85..1d5be863 100644
--- a/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc
+++ b/meta-aarch64/recipes-core/openjdk/openjdk-8-common.inc
@@ -6,7 +6,7 @@ SECTION = "libs"
INHIBIT_PACKAGE_STRIP = "1"
#INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INC_PR = "r9"
+INC_PR = "r10"
SRC_URI = " \
${OPENJDK_URI} \
@@ -22,7 +22,7 @@ PN = "${JDKPN}-jre"
PROVIDES += "${JDKPN}"
DEPENDS = " \
- openjdk-7-jre icedtea7-native \
+ icedtea7-native \
zip-native \
zlib \
jpeg libpng giflib \