From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 58141E008DC; Tue, 12 May 2015 13:56:07 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [209.85.220.176 listed in list.dnswl.org] Received: from mail-qk0-f176.google.com (mail-qk0-f176.google.com [209.85.220.176]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 1C338E0027F for ; Tue, 12 May 2015 13:56:00 -0700 (PDT) Received: by qkgx75 with SMTP id x75so15003299qkg.1 for ; Tue, 12 May 2015 13:56:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:organization; bh=G6Qu/VL/cL+I4TN51BBJpMLx2Kg1F+edRr6YbyauWU4=; b=w+kwXV8IUUzz4B7nlwfcXz4jUbeQRzJas6u0C3iLeKhVeC54BUgGpfBfbgbKpYKh1S tWbdrNe4pD0VybkjNhrotLPNOZxy4m7iu7H7bV66y5x231A1kKKYdVpSfIPy8ZGJimpS UyX29Jrxa7zbRiIVxt9We2XJsnRH8/XnDTExiE3zVH5TreyYpC7MYo9NWrQYu5Z4QFU1 ZPL1XZWVbgtFFmdrNXN+x8XTwHZ7ZVWV4V0K+pVdPJodSYmNilYafw6FR4irPo5p+3kF IcO9MSlhF9OH1Vd4sZ/Yp2HBNODDr24jofote/SJeG5SEDS09/UwkFaZLl0kPeVDvETt tXxw== X-Received: by 10.140.150.78 with SMTP id 75mr23774798qhw.88.1431464159955; Tue, 12 May 2015 13:55:59 -0700 (PDT) Received: from centrium.lab.ossystems.com.br ([177.100.224.72]) by mx.google.com with ESMTPSA id 62sm14209921qgz.14.2015.05.12.13.55.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 May 2015 13:55:59 -0700 (PDT) Sender: Mario Domenech Goulart From: Mario Domenech Goulart To: yocto@yoctoproject.org Date: Tue, 12 May 2015 17:56:59 -0300 Message-Id: <1431464224-19858-1-git-send-email-mario@ossystems.com.br> X-Mailer: git-send-email 2.1.4 Organization: O.S. Systems Software LTDA. Cc: Mario Domenech Goulart Subject: [meta-oracle-java][PATCH 1/6] oracle-jse-jdk: split recipe into per-architecture recipes X-BeenThere: yocto@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Discussion of all things Yocto Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 May 2015 20:56:07 -0000 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 --- ...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