From patchwork Wed Apr 22 19:21:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1275376 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=cmNmZPLX; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 496qzv5WTNz9sSJ for ; Thu, 23 Apr 2020 05:21:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B6C8722720; Wed, 22 Apr 2020 19:21:27 +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 2mwyEChtepvD; Wed, 22 Apr 2020 19:21:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2824E2042A; Wed, 22 Apr 2020 19:21:25 +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 11EDE1BF2A6 for ; Wed, 22 Apr 2020 19:21:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C56C781CB7 for ; Wed, 22 Apr 2020 19:21:23 +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 VD6yIZ5z98VZ for ; Wed, 22 Apr 2020 19:21:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by hemlock.osuosl.org (Postfix) with ESMTPS id 43CBA88350 for ; Wed, 22 Apr 2020 19:21:22 +0000 (UTC) Received: by mail-pl1-f177.google.com with SMTP id d24so1322751pll.8 for ; Wed, 22 Apr 2020 12:21:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PaUDVxxwSa53CMBHUUukOE5On9Fve62PK90OUZxEvuY=; b=cmNmZPLX5IWDibXjVprMjvp9ZnInIqnLDNatMVYxRE4B2T0mjcJw/CKu/OG23SBx51 KLy0e2KCLT1wxXbVzmn52tnDf5grDkXM34FmTtwHWfNpxScGOQUqqcyQcky9rMTJhRWQ s9dsAPqrh5sRLiQO2MRYkUFyd0tFEkfyPr3ZMHNM42HWqRNzdJYFtIyfGbPc9l7e0Bj9 1w3K7nW6+3+RbZ18aDQjyDhAUVCOZJ5F68/eOspOn18nXv6stY8SU/mzTAMhFlez/vIF tkAvsgIwDhppt+SScCVN64VNOoVpm6aWA+305jKeR8yTZXK7pMzfqtiyN6ai4y1YDmvS f8ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PaUDVxxwSa53CMBHUUukOE5On9Fve62PK90OUZxEvuY=; b=WX1L6ne28UMert930MVl6ajJ/1DoHOICuzraEKB2uqwvDDs7/xIDB1m7uSKd0hzmQX awyECxQo4gMHGLuXiyD7F3SvwlVFEyhihWuGk2YF34eFzlzOY65GuxwryZI0WnFxFVYx +LeUUrZNw02ftYwILuPmb89aimxV6IJh4U/d0uN4INN+uQq5Mo6NnrTMl2+m9V+QwBUN HPU2pCwaziO2wa8+YU4kT3WoYSw+IB8s6S50ogBUWYRioHB07jOAxoW7hQOs3TU1BSF/ tSTKkqnIOc7KUABj70/b937wMWH4wPt7MIgfR96FEXpYz96MEuva666mXA6aF1hmGBPc S1hw== X-Gm-Message-State: AGi0PuY8FUTSvOuQ+WDwfbvRXLIz6A0OkK5EFUTNQMJncj/lqtqRgLJB b0eLrs0QJ430rboiM2hdX8Ki27Tg3Vg= X-Google-Smtp-Source: APiQypIllcvmoZw4GF0rqMUamjwnd6GLj+a/XBnx5I1h8aWKlZAcFdgEjYiGKPgquT84kX0jgKgF+w== X-Received: by 2002:a17:90a:1946:: with SMTP id 6mr319035pjh.42.1587583281439; Wed, 22 Apr 2020 12:21:21 -0700 (PDT) Received: from localhost.localdomain ([47.149.8.172]) by smtp.gmail.com with ESMTPSA id i25sm243092pfd.140.2020.04.22.12.21.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 12:21:21 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Wed, 22 Apr 2020 12:21:17 -0700 Message-Id: <20200422192118.4039564-1-aduskett@gmail.com> X-Mailer: git-send-email 2.25.3 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/{openjdk, openjdk-bin}: bump version to 14.0.1+7 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tudor Holton , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett Signed-off-by: Adam Duskett --- package/openjdk-bin/openjdk-bin.hash | 8 ++++---- package/openjdk-bin/openjdk-bin.mk | 4 ++-- package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index 98e039c17e..52380f55ae 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,6 +1,6 @@ -# From https://github.com/AdoptOpenJDK/openjdk12-binaries/releases -sha256 6c06853332585ab58834d9e8a02774b388e6e062ef6c4084b4f058c67f2e81b5 OpenJDK14U-jdk_x64_linux_hotspot_14_36.tar.gz +# From https://github.com/AdoptOpenJDK/openjdk14-binaries/releases +sha256 9ddf9b35996fbd784a53fff3e0d59920a7d5acf1a82d4c8d70906957ac146cd1 OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz # Locally calculated -sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE -sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTION +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE +sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTION diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index 31dc4a4666..ca8e11fe13 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -HOST_OPENJDK_BIN_VERSION_MAJOR = 14 -HOST_OPENJDK_BIN_VERSION_MINOR = 36 +HOST_OPENJDK_BIN_VERSION_MAJOR = 14.0.1 +HOST_OPENJDK_BIN_VERSION_MINOR = 7 HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) HOST_OPENJDK_BIN_SOURCE = OpenJDK14U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index d5be642052..e453d12d1a 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6815dbac7dd0f86291254e84ed17565c89477eeb6b0847a9648b00ecb4f07634 jdk-14+36.tar.gz -sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE +sha256 301203cbda9c40a5fc496b3299806995ac4833b39c6d2e8470fd85a35461afd4 jdk-14.0.1+7.tar.gz +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index ffa62dd10d..d33459db97 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENJDK_VERSION_MAJOR = 14 -OPENJDK_VERSION_MINOR = 36 +OPENJDK_VERSION_MAJOR = 14.0.1 +OPENJDK_VERSION_MINOR = 7 OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk14u/archive From patchwork Wed Apr 22 19:21:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1275377 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=EwSybKvM; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 496qzw646pz9sSY for ; Thu, 23 Apr 2020 05:21:32 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3401C86727; Wed, 22 Apr 2020 19:21:29 +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 5MUsSqUwl5iN; Wed, 22 Apr 2020 19:21:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id F09D9865EE; Wed, 22 Apr 2020 19:21:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3BE471BF9AF for ; Wed, 22 Apr 2020 19:21:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3830687AD1 for ; Wed, 22 Apr 2020 19:21:24 +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 H1wP2xbK1L6i for ; Wed, 22 Apr 2020 19:21:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id 547F9876B6 for ; Wed, 22 Apr 2020 19:21:23 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id g6so1579267pgs.9 for ; Wed, 22 Apr 2020 12:21:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YCyE1yI7vYFYhoMgynhOeQac5e/OH9DzFRVgPWyE7O8=; b=EwSybKvMH2R5rV7VXrRDUudTLbjfOQLJwLuzL/Pn4EL0DtaAROxccBzbimhWuMSeHL 3xdb4BmFCcC7Xfw8aSyqsfjHG3tQkn8IAx0jIVlK4dCnFv+Gb256ZbcCA3CfgTo8tcUC wDr/VNq50LEwZtpJy+HAAYjntj0I1fM+cJ17Kw/mLWcMxTXYqs+Wj97PTq16YzFbjGc3 L3n+nn0C1cxvh4Fq8rze6LI+TzLxNoVJKg5QIRhiyd1RWao1sW5pjOLIa9E6nBAUhiQH H1i50+J9/y2z4N8ExjDAW5hbE0XDOFfqfbo+wTX4wL463O1w/Gzi8kUrgkxzFyJjSgWv NfKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YCyE1yI7vYFYhoMgynhOeQac5e/OH9DzFRVgPWyE7O8=; b=oW049SD5pt3DnEQ+j09Wxubxriz8ToSiE5bgpnjRdGMkh2LPqLAXMZhJFzckoFNtGJ OSEjh/OY2GaI3toVWI/CIWhwy9QTHM6ny2YcZkV1+FYeo4g6bNkcyGLywtZwE4ZMRit8 c7/Og8hi/X3bCYtdE1dZpyHmmfGUguR3hxkFjfjCyC7PRFp75EEXIP0wby6963xi1Qtm efCA8QM68cyLuR0nvYtPEy0vWsGWK7Pu3YEBvYThMQuV80pZJYWniMA9yif5DBRtgY2X 22WDQK4RjBr5cQgHGXu8FPbzAo81ztRWHmJ8mrIMKa2tUpyC7EdLx41MA4SDJsICuagW SbfQ== X-Gm-Message-State: AGi0PuZBRFjR+14qWzXMX7JBfeN7Rmiy2uJ3a9J3wUXAprLp+aGbYVK4 o1FMktPPXrKRUSHzjQ2XHsuzEKOWS/8= X-Google-Smtp-Source: APiQypJRr9yp7sYjSaoPLnyHNzCaWoJBx55IqkJg1K9MbhQ6vLZJHbD7DnAxMazGC5sdUQ+xi3IDGA== X-Received: by 2002:a63:fd0c:: with SMTP id d12mr542383pgh.41.1587583282533; Wed, 22 Apr 2020 12:21:22 -0700 (PDT) Received: from localhost.localdomain ([47.149.8.172]) by smtp.gmail.com with ESMTPSA id i25sm243092pfd.140.2020.04.22.12.21.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 12:21:21 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Wed, 22 Apr 2020 12:21:18 -0700 Message-Id: <20200422192118.4039564-2-aduskett@gmail.com> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200422192118.4039564-1-aduskett@gmail.com> References: <20200422192118.4039564-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/{openjdk, openjdk-bin}: add support for building either lts or latest X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tudor Holton , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett As Java is used quite a bit in the enterprise world, having the option to build the LTS version of OpenJDK is quite convenient and also a requirement for many companies wanting to use Java. As such, there are three options: 1) Continue only to support the latest version of OpenJDK. 2) Downgrade our existing OpenJDK package from 14 to 11. 3) Add an option to support either OpenJDK 11 or 14. OpenJDK 11 and 14 currently have: - The same configure options. - The same license files and hashes for those license files. - The same dependencies. - The same method to build and install. As such, supporting both 11 and 14 is not only an easy option to add to Buildroot, but also a nice feature for users who wish to use Java in an embedded environment with a company that mandates the use of the LTS version. Signed-off-by: Adam Duskett --- package/openjdk-bin/openjdk-bin.hash | 3 +++ package/openjdk-bin/openjdk-bin.mk | 8 ++++++++ package/openjdk/Config.in | 14 ++++++++++++++ package/openjdk/openjdk.hash | 1 + package/openjdk/openjdk.mk | 9 +++++++++ 5 files changed, 35 insertions(+) diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index 52380f55ae..065eda0603 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,6 +1,9 @@ # From https://github.com/AdoptOpenJDK/openjdk14-binaries/releases sha256 9ddf9b35996fbd784a53fff3e0d59920a7d5acf1a82d4c8d70906957ac146cd1 OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz +# From https://github.com/AdoptOpenJDK/openjdk11-binaries/releases +sha256 ee60304d782c9d5654bf1a6b3f38c683921c1711045e1db94525a51b7024a2ca OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz + # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTION diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index ca8e11fe13..4d7043c831 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -4,11 +4,19 @@ # ################################################################################ +ifeq ($(BR2_OPENJDK_VERSION_11_X),y) +HOST_OPENJDK_BIN_VERSION_MAJOR = 11.0.7 +HOST_OPENJDK_BIN_VERSION_MINOR = 10 +HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_SOURCE = OpenJDK11U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz +HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +else HOST_OPENJDK_BIN_VERSION_MAJOR = 14.0.1 HOST_OPENJDK_BIN_VERSION_MINOR = 7 HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) HOST_OPENJDK_BIN_SOURCE = OpenJDK14U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +endif HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index 61294ec49f..3b27a7e03c 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -49,6 +49,20 @@ config BR2_PACKAGE_OPENJDK if BR2_PACKAGE_OPENJDK +choice + prompt "openjdk version" + default BR2_OPENJDK_VERSION_11_X + help + Select the version of OpenJDK you wish to use. + +config BR2_OPENJDK_VERSION_11_X + bool "OpenJDK 11 (LTS)" + +config BR2_OPENJDK_VERSION_14_X + bool "OpenJDK 14 (Latest)" + +endchoice + choice prompt "openjdk variant" default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !BR2_powerpc diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index e453d12d1a..2279c8b971 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,3 +1,4 @@ # Locally computed sha256 301203cbda9c40a5fc496b3299806995ac4833b39c6d2e8470fd85a35461afd4 jdk-14.0.1+7.tar.gz +sha256 d105471d06568e4659c21518d1bf42b8ebab5c70539e9777d570549a98ed2a8a jdk-11.0.7+10.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index d33459db97..d16d6c09e2 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -4,11 +4,20 @@ # ################################################################################ +ifeq ($(BR2_OPENJDK_VERSION_11_X),y) +OPENJDK_VERSION_MAJOR = 11.0.7 +OPENJDK_VERSION_MINOR = 10 +OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) +OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz +OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk11u/archive +else OPENJDK_VERSION_MAJOR = 14.0.1 OPENJDK_VERSION_MINOR = 7 OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk14u/archive +endif + OPENJDK_LICENSE = GPL-2.0+ with exception OPENJDK_LICENSE_FILES = LICENSE