Pull request for openjdk-6 and bug20 changes

---
 .../icedtea-crosscompile-fix.patch                 |   24 ++++++++++---------
 recipes/openjdk/openjdk-6-common.inc               |    8 +-----
 2 files changed, 14 insertions(+), 18 deletions(-)

recipes/openjdk/openjdk-6-6b18-1.8/icedtea-crosscompile-fix.patch +13 ~~-11~~

index ec0f259..652f7ac 100644
@@ -73,17 +73,6 @@ Index: openjdk/jdk/make/sun/xawt/Makefile
  endif
  
  ifeq ($(PLATFORM), solaris)
-@@ -237,7 +238,9 @@
- 	$(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \
- 	    $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@)))
- 
--$(SIZES): $(SIZERS)
-+#$(SIZES): $(SIZERS)
-+# Prevent binaries being created. Instead take what is available.
-+$(SIZES):
- 	@if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
- 	    $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
- 	    $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
 Index: openjdk/hotspot/make/linux/makefiles/vm.make
 ===================================================================
 --- openjdk.orig/hotspot/make/linux/makefiles/vm.make	2009-01-24 17:54:57.000000000 +0100

@@ -212,3 +201,16 @@ Index: openjdk/hotspot/make/linux/makefiles/launcher.make
    LIBS_LAUNCHER             += -l$(JVM) $(LIBS) -lstdc++
  endif
  
+Index: icedtea6-1.8.5/build/openjdk/jdk/make/sun/xawt/Makefile
+===================================================================
+--- openjdk/jdk/make/sun/xawt/Makefile	2011-03-14 14:17:03.926207269 +0100
++++ openjdk/jdk/make/sun/xawt/Makefile	2011-03-14 14:30:11.956186631 +0100
+@@ -245,7 +245,7 @@
+ 	    $(CHMOD) +w $@;\
+ 	else	\
+ 	    $(ECHO) GENERATING $@; \
+-	    $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
++	    $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
+ 	fi
+ 	@if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
+ 	    $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \

recipes/openjdk/openjdk-6-common.inc +1 -7

index f04800b..54c45f8 100644
@@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET"
 S = "${WORKDIR}/${ICEDTEA}"
 B = "${S}/build"
 
-INC_PR = "r10"
+INC_PR = "r11"
 
 SRC_URI = "\
   ${ICEDTEA_URI} \

@@ -288,12 +288,6 @@ addtask compilestepone after do_configure before do_compilesteptwo
 do_compilesteptwo() {
 	echo "2/3 Building bootstrap JDK"
 
-	# Take pre-generated binaries from -native build
-	install -d generated/sun/awt/X11/generator
-	ln -sf ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/generated/sizer.32 generated/sun/awt/X11/generator/sizer.32
-	install -d openjdk/${BUILD_DIR}/gensrc/sun/awt/X11/generator
-	ln -sf ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/generated/sizer.32 openjdk/${BUILD_DIR}/gensrc/sun/awt/X11/generator/sizer.32
-
 	# Now cross-compile bootstrap JDK
 	rm stamps/icedtea-against-ecj.stamp stamps/icedtea-ecj.stamp || true
 	oe_runmake icedtea-against-ecj

Signature · 1 line

1.7.4.1

Stefan Schmidt

author

2011-03-24 15:11 UTC #2 lore raw

PATCH 2/7 cacao-hg: update to latest revision

From: Henning Heinold <[email protected]>

---
 recipes/cacao/cacao-native_hg.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

recipes/cacao/cacao-native_hg.bb +1 -1

index 0f0df64..6ece8dd 100644
@@ -3,7 +3,7 @@ require cacao-native.inc
 PV = "1.1.0+hgr${SRCPV}"
 PR = "r2"
 
-SRCREV = "1ac977fe271c"
+SRCREV = "c7bf150bfa46"
 SRC_URI = "hg://mips.complang.tuwien.ac.at/hg/;module=cacao;rev=${SRCREV}"
 
 S = "${WORKDIR}/cacao"

Signature · 1 line

1.7.4.1

Stefan Schmidt

author

2011-03-24 15:11 UTC #3 lore raw

PATCH 3/7 icedtea6-native: update to 1.7.10 version

From: Henning Heinold <[email protected]>

* remove sizer.patch we will use qemu on openjdk
* delete 1.7.6 recipe for security reasons
* update angstroem-jalimo to prefer 1.7.10

Acked-by Koen Kooi <[email protected]>

---
 conf/distro/include/angstrom-jalimo.conf           |    2 +-
 .../build-hacks-native.patch                       |    0
 .../disable-library-checks.patch                   |    0
 .../icedtea-ecj-disable-compilation.patch          |    0
 .../icedtea-ecj-fix-freetype.patch                 |    0
 .../icedtea-ecj-fix-zlib.patch                     |    0
 .../icedtea-fix-jar-path.patch                     |    0
 .../icedtea-hotspot-make-arch-sane-for-x86.patch   |    0
 .../icedtea-javac-in.patch                         |    0
 .../icedtea-jdk-sane-x86-arch.patch                |    0
 .../icedtea-sane-x86-arch-name.patch               |    0
 .../icedtea-unbreak-float.patch                    |    0
 .../icedtea-jdk-build-sizer-32-on-amd64.patch      |   36 --------------------
 ...6-native_1.7.6.bb => icedtea6-native_1.7.10.bb} |    5 +--
 14 files changed, 3 insertions(+), 40 deletions(-)
 rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/build-hacks-native.patch (100%)
 rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/disable-library-checks.patch (100%)
 rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-ecj-disable-compilation.patch (100%)
 rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-ecj-fix-freetype.patch (100%)
 rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-ecj-fix-zlib.patch (100%)
 rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-fix-jar-path.patch (100%)
 rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-hotspot-make-arch-sane-for-x86.patch (100%)
 rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-javac-in.patch (100%)
 rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-jdk-sane-x86-arch.patch (100%)
 rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-sane-x86-arch-name.patch (100%)
 rename recipes/icedtea/{icedtea6-native-1.7.6 => icedtea6-native-1.7.10}/icedtea-unbreak-float.patch (100%)
 delete mode 100644 recipes/icedtea/icedtea6-native-1.7.6/icedtea-jdk-build-sizer-32-on-amd64.patch
 rename recipes/icedtea/{icedtea6-native_1.7.6.bb => icedtea6-native_1.7.10.bb} (86%)

