openjdk-6: Switch to libc-uclibc

Signed-off-by: Tom Rini <tom_rini@mentor.com>

diff --git a/recipes/openjdk/openjdk-6-release-6b18.inc b/recipes/openjdk/openjdk-6-release-6b18.inc
index f094d95..97a0a27 100644 (file)
--- a/recipes/openjdk/openjdk-6-release-6b18.inc
+++ b/recipes/openjdk/openjdk-6-release-6b18.inc
@@ -61,7 +61,7 @@ ICEDTEAPATCHES = "\
         file://icedtea-libnet-renaming.patch;apply=no \
        "
 
-ICEDTEAPATCHES_append_linux-uclibc = " \
+ICEDTEAPATCHES_append_libc-uclibc = " \
         file://icedtea-hotspot-isfinte.patch;apply=no \
         file://icedtea-hotspot-glibc-version.patch;apply=no \
         file://icedtea-hotspot-loadavg.patch;apply=no \
@@ -72,17 +72,6 @@ ICEDTEAPATCHES_append_linux-uclibc = " \
         file://icedtea-jdk-unpack-uclibc.patch;apply=no \
         "
 
-ICEDTEAPATCHES_append_linux-uclibceabi = " \
-        file://icedtea-hotspot-isfinte.patch;apply=no \
-        file://icedtea-hotspot-isnanf.patch;apply=no \
-        file://icedtea-hotspot-glibc-version.patch;apply=no \
-        file://icedtea-hotspot-loadavg.patch;apply=no \
-        file://icedtea-jdk-iconv-uclibc.patch;apply=no \
-        file://icedtea-jdk-remove-unused-backtrace.patch;apply=no \
-        file://icedtea-jdk-RTLD_NOLOAD.patch;apply=no \
-        file://icedtea-jdk-unpack-uclibc.patch;apply=no \
-        "
-
 # Allow overriding this separately
 DISTRIBUTION_PATCHES = "\
        patches/icedtea-launcher-stdc++.patch \
@@ -95,17 +84,7 @@ DISTRIBUTION_PATCHES = "\
         patches/icedtea-libnet-renaming.patch \
        "
 
-DISTRIBUTION_PATCHES_append_linux-uclibc = "\
-        patches/icedtea-hotspot-isfinte.patch \
-        patches/icedtea-hotspot-isnanf.patch \
-        patches/icedtea-hotspot-glibc-version.patch \
-        patches/icedtea-hotspot-loadavg.patch \
-        patches/icedtea-jdk-iconv-uclibc.patch \
-        patches/icedtea-jdk-remove-unused-backtrace.patch \
-        patches/icedtea-jdk-RTLD_NOLOAD.patch \
-        patches/icedtea-jdk-unpack-uclibc.patch \
-        "
-DISTRIBUTION_PATCHES_append_linux-uclibceabi = "\
+DISTRIBUTION_PATCHES_append_libc-uclibc = "\
         patches/icedtea-hotspot-isfinte.patch \
         patches/icedtea-hotspot-isnanf.patch \
         patches/icedtea-hotspot-glibc-version.patch \

diff --git a/recipes/openjdk/openjdk-6_6b18-1.8.bb b/recipes/openjdk/openjdk-6_6b18-1.8.bb
index 3d1adcf..6064248 100644 (file)
--- a/recipes/openjdk/openjdk-6_6b18-1.8.bb
+++ b/recipes/openjdk/openjdk-6_6b18-1.8.bb
@@ -1,3 +1,3 @@
 require openjdk-6-release-6b18.inc
 
-PR = "${INC_PR}.7"
+PR = "${INC_PR}.8"