diff --git a/DEVELOPERS b/DEVELOPERS index a030be7890..95c3486286 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2398,6 +2398,9 @@ F: package/redis/ N: Trent Piepho F: package/libp11/ +N: Tudor Holton +F: package/openjdk/ + N: Tzu-Jung Lee F: package/dropwatch/ F: package/tstools/ diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 00d080aa3f..beed7a34a2 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5f73d86ed516173965b27754f1bb21374ccb1194a17c2d89d8018280ce5ffa78 openjdk-12.0.2+10.tar.gz +sha256 b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb jdk-12.0.2+10.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index ea2555edcc..e95ece2eba 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -7,7 +7,8 @@ OPENJDK_VERSION_MAJOR = 12.0.2 OPENJDK_VERSION_MINOR = 10 OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) -OPENJDK_SITE = $(call github,AdoptOpenJDK,openjdk-jdk12u,jdk-$(OPENJDK_VERSION)) +OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz +OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk12u/archive OPENJDK_LICENSE = GPL-2.0+ with exception OPENJDK_LICENSE_FILES = LICENSE @@ -83,9 +84,6 @@ OPENJDK_CONF_OPTS = \ --with-native-debug-symbols=none \ --without-version-pre \ --with-sysroot=$(STAGING_DIR) \ - --with-vendor-name="AdoptOpenJDK" \ - --with-vendor-url="https://adoptopenjdk.net/" \ - --with-vendor-version-string="AdoptOpenJDK" \ --with-version-build="$(OPENJDK_VERSION_MAJOR)" \ --with-version-string="$(OPENJDK_VERSION_MAJOR)"