openjdk: remove incorrect PROVIDES (java2-vm java2-runtime)
PATCH v2 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 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.
---
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(-)
recipes-core/openjdk/openjdk-8_172b11.bb +0 -3
@@ -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
recipes-core/openjdk/openjre-8_172b11.bb +0 -3
@@ -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
Signature · 1 line
2.19.0
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
Quoted 74 lines · André Draszik
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 anywayRegarding 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 commit38f4c1365c11("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 <[email protected]>---
This applies on top of commitec5aae3d("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(-)recipes-core/openjdk/openjdk-8_172b11.bb +0
-3@@ -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-alternativesrecipes-core/openjdk/openjre-8_172b11.bb +0
-3@@ -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