diff options
author | AJ Bagwell <anthony.bagwell@hivehome.com> | 2021-08-09 14:09:37 +0100 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2021-08-11 07:19:27 +0200 |
commit | b71a9866abfd5292650ef0afc5ecb9ab5e29b887 (patch) | |
tree | 8e7cfd6025f06b4138e2f5fbca61dce7d3a13bac /classes | |
parent | 984f25b6deb5fe4acf82d51c04b2c1392a542723 (diff) | |
download | meta-java-b71a9866abfd5292650ef0afc5ecb9ab5e29b887.tar.gz |
all: run convert-overrides (0.9.3) script to convert to new override format
Signed-off-by: AJ Bagwell <anthony.bagwell@hivehome.com>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/java-library.bbclass | 8 | ||||
-rw-r--r-- | classes/openjdk-build-helper.bbclass | 4 | ||||
-rw-r--r-- | classes/openjdk-test-image.bbclass | 2 | ||||
-rw-r--r-- | classes/openjre-test-image.bbclass | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass index 2ce96ab..62fabec 100644 --- a/classes/java-library.bbclass +++ b/classes/java-library.bbclass | |||
@@ -40,11 +40,11 @@ def java_package_name(d): | |||
40 | 40 | ||
41 | JPN ?= "${@java_package_name(d)}" | 41 | JPN ?= "${@java_package_name(d)}" |
42 | 42 | ||
43 | DEPENDS_prepend = "virtual/javac-native fastjar-native " | 43 | DEPENDS:prepend = "virtual/javac-native fastjar-native " |
44 | 44 | ||
45 | PACKAGES += "${JPN}" | 45 | PACKAGES += "${JPN}" |
46 | 46 | ||
47 | FILES_${JPN} = "${datadir_java}" | 47 | FILES:${JPN} = "${datadir_java}" |
48 | 48 | ||
49 | # File name of the libraries' main Jar file | 49 | # File name of the libraries' main Jar file |
50 | JARFILENAME = "${BP}.jar" | 50 | JARFILENAME = "${BP}.jar" |
@@ -54,7 +54,7 @@ ALTJARFILENAMES = "${BPN}.jar" | |||
54 | 54 | ||
55 | # Java "source" distributions often contain precompiled things | 55 | # Java "source" distributions often contain precompiled things |
56 | # we want to delete first. | 56 | # we want to delete first. |
57 | do_removebinaries() { | 57 | do:removebinaries() { |
58 | find ${WORKDIR} ! -path "${RECIPE_SYSROOT}/*" ! -path "${RECIPE_SYSROOT_NATIVE}/*" \ | 58 | find ${WORKDIR} ! -path "${RECIPE_SYSROOT}/*" ! -path "${RECIPE_SYSROOT_NATIVE}/*" \ |
59 | -name "*.jar" -exec rm {} \; | 59 | -name "*.jar" -exec rm {} \; |
60 | find ${WORKDIR} ! -path "${RECIPE_SYSROOT}/*" ! -path "${RECIPE_SYSROOT_NATIVE}/*" \ | 60 | find ${WORKDIR} ! -path "${RECIPE_SYSROOT}/*" ! -path "${RECIPE_SYSROOT_NATIVE}/*" \ |
@@ -63,6 +63,6 @@ do_removebinaries() { | |||
63 | 63 | ||
64 | addtask removebinaries after do_unpack before do_patch | 64 | addtask removebinaries after do_unpack before do_patch |
65 | 65 | ||
66 | do_install_append() { | 66 | do_install:append() { |
67 | oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES} | 67 | oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES} |
68 | } | 68 | } |
diff --git a/classes/openjdk-build-helper.bbclass b/classes/openjdk-build-helper.bbclass index 4e334c2..a4b77a0 100644 --- a/classes/openjdk-build-helper.bbclass +++ b/classes/openjdk-build-helper.bbclass | |||
@@ -2,8 +2,8 @@ | |||
2 | # passing a valid ${PARALLEL_MAKE} to it. OTOH OpenJDK's makefiles are | 2 | # passing a valid ${PARALLEL_MAKE} to it. OTOH OpenJDK's makefiles are |
3 | # parallelizable and we need ${PARALLEL_MAKE} to derive the proper value. | 3 | # parallelizable and we need ${PARALLEL_MAKE} to derive the proper value. |
4 | # The base for this quirk is that GNU Make only considers the last "-j" option. | 4 | # The base for this quirk is that GNU Make only considers the last "-j" option. |
5 | EXTRA_OEMAKE_remove_task-compile = "${PARALLEL_MAKE}" | 5 | EXTRA_OEMAKE:remove:task-compile = "${PARALLEL_MAKE}" |
6 | EXTRA_OEMAKE_remove_task-install = "${PARALLEL_MAKEINST}" | 6 | EXTRA_OEMAKE:remove:task-install = "${PARALLEL_MAKEINST}" |
7 | 7 | ||
8 | # OpenJDK supports parallel compilation but uses a plain number for this. | 8 | # OpenJDK supports parallel compilation but uses a plain number for this. |
9 | # In OE we have PARALLEL_MAKE which is the actual option passed to make, | 9 | # In OE we have PARALLEL_MAKE which is the actual option passed to make, |
diff --git a/classes/openjdk-test-image.bbclass b/classes/openjdk-test-image.bbclass index f6e4fca..47ad4bb 100644 --- a/classes/openjdk-test-image.bbclass +++ b/classes/openjdk-test-image.bbclass | |||
@@ -1,5 +1,5 @@ | |||
1 | DESCRIPTION = "An image for OpenJDK testing purposes" | 1 | DESCRIPTION = "An image for OpenJDK testing purposes" |
2 | 2 | ||
3 | TEST_SUITES_append = " javac" | 3 | TEST_SUITES:append = " javac" |
4 | 4 | ||
5 | inherit openjre-test-image | 5 | inherit openjre-test-image |
diff --git a/classes/openjre-test-image.bbclass b/classes/openjre-test-image.bbclass index 77dbd74..9562be4 100644 --- a/classes/openjre-test-image.bbclass +++ b/classes/openjre-test-image.bbclass | |||
@@ -4,6 +4,6 @@ IMAGE_FEATURES += "ssh-server-openssh package-management" | |||
4 | 4 | ||
5 | IMAGE_INSTALL = "${CORE_IMAGE_BASE_INSTALL}" | 5 | IMAGE_INSTALL = "${CORE_IMAGE_BASE_INSTALL}" |
6 | 6 | ||
7 | DEFAULT_TEST_SUITES_pn-${PN} = "ping ssh java" | 7 | DEFAULT_TEST_SUITES:pn-${PN} = "ping ssh java" |
8 | 8 | ||
9 | inherit core-image | 9 | inherit core-image |