[meta-java,v2] openjdk: remove incorrect PROVIDES (java2-vm java2-runtime)

Submitted by André Draszik on Sept. 18, 2018, 2:48 p.m. | Patch ID: 154972

Details

Message ID 20180918144844.28163-1-git@andred.net
State Master Next
Delegated to: Richard Leitner
Headers show

Commit Message

André Draszik Sept. 18, 2018, 2:48 p.m.
From: André Draszik <andre.draszik@jci.com>

There are two issues here:
* PROVIDES is not package specific
* it doesn't look like the intention is to be able to
  DEPENDS on java2-vm or java2-runtime anyway

Regarding java2-vm:
-------------------
java2-vm was originally used in the OpenJDK 6 & 7 recipes to be able to
select shark, zero, cacao, or jamvm VMs. OpenJDK-6 is not available any
more, and OpenJDK-7 has removed support for most of this in commit
38f4c1365c11 ("openjdk7: remove broken/unsupported VM's")

It is not clear why it was added to the OpenJDK-8 recipe either.

Given OpenJDK-7 has no way of using the VM compiled as part of OpenJDK-8,
and given that no part of the OpenJDK-8 makes use of the java2-vm part, the
correct solution here is to actually *remove* the incorrect PROVIDES as
well as *R*PROVIDES statements for java2-vm completely.

Regarding java2-runtime:
------------------------
Again, looking at the other uses of this:
java2-runtime is a virtual runtime package name, which is provided by
different *runtime* packages (created by the OpenJDK-7, OpenJDK-8, JamVM, or
Cacao recipes). Other recipes only ever RDEPEND on java2-runtime. It makes
no sense for the OpenJDK-8 recipe to PROVIDES java2-runtime given the above.

Remove the incorrect (R)PROVIDES statements.

Signed-off-by: André Draszik <andre.draszik@jci.com>

---
This applies on top of commit ec5aae3d ("conf: distro: add mejate{,-musl} distributions")

v2:
also remove incorrect RPROVIDES java2-vm statements as per description
---
 recipes-core/openjdk/openjdk-8_172b11.bb | 3 ---
 recipes-core/openjdk/openjre-8_172b11.bb | 3 ---
 2 files changed, 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/recipes-core/openjdk/openjdk-8_172b11.bb b/recipes-core/openjdk/openjdk-8_172b11.bb
index c1c6e1e..72f208e 100644
--- a/recipes-core/openjdk/openjdk-8_172b11.bb
+++ b/recipes-core/openjdk/openjdk-8_172b11.bb
@@ -47,10 +47,7 @@  FILES_${PN}-doc_append = "\
 
 FILES_${PN}-source = " ${JDK_HOME}/src.zip "
 
-RPROVIDES_${PN} = "java2-vm"
-PROVIDES_${PN} = "java2-vm"
 RPROVIDES_${PN} = "java2-runtime"
-PROVIDES_${PN} = "java2-runtime"
 
 inherit update-alternatives
 
diff --git a/recipes-core/openjdk/openjre-8_172b11.bb b/recipes-core/openjdk/openjre-8_172b11.bb
index dd29691..e9b930b 100644
--- a/recipes-core/openjdk/openjre-8_172b11.bb
+++ b/recipes-core/openjdk/openjre-8_172b11.bb
@@ -35,10 +35,7 @@  FILES_${PN}-doc_append = "\
     ${JRE_HOME}/THIRD_PARTY_README \
 "
 
-RPROVIDES_${PN} = "java2-vm"
-PROVIDES_${PN} = "java2-vm"
 RPROVIDES_${PN} = "java2-runtime"
-PROVIDES_${PN} = "java2-runtime"
 
 inherit update-alternatives
 

Comments

Richard Leitner Oct. 10, 2018, 7:39 a.m.
Hi,
this is a note to let you know that I've just added this patch to the
master-next branch of the meta-java repository at
	git://git.yoctoproject.org/meta-java

As soon as it has gone through some more testing it will likely be
merged to the master branch.

If you have any questions, please let me know.

regards;Richard.L

On 9/18/18 4:48 PM, André Draszik wrote:
> From: André Draszik <andre.draszik@jci.com>
> 
> There are two issues here:
> * PROVIDES is not package specific
> * it doesn't look like the intention is to be able to
>   DEPENDS on java2-vm or java2-runtime anyway
> 
> Regarding java2-vm:
> -------------------
> java2-vm was originally used in the OpenJDK 6 & 7 recipes to be able to
> select shark, zero, cacao, or jamvm VMs. OpenJDK-6 is not available any
> more, and OpenJDK-7 has removed support for most of this in commit
> 38f4c1365c11 ("openjdk7: remove broken/unsupported VM's")
> 
> It is not clear why it was added to the OpenJDK-8 recipe either.
> 
> Given OpenJDK-7 has no way of using the VM compiled as part of OpenJDK-8,
> and given that no part of the OpenJDK-8 makes use of the java2-vm part, the
> correct solution here is to actually *remove* the incorrect PROVIDES as
> well as *R*PROVIDES statements for java2-vm completely.
> 
> Regarding java2-runtime:
> ------------------------
> Again, looking at the other uses of this:
> java2-runtime is a virtual runtime package name, which is provided by
> different *runtime* packages (created by the OpenJDK-7, OpenJDK-8, JamVM, or
> Cacao recipes). Other recipes only ever RDEPEND on java2-runtime. It makes
> no sense for the OpenJDK-8 recipe to PROVIDES java2-runtime given the above.
> 
> Remove the incorrect (R)PROVIDES statements.
> 
> Signed-off-by: André Draszik <andre.draszik@jci.com>
> 
> ---
> This applies on top of commit ec5aae3d ("conf: distro: add mejate{,-musl} distributions")
> 
> v2:
> also remove incorrect RPROVIDES java2-vm statements as per description
> ---
>  recipes-core/openjdk/openjdk-8_172b11.bb | 3 ---
>  recipes-core/openjdk/openjre-8_172b11.bb | 3 ---
>  2 files changed, 6 deletions(-)
> 
> diff --git a/recipes-core/openjdk/openjdk-8_172b11.bb b/recipes-core/openjdk/openjdk-8_172b11.bb
> index c1c6e1e..72f208e 100644
> --- a/recipes-core/openjdk/openjdk-8_172b11.bb
> +++ b/recipes-core/openjdk/openjdk-8_172b11.bb
> @@ -47,10 +47,7 @@ FILES_${PN}-doc_append = "\
>  
>  FILES_${PN}-source = " ${JDK_HOME}/src.zip "
>  
> -RPROVIDES_${PN} = "java2-vm"
> -PROVIDES_${PN} = "java2-vm"
>  RPROVIDES_${PN} = "java2-runtime"
> -PROVIDES_${PN} = "java2-runtime"
>  
>  inherit update-alternatives
>  
> diff --git a/recipes-core/openjdk/openjre-8_172b11.bb b/recipes-core/openjdk/openjre-8_172b11.bb
> index dd29691..e9b930b 100644
> --- a/recipes-core/openjdk/openjre-8_172b11.bb
> +++ b/recipes-core/openjdk/openjre-8_172b11.bb
> @@ -35,10 +35,7 @@ FILES_${PN}-doc_append = "\
>      ${JRE_HOME}/THIRD_PARTY_README \
>  "
>  
> -RPROVIDES_${PN} = "java2-vm"
> -PROVIDES_${PN} = "java2-vm"
>  RPROVIDES_${PN} = "java2-runtime"
> -PROVIDES_${PN} = "java2-runtime"
>  
>  inherit update-alternatives
>  
>