From patchwork Fri Mar 22 14:19:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1061231 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@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=) 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.b="USOFoc6z"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Qm5L57Fyz9s71 for ; Sat, 23 Mar 2019 01:20:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 88EAB87583; Fri, 22 Mar 2019 14:20:03 +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 sAleicdles9n; Fri, 22 Mar 2019 14:20:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 844D187548; Fri, 22 Mar 2019 14:20:00 +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 00A9A1BF3F4 for ; Fri, 22 Mar 2019 14:19:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F177D87527 for ; Fri, 22 Mar 2019 14:19:58 +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 n1OsQ-EDgH81 for ; Fri, 22 Mar 2019 14:19:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 19E6387524 for ; Fri, 22 Mar 2019 14:19:58 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id b9so1788230iot.13 for ; Fri, 22 Mar 2019 07:19:58 -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=iGUFG5WQJW+ECt8ObHt/i7hcbQDQVNbRgrdQ5amAy6Q=; b=USOFoc6zMRVYexdXo7yB2NpZt2VAXjPm0dbmc26KRsg8ztUM67Th2o8McpiVpBz89p T0CbuoeJkGfDO2dQZ9ULvoM/H2R1sB4BqkgX1WV5C/BL1b3JQ4F41y0HZQuPLQFZ+zhy nX0gfN3oK1AilRu+sy+DdgJfePSKQJ+AXK+7qtogz/1d5nNeDlVEUU5QdB9QeWw4DcT+ 6OEmnGeUZRZbrIogefo9yNBqQZyLXWgdrEOuVLPEE/d1r4w1DhZ2cNyhIUJ6lOMZMty1 ADIOxHoAQF99frBk68evrdCfJWT5Z8S+M76/S6MkyIBqzDGrfWIKLcKf5vd8Q4D9eCri IYFw== 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=iGUFG5WQJW+ECt8ObHt/i7hcbQDQVNbRgrdQ5amAy6Q=; b=rBhQGOdRanfP1f84ttdFFmrBGNd+7jZNwjOrLna3zcaZMgd+FNX650p3hngEAxEEqY NGcO8WRKICLKEEbnxcMOdswxKlqg8K2s1ZbGdWV367wpbOFp+f2js5AjMqTyIl4Sjd02 tcsblk6EB8wdMeoMuXEgDAhtdSD/PZxJVeSqXH9yhkuU+bJ/s65UhIpPE+wvXX3kKbrL 1CFmJfwXu8AU1UzbZPkoVrbPkGh4inqxr/8hjH55dPNqrorJqYaTSt80ZibKzymWz1wN xyjjJ5e6x0vWo+3+vkClKLrLm/GJd9PF8niSUI06Sej+MD2aSPR978Q/1JhhZDa/g5ZT RxjQ== X-Gm-Message-State: APjAAAW+CspfOOdBvF0seBP8Tpdo2v4/z5BVUfpQhmNhVFzGIo4bfIx2 5L97uGCgPLzIUTjZLpSdfQWqzEu5E1s= X-Google-Smtp-Source: APXvYqxFyPDYsWgj0Ni8p+iE0yZOrF5eohMNFOQpeU/6g7+gNDQLdRHJfI57dfZMw1gDyOIDvhyDjg== X-Received: by 2002:a5d:9159:: with SMTP id y25mr7136388ioq.146.1553264397104; Fri, 22 Mar 2019 07:19:57 -0700 (PDT) Received: from localhost.localdomain (68-188-149-81.dhcp.aldl.mi.charter.com. [68.188.149.81]) by smtp.gmail.com with ESMTPSA id i11sm3137541ioh.58.2019.03.22.07.19.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Mar 2019 07:19:56 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Fri, 22 Mar 2019 10:19:54 -0400 Message-Id: <20190322141954.36060-1-aduskett@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/openjdk and package/openjdk-bin: bump version to 12+33 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: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett Because one package relies on the other, bump both at the same time. Other changes: - Drop --with-cpu-port=aarch64 option as it is no longer a valid option. (See https://openjdk.java.net/jeps/340) - Add xlib_libXrandr as a dependency. Tested with: ./support/testing/run-tests -s -o ./output/ -d dl tests.package.test_openjdk.TestOpenJdk Signed-off-by: Adam Duskett --- package/openjdk-bin/openjdk-bin.hash | 4 ++-- package/openjdk-bin/openjdk-bin.mk | 8 ++++---- package/openjdk/Config.in | 1 + package/openjdk/openjdk.hash | 2 +- package/openjdk/openjdk.mk | 9 +++++---- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index d36a582a33..63ed5874c4 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,5 +1,5 @@ -# From https://github.com/AdoptOpenJDK/openjdk11-binaries/releases -sha256 d02089d834f7702ac1a9776d8d0d13ee174d0656cf036c6b68b9ffb71a6f610e OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz +# From https://github.com/AdoptOpenJDK/openjdk12-binaries/releases +sha256 4739064dc439a05487744cce0ba951cb544ed5e796f6c699646e16c09da5dd6a OpenJDK12U-jdk_x64_linux_hotspot_12_33.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index 1d4f44804c..d2e0c2fd3b 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -4,11 +4,11 @@ # ################################################################################ -HOST_OPENJDK_BIN_VERSION_MAJOR = 11.0.2 -HOST_OPENJDK_BIN_VERSION_MINOR = 9 +HOST_OPENJDK_BIN_VERSION_MAJOR = 12 +HOST_OPENJDK_BIN_VERSION_MINOR = 33 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) +HOST_OPENJDK_BIN_SOURCE = OpenJDK12U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz +HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) 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 dd1f3c59cf..844dc4c94c 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -19,6 +19,7 @@ config BR2_PACKAGE_OPENJDK select BR2_PACKAGE_LCMS2 select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XLIB_LIBXTST diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 8b14609066..91d0f1dbce 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6c69a2c1b5177659d4263545cf83e0fbcd697669b0107481372be3648af7b89b openjdk-jdk-11.0.2+9.tar.gz +sha256 de278328668bdaf35d50d0319d15d64d195ddd8a0de9c6fde3a6c9ca10135a92 openjdk-jdk-12+33.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 602e26b34b..3f7b87ca96 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -4,10 +4,10 @@ # ################################################################################ -OPENJDK_VERSION_MAJOR = 11.0.2 -OPENJDK_VERSION_MINOR = 9 +OPENJDK_VERSION_MAJOR = 12 +OPENJDK_VERSION_MINOR = 33 OPENJDK_VERSION = jdk-$(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) -OPENJDK_SITE = $(call github,AdoptOpenJDK,openjdk-jdk11u,$(OPENJDK_VERSION)) +OPENJDK_SITE = $(call github,AdoptOpenJDK,openjdk-jdk12u,$(OPENJDK_VERSION)) OPENJDK_LICENSE = GPL-2.0+ with exception OPENJDK_LICENSE_FILES = LICENSE @@ -26,6 +26,7 @@ OPENJDK_DEPENDENCIES = \ lcms2 \ libpng \ libusb \ + xlib_libXrandr \ xlib_libXrender \ xlib_libXt \ xlib_libXtst \ @@ -90,7 +91,7 @@ OPENJDK_CONF_OPTS = \ # If building for AArch64, use the provided CPU port. ifeq ($(BR2_aarch64),y) -OPENJDK_CONF_OPTS += --with-cpu-port=aarch64 --with-abi-profile=aarch64 +OPENJDK_CONF_OPTS += --with-abi-profile=aarch64 endif ifeq ($(BR2_CCACHE),y)