diff options
-rw-r--r-- | recipes-core/openjdk/openjdk-6-common.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc index bdc97d8..f38e3b6 100644 --- a/recipes-core/openjdk/openjdk-6-common.inc +++ b/recipes-core/openjdk/openjdk-6-common.inc | |||
@@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET" | |||
10 | S = "${WORKDIR}/${ICEDTEA}" | 10 | S = "${WORKDIR}/${ICEDTEA}" |
11 | B = "${S}/build" | 11 | B = "${S}/build" |
12 | 12 | ||
13 | INC_PR = "r14" | 13 | INC_PR = "r15" |
14 | 14 | ||
15 | SRC_URI = "\ | 15 | SRC_URI = "\ |
16 | ${ICEDTEA_URI} \ | 16 | ${ICEDTEA_URI} \ |
@@ -117,8 +117,8 @@ def get_jdk_arch(d): | |||
117 | jdk_arch = bb.data.getVar('TARGET_ARCH', d, 1) | 117 | jdk_arch = bb.data.getVar('TARGET_ARCH', d, 1) |
118 | if jdk_arch == "x86_64": | 118 | if jdk_arch == "x86_64": |
119 | jdk_arch = "amd64" | 119 | jdk_arch = "amd64" |
120 | elif (jdk_arch == "i586" or jdk_arch == "i686"): | 120 | elif (jdk_arch == "i486" or jdk_arch == "i586" or jdk_arch == "i686"): |
121 | jdk_arch = "i586" | 121 | jdk_arch = "i386" |
122 | 122 | ||
123 | return jdk_arch | 123 | return jdk_arch |
124 | 124 | ||