classpath: Use an include file for x11 feature check
PATCH 1/3 classpath: Use an include file for x11 feature check
From: Andrei Gherzan <[email protected]>
This will make it easier to maintain reflecting the same distro check on packages depending on classpath (in the dependency chain).
--- recipes-core/classpath/classpath-features-check.inc | 6 ++++++ recipes-core/classpath/classpath_0.99.bb | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 recipes-core/classpath/classpath-features-check.inc
recipes-core/classpath/classpath-features-check.inc new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +inherit features_check +REQUIRED_DISTRO_FEATURES = "x11"
recipes-core/classpath/classpath_0.99.bb +1 -3
@@ -1,8 +1,6 @@ require classpath.inc -inherit features_check - -REQUIRED_DISTRO_FEATURES = "x11" +include classpath-features-check.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=92acc79f1f429143f4624d07b253702a"
Signature · 1 line
2.25.1
PATCH 2/3 libmatthew: Include features check from classpath
From: Andrei Gherzan <[email protected]>
classpath is a dependency of this package that also has a required distro feature on x11. Without having the same feature check here, a world build would fail when x11 is not enabled. Reflecting the same feature check in this recipe, makes sure that world will skip it as well.
--- recipes-core/libmatthew/libmatthew.inc | 3 +++ 1 file changed, 3 insertions(+)
recipes-core/libmatthew/libmatthew.inc +3 -0
@@ -5,11 +5,14 @@ SECTION = "libs" LICENSE = "MIT" DEPENDS = "virtual/java-native classpath-native classpath" + S = "${WORKDIR}/libmatthew-java-${PV}" PACKAGE_ARCH = "${TUNE_PKGARCH}" inherit java-library +include recipes-core/classpath/classpath-features-check.inc + # Some internal version numbers which change from time to time. # Allowing to override them makes this include file more # versatile.
Signature · 1 line
2.25.1
PATCH 3/3 dbus-java: Include features check from classpath
In reply to Andrei GherzanFrom: Andrei Gherzan <[email protected]>
classpath is an indirect dependency of this package that also has a required distro feature on x11. Without having the same feature check here, a world build would fail when x11 is not enabled. Reflecting the same feature check in this recipe, makes sure that world will skip it as well.
--- recipes-extended/dbus/dbus-java_2.7.bb | 2 ++ 1 file changed, 2 insertions(+)
recipes-extended/dbus/dbus-java_2.7.bb +2 -0
@@ -25,6 +25,8 @@ S = "${WORKDIR}/dbus-java-${PV}" inherit java-library +include recipes-core/classpath/classpath-features-check.inc + # jamvm-native unfortunately contains non-generificed java/lang/reflect classes # which are accessed in this package. Work around this by setting the bootclasspath # explicitly.
Signature · 1 line
2.25.1
Quoted 1 line · Andrei Gherzan via lists.openembedded.org
From: Andrei Gherzan <[email protected]>
Hi Andrei,
thanks for the series. I've just applied them to master-next. As soon as some testing happened I will merge them to master.
If you have any question please just drop me a line.
regards;rl
Quoted 40 lines
This will make it easier to maintain reflecting the same distro check on packages depending on classpath (in the dependency chain).
Signed-off-by Andrei Gherzan <[email protected]>--- recipes-core/classpath/classpath-features-check.inc | 6 ++++++ recipes-core/classpath/classpath_0.99.bb | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 recipes-core/classpath/classpath-features-check.increcipes-core/classpath/classpath-features-check.inc new file +6
-0@@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +inherit features_check +REQUIRED_DISTRO_FEATURES = "x11"recipes-core/classpath/classpath_0.99.bb +1
-3@@ -1,8 +1,6 @@ require classpath.inc -inherit features_check - -REQUIRED_DISTRO_FEATURES = "x11" +include classpath-features-check.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=92acc79f1f429143f4624d07b253702a"Signature · 1 line
2.25.1
Quoted 10 lines · Richard Leitner
Quoted 1 line · Andrei Gherzan via lists.openembedded.org
From: Andrei Gherzan <[email protected]>
Hi Andrei,
thanks for the series. I've just applied them to master-next. As soon as some testing happened I will merge them to master.
If you have any question please just drop me a line.
Thanks, Richard. I've also sent the series against kirkstone. It'd be awesome if we could do the same there. Is the testing something automated that I can check out logs on?
Andrei
Quoted 5 lines · Andrei Gherzan via lists.openembedded.org
Quoted 4 lines · Richard Leitner
Quoted 1 line · Andrei Gherzan via lists.openembedded.org
From: Andrei Gherzan <[email protected]>
Quoted 8 lines
Quoted 6 lines
Hi Andrei,
thanks for the series. I've just applied them to master-next. As soon as some testing happened I will merge them to master.
If you have any question please just drop me a line.
Thanks, Richard. I've also sent the series against kirkstone. It'd be awesome if we could do the same there. Is the testing something automated that I can check out logs on?
As currently master and kirkstone are the same I will simply merge kirkstone with master as soon as the changes were merged to master if that's OK with you?
Unfortunately the testing infrastructure is not public available :(
But ideas/offers where to host a public test runner are highly appreciated ;-)
regards;rl
Quoted 2 lines
Andrei
Quoted 12 lines · Richard Leitner
Quoted 10 lines · Andrei Gherzan via lists.openembedded.org
Quoted 9 lines · Richard Leitner
Quoted 1 line · Andrei Gherzan via lists.openembedded.org
From: Andrei Gherzan <[email protected]>
Hi Andrei,
thanks for the series. I've just applied them to master-next. As soon as some testing happened I will merge them to master.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
If you have any question please just drop me a line.
Thanks, Richard. I've also sent the series against kirkstone. It'd be awesome if we could do the same there. Is the testing something automated that I can check out logs on?
As currently master and kirkstone are the same I will simply merge kirkstone with master as soon as the changes were merged to master if that's OK with you?
Sounds good.
Quoted 2 lines
Unfortunately the testing infrastructure is not public available :(
Got it. That's fine. I'll just keep an eye on the repo.
Quoted 3 lines
But ideas/offers where to host a public test runner are highly appreciated ;-)
What is the current testing plan for the layer?
Andrei
Quoted 11 lines · Andrei Gherzan
Quoted 2 lines · Richard Leitner
Unfortunately the testing infrastructure is not public available :(
Got it. That's fine. I'll just keep an eye on the repo.
Quoted 3 lines
But ideas/offers where to host a public test runner are highly appreciated ;-)
What is the current testing plan for the layer?
It's basically running the image tests for arm, armv7, arm64, x86, x86_64 and ppc with the mejate and mejate-musl distribution.
I can prepare and share a repository containing those kas and gitlab-ci configurations if that's interesting to you?
regards;rl
Quoted 1 line
Andrei
Quoted 11 lines · Richard Leitner
Quoted 10 lines · Andrei Gherzan
Quoted 2 lines · Richard Leitner
Unfortunately the testing infrastructure is not public available :(
Got it. That's fine. I'll just keep an eye on the repo.
Quoted 3 lines
But ideas/offers where to host a public test runner are highly appreciated ;-)
Quoted 7 lines
Quoted 1 line
What is the current testing plan for the layer?
It's basically running the image tests for arm, armv7, arm64, x86,
x86_64and ppc with the mejate and mejate-musl distribution.I can prepare and share a repository containing those kas and gitlab-ci configurations if that's interesting to you?
Sure. Send them over when you get a chance.
BTW, did the testing finish? Are we able to push the changes?
Andrei
Quoted 17 lines · Andrei Gherzan
Quoted 16 lines · Richard Leitner
Quoted 11 lines · Andrei Gherzan
Quoted 2 lines · Richard Leitner
Unfortunately the testing infrastructure is not public available :(
Got it. That's fine. I'll just keep an eye on the repo.
Quoted 3 lines
But ideas/offers where to host a public test runner are highly appreciated ;-)
What is the current testing plan for the layer?
It's basically running the image tests for arm, armv7, arm64, x86,
x86_64and ppc with the mejate and mejate-musl distribution.
Quoted 6 lines
Quoted 2 lines
I can prepare and share a repository containing those kas and gitlab-ci configurations if that's interesting to you?
Sure. Send them over when you get a chance.
BTW, did the testing finish? Are we able to push the changes?
Hi Richard,
Do we have any updates on this patch set? It would be great if we could get it in kirkstone soon.
Thanks,
Andrei
On Tue, Aug 30, 2022 at 10:31:04AM +0100, Andrei Gherzan wrote:
...
Quoted 1 line
Do we have any updates on this patch set? It would be great if we could get it in kirkstone soon.
I'm currently facing problems with some of the tests/builds for arm64. I hope to get them sorted out today or tomorrow.
I'll give you a ping as soon as those tests are finished successfully.
regards;rl
Quoted 3 lines
Thanks,
Andrei
Quoted 10 lines · Richard Leitner
On Tue, Aug 30, 2022 at 10:31:04AM +0100, Andrei Gherzan wrote:
...
Quoted 1 line
Do we have any updates on this patch set? It would be great if we could get it in kirkstone soon.
I'm currently facing problems with some of the tests/builds for arm64. I hope to get them sorted out today or tomorrow.
I'll give you a ping as soon as those tests are finished successfully.
Thanks for the update. One small thing that I have realised - the patches I've pushed have the SPDX headers with an Apache license. Could you change that to MIT? I can also send a v2 series if that is easier for you.
Andrei