conf/distro/include/angstrom-jalimo.conf +1 -1

index 9ba4c70..e116053 100644
@@ -23,7 +23,7 @@ PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
 PREFERRED_PROVIDER_classpath = "classpath"
 
 PREFERRED_VERSION_openjdk-6-jre = "6b18-1.8.5"
-PREFERRED_VERSION_icedtea6-native = "1.7.6"
+PREFERRED_VERSION_icedtea6-native = "1.7.10"
 
 # Stage JAR files not into ARCH related dirs
 STAGING_DIR_JAVA = "${STAGING_DIR}/java"

recipes/icedtea/icedtea6-native-1.7.10/build-hacks-native.patch renamed from recipes/icedtea/icedtea6-native-1.7.6/build-hacks-native.patch +0 -0

similarity index 100%
rename from recipes/icedtea/icedtea6-native-1.7.6/build-hacks-native.patch
rename to recipes/icedtea/icedtea6-native-1.7.10/build-hacks-native.patch

recipes/icedtea/icedtea6-native-1.7.10/disable-library-checks.patch renamed from recipes/icedtea/icedtea6-native-1.7.6/disable-library-checks.patch +0 -0

similarity index 100%
rename from recipes/icedtea/icedtea6-native-1.7.6/disable-library-checks.patch
rename to recipes/icedtea/icedtea6-native-1.7.10/disable-library-checks.patch

recipes/icedtea/icedtea6-native-1.7.10/icedtea-ecj-disable-compilation.patch renamed from recipes/icedtea/icedtea6-native-1.7.6/icedtea-ecj-disable-compilation.patch +0 -0

similarity index 100%
rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-ecj-disable-compilation.patch
rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-ecj-disable-compilation.patch

recipes/icedtea/icedtea6-native-1.7.10/icedtea-ecj-fix-freetype.patch renamed from recipes/icedtea/icedtea6-native-1.7.6/icedtea-ecj-fix-freetype.patch +0 -0

similarity index 100%
rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-ecj-fix-freetype.patch
rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-ecj-fix-freetype.patch

recipes/icedtea/icedtea6-native-1.7.10/icedtea-ecj-fix-zlib.patch renamed from recipes/icedtea/icedtea6-native-1.7.6/icedtea-ecj-fix-zlib.patch +0 -0

similarity index 100%
rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-ecj-fix-zlib.patch
rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-ecj-fix-zlib.patch

recipes/icedtea/icedtea6-native-1.7.10/icedtea-fix-jar-path.patch renamed from recipes/icedtea/icedtea6-native-1.7.6/icedtea-fix-jar-path.patch +0 -0

