All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mario Domenech Goulart <mario@ossystems.com.br>
To: yocto@yoctoproject.org
Cc: Mario Domenech Goulart <mario@ossystems.com.br>
Subject: [meta-oracle-java][PATCH 1/6] oracle-jse-jdk: split recipe into per-architecture recipes
Date: Tue, 12 May 2015 17:56:59 -0300	[thread overview]
Message-ID: <1431464224-19858-1-git-send-email-mario@ossystems.com.br> (raw)

Due the way BitBake parses recipes, including architecture-specific
include files was happening too late, causing native variants to pick
wrong include files, thus ending up generating broken content.

Setting COMPATIBLE_HOST guarantees that native installations will be
consistent.

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 ...acle-jse-jdk-i586.inc => oracle-jse-jdk-i586_1.7.0.bb} |  2 ++
 ...-jse-jdk-x86-64.inc => oracle-jse-jdk-x86-64_1.7.0.bb} |  2 ++
 recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb      | 15 ---------------
 3 files changed, 4 insertions(+), 15 deletions(-)
 rename recipes-devtools/oracle-java/{oracle-jse-jdk-i586.inc => oracle-jse-jdk-i586_1.7.0.bb} (90%)
 rename recipes-devtools/oracle-java/{oracle-jse-jdk-x86-64.inc => oracle-jse-jdk-x86-64_1.7.0.bb} (90%)
 delete mode 100644 recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb

diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-i586.inc b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
similarity index 90%
rename from recipes-devtools/oracle-java/oracle-jse-jdk-i586.inc
rename to recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
index 0667161..9fb2188 100644
--- a/recipes-devtools/oracle-java/oracle-jse-jdk-i586.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
@@ -7,3 +7,5 @@ SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${PV_UPDATE}-b${BUILD_N
 
 SRC_URI[md5sum] = "715b0e8ba2a06bded75f6a92427e2701"
 SRC_URI[sha256sum] = "b6231064ad2c9fbbcb099dba17b1dcf12033e922b9c24e4348b9a01e9ebaa85c"
+
+COMPATIBLE_HOST = "(i586-linux)"
diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64.inc b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
similarity index 90%
rename from recipes-devtools/oracle-java/oracle-jse-jdk-x86-64.inc
rename to recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
index f18ce55..a6d0bc7 100644
--- a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
@@ -7,3 +7,5 @@ SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${PV_UPDATE}-b${BUILD_N
 
 SRC_URI[md5sum] = "81e3e2df33e13781e5fac5756ed90e67"
 SRC_URI[sha256sum] = "54dd1e13edf18c64941a55da9c91210b53dc5cf48f1a8f4538c863049e346335"
+
+COMPATIBLE_HOST = "(x86_64-linux)"
diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb
deleted file mode 100644
index 56d84b6..0000000
--- a/recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Automatically choose java package based on target architecture
-def get_java_pkg(d):
-       TA = d.getVar('TARGET_ARCH', True)
-       if TA == "i586":
-               javaPkg = "oracle-jse-jdk-i586"
-       elif TA == "x86_64":
-               javaPkg = "oracle-jse-jdk-x86-64"
-       else:
-               raise bb.parse.SkipPackage("The target architecture '%s' is not supported by the meta-oracle-java layer" %TA)
-       
-       return javaPkg
-
-JAVA_PKG = "${@get_java_pkg(d)}"
-
-require ${JAVA_PKG}.inc
-- 
2.1.4



             reply	other threads:[~2015-05-12 20:56 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-12 20:56 Mario Domenech Goulart [this message]
2015-05-12 20:57 ` [meta-oracle-java][PATCH 2/6] oracle-jse-jdk: fix native installation Mario Domenech Goulart
2015-05-12 20:57 ` [meta-oracle-java][PATCH 3/6] oracle-jse: RPROVIDES java2-runtime Mario Domenech Goulart
2015-05-12 20:57 ` [meta-oracle-java][PATCH 4/6] oracle-jse-jre: generate native content Mario Domenech Goulart
2015-05-12 20:57 ` [meta-oracle-java][PATCH 5/6] oracle-jse-jdk: provide virtual/javac and virtual/java-initial Mario Domenech Goulart
2015-05-12 20:57 ` [meta-oracle-java][PATCH 6/6] oracle-jse: provide virtual/java Mario Domenech Goulart
2015-05-13 13:22 ` [meta-oracle-java][PATCH 1/6] oracle-jse-jdk: split recipe into per-architecture recipes Maxin John
2015-05-13 13:49   ` Mario Domenech Goulart

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1431464224-19858-1-git-send-email-mario@ossystems.com.br \
    --to=mario@ossystems.com.br \
    --cc=yocto@yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.