[oe-commits] Tom Rini : openjdk-6: Switch to libc-uclibc
git version control
git at git.openembedded.org
Wed Jan 19 01:08:07 UTC 2011
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 22ca95a9cb89289474c8cacb14ac7cce6c0c333d
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=22ca95a9cb89289474c8cacb14ac7cce6c0c333d
Author: Tom Rini <tom_rini at mentor.com>
Date: Tue Jan 18 18:00:21 2011 -0700
openjdk-6: Switch to libc-uclibc
Signed-off-by: Tom Rini <tom_rini at mentor.com>
---
recipes/openjdk/openjdk-6-release-6b18.inc | 25 ++-----------------------
recipes/openjdk/openjdk-6_6b18-1.8.bb | 2 +-
2 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/recipes/openjdk/openjdk-6-release-6b18.inc b/recipes/openjdk/openjdk-6-release-6b18.inc
index f094d95..97a0a27 100644
--- 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
--- 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"
More information about the Openembedded-commits
mailing list