Skip to contentSkip to conversation

openjdk: remove incorrect PROVIDES (java2-vm java2-runtime)

PATCH Superseded André Draszik 1 participant 1 message Sep 18, 2018

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 openjdk: remove incorrect PROVIDES (java2-vm java2-runtime)

From: André Draszik <[email protected]>

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 statement 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 PROVIDES statements.

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

---
 recipes-core/openjdk/openjdk-8_172b11.bb | 2 --
 recipes-core/openjdk/openjre-8_172b11.bb | 2 --
 2 files changed, 4 deletions(-)
recipes-core/openjdk/openjdk-8_172b11.bb +0 -2
index c1c6e1e..08f3a32 100644
@@ -48,9 +48,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
 
recipes-core/openjdk/openjre-8_172b11.bb +0 -2
index dd29691..d2e8f31 100644
@@ -36,9 +36,7 @@ FILES_${PN}-doc_append = "\
 "
 
 RPROVIDES_${PN} = "java2-vm"
-PROVIDES_${PN} = "java2-vm"
 RPROVIDES_${PN} = "java2-runtime"
-PROVIDES_${PN} = "java2-runtime"
 
 inherit update-alternatives
 
Signature · 1 line
2.19.0