Skip to contentSkip to conversation

openjdk: fix problem on build hosts with linux kernel 3.x

PATCH Applied Steffen Sledz 1 participant 2 messages Dec 12, 2011 – Dec 14, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 openjdk: fix problem on build hosts with linux kernel 3.x

see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7072341

---
 recipes/openjdk/openjdk-6-common.inc |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
recipes/openjdk/openjdk-6-common.inc +8 -1
index 54c45f8..59a7a56 100644
@@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET"
 S = "${WORKDIR}/${ICEDTEA}"
 B = "${S}/build"
 
-INC_PR = "r11"
+INC_PR = "r12"
 
 SRC_URI = "\
   ${ICEDTEA_URI} \
@@ -208,6 +208,13 @@ do_configure_prepend() {
 
 do_configure_append() {
 	oe_runmake patch-ecj
+
+	for F in ${WORKDIR}/openjdk-src-dir/hotspot/make/linux/Makefile ${WORKDIR}/icedtea6-1.8.5/build/openjdk-ecj/hotspot/make/linux/Makefile ${WORKDIR}/icedtea6-1.8.5/build/openjdk/hotspot/make/linux/Makefile ;
+	do
+		sed -i \
+			-e"s|SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%|SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%|" \
+			$F
+	done
 }
 
 # Work around broken variable quoting in oe-stable 2009 and provide the variable
Signature · 1 line
1.7.5.4
author Applied
#1 lore raw
Quoted 24 lines · Steffen Sledz

see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7072341

---
 recipes/openjdk/openjdk-6-common.inc |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
recipes/openjdk/openjdk-6-common.inc +1 -1
index 54c45f8..59a7a56 100644
@@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET"
 S = "${WORKDIR}/${ICEDTEA}"
 B = "${S}/build"
 
-INC_PR = "r11"
+INC_PR = "r12"
 
 SRC_URI = "\
   ${ICEDTEA_URI} \
@@ -208,6 +208,13 @@ do_configure_prepend() {
 
 do_configure_append() {
 	oe_runmake patch-ecj

recipes/openjdk/openjdk-6-common.inc do_configure_prepend() { · line 220

Quoted 10 lines
recipes/openjdk/openjdk-6-common.inc +7 -0
+
+	for F in ${WORKDIR}/openjdk-src-dir/hotspot/make/linux/Makefile ${WORKDIR}/icedtea6-1.8.5/build/openjdk-ecj/hotspot/make/linux/Makefile ${WORKDIR}/icedtea6-1.8.5/build/openjdk/hotspot/make/linux/Makefile ;
+	do
+		sed -i \
+			-e"s|SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%|SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%|" \
+			$F
+	done
 }
 
 # Work around broken variable quoting in oe-stable 2009 and provide the variable

pushed to oe-classic master

Signature · 7 lines
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:[email protected]
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058