From 7cdbb684748235a83ce7e48121f762dd6c1bfd1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 29 Nov 2020 18:49:35 +0700 Subject: [PATCH] openjdk: split to an metapackage - remove its noarch attribute without rebuilding openjdk8 --- srcpkgs/openjdk | 1 - srcpkgs/openjdk-doc | 2 +- srcpkgs/openjdk-jre | 2 +- srcpkgs/openjdk-src | 2 +- srcpkgs/openjdk/template | 25 +++++++++++++++++++++++++ srcpkgs/openjdk8/template | 28 ---------------------------- 6 files changed, 28 insertions(+), 32 deletions(-) delete mode 120000 srcpkgs/openjdk create mode 100644 srcpkgs/openjdk/template diff --git a/srcpkgs/openjdk b/srcpkgs/openjdk deleted file mode 120000 index aa848272341..00000000000 --- a/srcpkgs/openjdk +++ /dev/null @@ -1 +0,0 @@ -openjdk8 \ No newline at end of file diff --git a/srcpkgs/openjdk-doc b/srcpkgs/openjdk-doc index aa848272341..9437a0d174a 120000 --- a/srcpkgs/openjdk-doc +++ b/srcpkgs/openjdk-doc @@ -1 +1 @@ -openjdk8 \ No newline at end of file +openjdk \ No newline at end of file diff --git a/srcpkgs/openjdk-jre b/srcpkgs/openjdk-jre index aa848272341..9437a0d174a 120000 --- a/srcpkgs/openjdk-jre +++ b/srcpkgs/openjdk-jre @@ -1 +1 @@ -openjdk8 \ No newline at end of file +openjdk \ No newline at end of file diff --git a/srcpkgs/openjdk-src b/srcpkgs/openjdk-src index aa848272341..9437a0d174a 120000 --- a/srcpkgs/openjdk-src +++ b/srcpkgs/openjdk-src @@ -1 +1 @@ -openjdk8 \ No newline at end of file +openjdk \ No newline at end of file diff --git a/srcpkgs/openjdk/template b/srcpkgs/openjdk/template new file mode 100644 index 00000000000..aeb860a9852 --- /dev/null +++ b/srcpkgs/openjdk/template @@ -0,0 +1,25 @@ +# Template file for 'openjdk' +pkgname=openjdk +version=8u999 +revision=1 +build_style=meta +depends="openjdk${version%u*}" +short_desc="OpenJDK Java Development Kit (meta)" +maintainer="Đoàn Trần Công Danh " +license="metapackage" +homepage="https://voidlinux.org" + +openjdk-jre_package() { + short_desc+=" - runtime components" + depends="openjdk${version%u*}-jre" +} + +openjdk-src_package() { + short_desc+=" - source code" + depends="openjdk${version%u*}-src" +} + +openjdk-doc_package() { + short_desc+=" - documentation" + depends="openjdk${version%u*}-doc" +} diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template index 80b2b88331a..30b7fdd3131 100644 --- a/srcpkgs/openjdk8/template +++ b/srcpkgs/openjdk8/template @@ -284,31 +284,3 @@ openjdk8-doc_package() { vmove ${_final_jdk_home}/man/man1 } } - -openjdk_package() { - archs=noarch - build_style=meta - depends="openjdk8>=${version}_${revision}" - short_desc+=" (transitional dummy package)" -} - -openjdk-jre_package() { - archs=noarch - build_style=meta - depends="openjdk8-jre>=${version}_${revision}" - short_desc+=" - runtime components (transitional dummy package)" -} - -openjdk-src_package() { - archs=noarch - build_style=meta - depends="openjdk8-src>=${version}_${revision}" - short_desc+=" - source code (transitional dummy package)" -} - -openjdk-doc_package() { - archs=noarch - build_style=meta - depends="openjdk8-doc>=${version}_${revision}" - short_desc+=" - documentation (transitional dummy package)" -}