similarity index 100%
rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-fix-jar-path.patch
rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-fix-jar-path.patch

recipes/icedtea/icedtea6-native-1.7.10/icedtea-hotspot-make-arch-sane-for-x86.patch renamed from recipes/icedtea/icedtea6-native-1.7.6/icedtea-hotspot-make-arch-sane-for-x86.patch +0 -0

similarity index 100%
rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-hotspot-make-arch-sane-for-x86.patch
rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-hotspot-make-arch-sane-for-x86.patch

recipes/icedtea/icedtea6-native-1.7.10/icedtea-javac-in.patch renamed from recipes/icedtea/icedtea6-native-1.7.6/icedtea-javac-in.patch +0 -0

similarity index 100%
rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-javac-in.patch
rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-javac-in.patch

recipes/icedtea/icedtea6-native-1.7.10/icedtea-jdk-sane-x86-arch.patch renamed from recipes/icedtea/icedtea6-native-1.7.6/icedtea-jdk-sane-x86-arch.patch +0 -0

similarity index 100%
rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-jdk-sane-x86-arch.patch
rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-jdk-sane-x86-arch.patch

recipes/icedtea/icedtea6-native-1.7.10/icedtea-sane-x86-arch-name.patch renamed from recipes/icedtea/icedtea6-native-1.7.6/icedtea-sane-x86-arch-name.patch +0 -0

similarity index 100%
rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-sane-x86-arch-name.patch
rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-sane-x86-arch-name.patch

recipes/icedtea/icedtea6-native-1.7.10/icedtea-unbreak-float.patch renamed from recipes/icedtea/icedtea6-native-1.7.6/icedtea-unbreak-float.patch +0 -0

similarity index 100%
rename from recipes/icedtea/icedtea6-native-1.7.6/icedtea-unbreak-float.patch
rename to recipes/icedtea/icedtea6-native-1.7.10/icedtea-unbreak-float.patch

recipes/icedtea/icedtea6-native-1.7.6/icedtea-jdk-build-sizer-32-on-amd64.patch deleted +0 ~~-36~~

deleted file mode 100644
index 3baeb5d..0000000
@@ -1,36 +0,0 @@
-Build the xawt sizer.32 binary on Linux/x86_64 so we can use it when
-compiling openjdk for 32-bit platforms.
-
---- openjdk/jdk/make/sun/xawt/Makefile.orig	2011-01-08 01:53:22.000000000 -0500
-+++ openjdk/jdk/make/sun/xawt/Makefile	2011-01-11 15:12:17.000000000 -0500
-@@ -184,6 +184,22 @@
- 
- else # !solaris
- 
-+ifeq ($(PLATFORM), linux)
-+
-+ifeq ($(ARCH), amd64)
-+# On amd64 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL.
-+SIZERS = $(SIZER).32 $(SIZER).64
-+SIZERS_C = $(SIZER_32_C) $(SIZER_64_C)
-+SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 $(WRAPPER_GENERATOR_DIR)/sizes.64
-+CFLAGS_32 = $(CFLAGS) -m32
-+else # !amd64
-+SIZERS = $(SIZER).32
-+SIZERS_C = $(SIZER_32_C)
-+SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
-+endif # amd64
-+
-+else # !linux
-+
- ifeq ($(ARCH_DATA_MODEL), 32)
- SIZERS = $(SIZER).32
- SIZERS_C = $(SIZER_32_C)
-@@ -194,6 +210,7 @@
- SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
- endif # 32
- 
-+endif # linux
- endif # solaris
- 
- # XXX Hack for 6185483 - use hard-coded sizes.

recipes/icedtea/icedtea6-native_1.7.10.bb renamed from recipes/icedtea/icedtea6-native_1.7.6.bb +2 -3

similarity index 86%
rename from recipes/icedtea/icedtea6-native_1.7.6.bb
rename to recipes/icedtea/icedtea6-native_1.7.10.bb
index 126f2f4..c55e197 100644
@@ -14,8 +14,8 @@ SRC_URI = "\
 	"
 SRC_URI[ojdk.md5sum] = "078fe0ab744c98694decc77f2456c560"
 SRC_URI[ojdk.sha256sum] = "2019a4c3d2d14620caa78d7df49fd987a041066b4631bde4fd8424033f3c1785"
