From patchwork Tue Oct 3 20:19:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 821012 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y69PV4cW8z9t5Y for ; Wed, 4 Oct 2017 07:19:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 85E9B884B4; Tue, 3 Oct 2017 20:19:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pKBL-oVpIrK0; Tue, 3 Oct 2017 20:19:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id F115188320; Tue, 3 Oct 2017 20:19:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D76AA1CEBC3 for ; Tue, 3 Oct 2017 20:19:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CEE9F82516 for ; Tue, 3 Oct 2017 20:19:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c-3kjprKDtdE for ; Tue, 3 Oct 2017 20:19:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by hemlock.osuosl.org (Postfix) with ESMTPS id 3BABA8224C for ; Tue, 3 Oct 2017 20:19:48 +0000 (UTC) Received: from fwd29.aul.t-online.de (fwd29.aul.t-online.de [172.20.26.134]) by mailout09.t-online.de (Postfix) with SMTP id B54264277F0A; Tue, 3 Oct 2017 22:19:45 +0200 (CEST) Received: from fli4l.lan.fli4l (XdoFA0ZJZhierimWBcGIJDmwXBzysk08z1Ll7UN26Z83C22lISbw4zKNwkJkLveQRY@[79.228.24.250]) by fwd29.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1dzTfJ-0vnZMO0; Tue, 3 Oct 2017 22:19:41 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:44390 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.89) (envelope-from ) id 1dzTfH-0005HT-Ro; Tue, 03 Oct 2017 22:19:40 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Tue, 3 Oct 2017 22:19:38 +0200 Message-Id: <20171003201939.8382-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.11.0 X-ID: XdoFA0ZJZhierimWBcGIJDmwXBzysk08z1Ll7UN26Z83C22lISbw4zKNwkJkLveQRY X-TOI-MSGID: eef6ecc5-90fb-42c5-8155-4f998786ad1a Cc: Maxime Hadjinlian Subject: [Buildroot] [PATCH v2 1/2] package/openjdk-bootstrap: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This package provides a binary installation of the JDK created by the BLFS (Beyond Linux From Scratch) editors. It is meant to be used by Kodi which currently depends on a JDK installation provided by the host machine. Signed-off-by: Bernd Kuhls --- v2: no changes DEVELOPERS | 1 + package/Config.in.host | 1 + package/openjdk-bootstrap/Config.in.host | 11 +++++++++++ package/openjdk-bootstrap/openjdk-bootstrap.hash | 4 ++++ package/openjdk-bootstrap/openjdk-bootstrap.mk | 25 ++++++++++++++++++++++++ 5 files changed, 42 insertions(+) create mode 100644 package/openjdk-bootstrap/Config.in.host create mode 100644 package/openjdk-bootstrap/openjdk-bootstrap.hash create mode 100644 package/openjdk-bootstrap/openjdk-bootstrap.mk diff --git a/DEVELOPERS b/DEVELOPERS index 43ad9e5f8a..f2eb3557a1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -266,6 +266,7 @@ F: package/mesa3d/ F: package/minidlna/ F: package/mjpg-streamer/ F: package/mplayer/ +F: package/openjdk-bootstrap/ F: package/perl-crypt-openssl-random/ F: package/perl-crypt-openssl-rsa/ F: package/perl-digest-sha1/ diff --git a/package/Config.in.host b/package/Config.in.host index 679fe22a52..90fa5af5fa 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -30,6 +30,7 @@ menu "Host utilities" source "package/mtools/Config.in.host" source "package/mxsldr/Config.in.host" source "package/omap-u-boot-utils/Config.in.host" + source "package/openjdk-bootstrap/Config.in.host" source "package/openocd/Config.in.host" source "package/opkg-utils/Config.in.host" source "package/parted/Config.in.host" diff --git a/package/openjdk-bootstrap/Config.in.host b/package/openjdk-bootstrap/Config.in.host new file mode 100644 index 0000000000..e769699dd4 --- /dev/null +++ b/package/openjdk-bootstrap/Config.in.host @@ -0,0 +1,11 @@ +config BR2_PACKAGE_HOST_OPENJDK_BOOTSTRAP + bool "host openjdk bootstrap" + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + help + OpenJDK (Open Java Development Kit) is a free and open source + implementation of the Java Platform, Standard Edition + This package provides a binary installation of the JDK created + by the BLFS editors. + + http://openjdk.java.net + http://www.linuxfromscratch.org/blfs/view/svn/general/java.html diff --git a/package/openjdk-bootstrap/openjdk-bootstrap.hash b/package/openjdk-bootstrap/openjdk-bootstrap.hash new file mode 100644 index 0000000000..7fa65592d6 --- /dev/null +++ b/package/openjdk-bootstrap/openjdk-bootstrap.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 0321057130cad789ed14d7e923e69c4def6ad7470d167116f104008a079b0215 OpenJDK-1.8.0.141-i686-bin.tar.xz +sha256 40051afdb57ed798a910ff5b1a5bbef555481bcf76f0423686861da983871e7d OpenJDK-1.8.0.141-x86_64-bin.tar.xz +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk-bootstrap/openjdk-bootstrap.mk b/package/openjdk-bootstrap/openjdk-bootstrap.mk new file mode 100644 index 0000000000..a8a6447712 --- /dev/null +++ b/package/openjdk-bootstrap/openjdk-bootstrap.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# openjdk-bootstrap +# +################################################################################ + +OPENJDK_BOOTSTRAP_VERSION = 1.8.0.141 +OPENJDK_BOOTSTRAP_SITE = http://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-$(OPENJDK_BOOTSTRAP_VERSION) +ifeq ($(BR2_HOSTARCH),x86) +OPENJDK_BOOTSTRAP_SOURCE = OpenJDK-$(OPENJDK_BOOTSTRAP_VERSION)-i686-bin.tar.xz +else +OPENJDK_BOOTSTRAP_SOURCE = OpenJDK-$(OPENJDK_BOOTSTRAP_VERSION)-x86_64-bin.tar.xz +endif +OPENJDK_BOOTSTRAP_LICENSE = GPL-2.0+ with exception +OPENJDK_BOOTSTRAP_LICENSE_FILES = LICENSE + +# Also provided to other packages +OPENJDK_BOOTSTRAP_BOOTSTRAP_DIR = $(HOST_DIR)/opt/jdk-bootstrap/ + +define HOST_OPENJDK_BOOTSTRAP_INSTALL_CMDS + mkdir -p $(OPENJDK_BOOTSTRAP_BOOTSTRAP_DIR) + cp -r $(@D)/* $(OPENJDK_BOOTSTRAP_BOOTSTRAP_DIR) +endef + +$(eval $(host-generic-package)) From patchwork Tue Oct 3 20:19:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 821013 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y69PV6pX1z9t5s for ; Wed, 4 Oct 2017 07:19:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D189488415; Tue, 3 Oct 2017 20:19:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k5ml1eDbtbvi; Tue, 3 Oct 2017 20:19:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1B41882516; Tue, 3 Oct 2017 20:19:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id B60C01CEBC3 for ; Tue, 3 Oct 2017 20:19:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 55C202FE75 for ; Tue, 3 Oct 2017 20:19:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vwoJdBQDSzXg for ; Tue, 3 Oct 2017 20:19:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by silver.osuosl.org (Postfix) with ESMTPS id B56F92EF99 for ; Tue, 3 Oct 2017 20:19:41 +0000 (UTC) Received: from fwd11.aul.t-online.de (fwd11.aul.t-online.de [172.20.27.152]) by mailout07.t-online.de (Postfix) with SMTP id CF9C642C65DC; Tue, 3 Oct 2017 22:19:47 +0200 (CEST) Received: from fli4l.lan.fli4l (GW0WVgZVrh739AN8Ksu+W5UIpyYT-UgtEzIoisXRu85GF96OAAtyyNfl53z3oZZZVM@[79.228.24.250]) by fwd11.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1dzTfJ-0h8kim0; Tue, 3 Oct 2017 22:19:41 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:44390 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.89) (envelope-from ) id 1dzTfI-0005HT-Pw; Tue, 03 Oct 2017 22:19:41 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Tue, 3 Oct 2017 22:19:39 +0200 Message-Id: <20171003201939.8382-2-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171003201939.8382-1-bernd.kuhls@t-online.de> References: <20171003201939.8382-1-bernd.kuhls@t-online.de> X-ID: GW0WVgZVrh739AN8Ksu+W5UIpyYT-UgtEzIoisXRu85GF96OAAtyyNfl53z3oZZZVM X-TOI-MSGID: 7f43a4e9-8787-4555-a75a-0d498adeb9db Cc: Maxime Hadjinlian Subject: [Buildroot] [PATCH v2 2/2] package/kodi: use package host-openjdk-bootstrap to provide JDK X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Bernd Kuhls --- v2: removed BR2_PACKAGE_KODI_OPENJDK (Baruch) package/kodi/Config.in | 3 ++- package/kodi/kodi.mk | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index fc7eafa41a..8bce77d7e4 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -46,7 +46,8 @@ menuconfig BR2_PACKAGE_KODI depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON depends on !BR2_PACKAGE_PYTHON_PYC_ONLY - select BR2_NEEDS_HOST_JAVA + select BR2_NEEDS_HOST_JAVA if !(BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86") + select BR2_PACKAGE_HOST_OPENJDK_BOOTSTRAP if (BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86") select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_EXPAT select BR2_PACKAGE_FFMPEG diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 28fe256b65..9a3247dbbc 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -156,6 +156,13 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) KODI_CXX_FLAGS += -latomic endif +ifeq ($(BR2_PACKAGE_HOST_OPENJDK_BOOTSTRAP),y) +KODI_CONF_ENV = \ + JAVA_HOME=$(HOST_OPENJDK_BOOTSTRAP_DIR) \ + PATH=$(HOST_OPENJDK_BOOTSTRAP_DIR)/bin:$(BR_PATH) +KODI_DEPENDENCIES += host-openjdk-bootstrap +endif + ifeq ($(BR2_PACKAGE_KODI_MYSQL),y) KODI_CONF_OPTS += -DENABLE_MYSQLCLIENT=ON KODI_DEPENDENCIES += mysql