From b71a9866abfd5292650ef0afc5ecb9ab5e29b887 Mon Sep 17 00:00:00 2001
From: AJ Bagwell <anthony.bagwell@hivehome.com>
Date: Mon, 9 Aug 2021 14:09:37 +0100
Subject: 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>
---
 classes/java-library.bbclass         | 8 ++++----
 classes/openjdk-build-helper.bbclass | 4 ++--
 classes/openjdk-test-image.bbclass   | 2 +-
 classes/openjre-test-image.bbclass   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'classes')

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):
 
 JPN ?= "${@java_package_name(d)}"
 
-DEPENDS_prepend = "virtual/javac-native fastjar-native "
+DEPENDS:prepend = "virtual/javac-native fastjar-native "
 
 PACKAGES += "${JPN}"
 
-FILES_${JPN} = "${datadir_java}"
+FILES:${JPN} = "${datadir_java}"
 
 # File name of the libraries' main Jar file
 JARFILENAME = "${BP}.jar"
@@ -54,7 +54,7 @@ ALTJARFILENAMES = "${BPN}.jar"
 
 # Java "source" distributions often contain precompiled things
 # we want to delete first.
-do_removebinaries() {
+do:removebinaries() {
   find ${WORKDIR} ! -path "${RECIPE_SYSROOT}/*" ! -path "${RECIPE_SYSROOT_NATIVE}/*" \
                   -name "*.jar" -exec rm {} \;
   find ${WORKDIR} ! -path "${RECIPE_SYSROOT}/*" ! -path "${RECIPE_SYSROOT_NATIVE}/*" \
@@ -63,6 +63,6 @@ do_removebinaries() {
 
 addtask removebinaries after do_unpack before do_patch
 
-do_install_append() {
+do_install:append() {
   oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES}
 }
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 @@
 # passing a valid ${PARALLEL_MAKE} to it. OTOH OpenJDK's makefiles are
 # parallelizable and we need ${PARALLEL_MAKE} to derive the proper value.
 # The base for this quirk is that GNU Make only considers the last "-j" option.
-EXTRA_OEMAKE_remove_task-compile = "${PARALLEL_MAKE}"
-EXTRA_OEMAKE_remove_task-install = "${PARALLEL_MAKEINST}"
+EXTRA_OEMAKE:remove:task-compile = "${PARALLEL_MAKE}"
+EXTRA_OEMAKE:remove:task-install = "${PARALLEL_MAKEINST}"
 
 # OpenJDK supports parallel compilation but uses a plain number for this.
 # 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 @@
 DESCRIPTION = "An image for OpenJDK testing purposes"
 
-TEST_SUITES_append = " javac"
+TEST_SUITES:append = " javac"
 
 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"
 
 IMAGE_INSTALL = "${CORE_IMAGE_BASE_INSTALL}"
 
-DEFAULT_TEST_SUITES_pn-${PN} = "ping ssh java"
+DEFAULT_TEST_SUITES:pn-${PN} = "ping ssh java"
 
 inherit core-image
-- 
cgit v1.2.3-54-g00ecf