-SRC_URI[iced.md5sum] = "0a865e883987665ffcb34db9dd9b35c2"
-SRC_URI[iced.sha256sum] = "b28c8bd39d9bd8a28efaaa38280288a3faa6bec0d756323c0555ad3d8c5d77f5"
+SRC_URI[iced.md5sum] = "0d61041e46253d089f1b30114716012d"
+SRC_URI[iced.sha256sum] = "dbca9d7598352d178651c8cc28ff887c59a27f0125785a58e9f9723611137f78"
 
 ICEDTEA_PATCHES = "\
 	file://icedtea-ecj-disable-compilation.patch;apply=no \

@@ -24,7 +24,6 @@ ICEDTEA_PATCHES = "\
 	file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \
 	file://icedtea-jdk-sane-x86-arch.patch;apply=no \
 	file://icedtea-unbreak-float.patch;apply=no \
-	file://icedtea-jdk-build-sizer-32-on-amd64.patch;apply=no \
 	"
 
 export DISTRIBUTION_PATCHES = "\

Signature · 1 line

1.7.4.1

Stefan Schmidt

author

2011-03-24 15:11 UTC #4 lore raw

PATCH 4/7 cacao-native: bumpg PR as sugessted by khem

From: Henning Heinold <[email protected]>

---
 recipes/cacao/cacao-native_hg.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

recipes/cacao/cacao-native_hg.bb +1 -1

index 6ece8dd..82f56eb 100644
@@ -1,7 +1,7 @@
 require cacao-native.inc
 
 PV = "1.1.0+hgr${SRCPV}"
-PR = "r2"
+PR = "r3"
 
 SRCREV = "c7bf150bfa46"
 SRC_URI = "hg://mips.complang.tuwien.ac.at/hg/;module=cacao;rev=${SRCREV}"

Signature · 1 line

1.7.4.1

Stefan Schmidt

author

2011-03-24 15:11 UTC #5 lore raw

PATCH 5/7 angstrom-jalimo: use cacao-native hg version for javac-native

From: Henning Heinold <[email protected]>

* build java packages is more stable than with jamvm

Acked-by Koen Kooi <[email protected]>

---
 conf/distro/include/angstrom-jalimo.conf |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

conf/distro/include/angstrom-jalimo.conf +2 -3

index e116053..48727c4 100644
@@ -5,9 +5,8 @@ PREFERRED_VERSION_jamvm-initial = "1.4.5"
 PREFERRED_VERSION_classpath-initial = "0.93"
 
 # Native VM
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
-PREFERRED_VERSION_jamvm-native = "1.5.3"
-#PREFERRED_VERSION_cacao-native = "0.99.3"
+PREFERRED_PROVIDER_virtual/java-native ?= "cacao-native"
+SRCREV_pn-cacao-native ?= "c7bf150bfa46"
 PREFERRED_VERSION_classpath-native = "0.98"
 
 # Native compiler settings

Signature · 1 line

1.7.4.1

Stefan Schmidt

author

2011-03-24 15:11 UTC #6 lore raw

PATCH 6/7 sane-toolchain-java: switch to cacao-native here too

From: Henning Heinold <[email protected]>

---
 conf/distro/include/sane-toolchain-java.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

conf/distro/include/sane-toolchain-java.inc +2 -2

index a0f5792..365a3d6 100644
@@ -1,6 +1,6 @@
 # Set PREFFERED and VERSION stuff for working java-toolchain
 
-PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial"
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
+PREFERRED_PROVIDER_virtual/java-initial ?= "jamvm-initial"
+PREFERRED_PROVIDER_virtual/java-native ?= "cacao-native"
 PREFERRED_VERSION_classpath-native = "0.98"
 PREFERRED_VERSION_classpath = "0.98"

Signature · 1 line

1.7.4.1

Stefan Schmidt

author

2011-03-24 15:11 UTC #7 lore raw

PATCH 7/7 bug20: add wifi and bluetooth to MACHINE_FEATURES

From: Denis Carikli <[email protected]>

Signed-off-by Denis 'GNUtoo' Carikli <[email protected]>

Acked-by Stefan Schmidt <[email protected]>

---
 conf/machine/bug20.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

conf/machine/bug20.conf +1 -1

index a9441bd..95ce49c 100644
@@ -47,7 +47,7 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 PREFERRED_VERSION_u-boot = "git"
 
 # and sdio
-MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa wifi bluetooth"
 
 # We don't provide a bug20 x-load config yet
 XLOAD_MACHINE = "omap3530beagle_config"

Signature · 1 line

1.7.4.1

Tom Rini

Applied

2011-03-24 16:38 UTC #8 lore raw