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

login
register
mail settings
Submitter Steffen Sledz
Date Dec. 12, 2011, 8:58 a.m.
Message ID <1323680281-3762-1-git-send-email-sledz@dresearch-fe.de>
Download mbox | patch
Permalink /patch/16715/
State Accepted
Commit c75eac282cb6196d0b84971621851a99b9861ad7
Headers show

Comments

Steffen Sledz - Dec. 12, 2011, 8:58 a.m.
see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7072341

Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
---
 recipes/openjdk/openjdk-6-common.inc |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
Steffen Sledz - Dec. 14, 2011, 11:23 a.m.
On 12.12.2011 09:58, Steffen Sledz wrote:
> see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7072341
> 
> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
> ---
>  recipes/openjdk/openjdk-6-common.inc |    9 ++++++++-
>  1 files changed, 8 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes/openjdk/openjdk-6-common.inc b/recipes/openjdk/openjdk-6-common.inc
> index 54c45f8..59a7a56 100644
> --- a/recipes/openjdk/openjdk-6-common.inc
> +++ b/recipes/openjdk/openjdk-6-common.inc
> @@ -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

pushed to oe-classic master

Patch

diff --git a/recipes/openjdk/openjdk-6-common.inc b/recipes/openjdk/openjdk-6-common.inc
index 54c45f8..59a7a56 100644
--- a/recipes/openjdk/openjdk-6-common.inc
+++ b/recipes/openjdk/openjdk-6-common.inc
@@ -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