From b71a9866abfd5292650ef0afc5ecb9ab5e29b887 Mon Sep 17 00:00:00 2001 From: AJ Bagwell 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 Signed-off-by: Richard Leitner --- recipes-extended/dbus/dbus-java_2.7.bb | 14 +++++++------- recipes-extended/rxtx/rxtx_2.2.0.bb | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'recipes-extended') diff --git a/recipes-extended/dbus/dbus-java_2.7.bb b/recipes-extended/dbus/dbus-java_2.7.bb index dfd2ff1..ca7652a 100644 --- a/recipes-extended/dbus/dbus-java_2.7.bb +++ b/recipes-extended/dbus/dbus-java_2.7.bb @@ -1,15 +1,15 @@ SUMMARY = "A pure Java D-Bus Implementation" -SUMMARY_${PN}-viewer = "${SUMMARY} (DBusViewer Binary)" -SUMMARY_${PN}-bin = "${SUMMARY} (Binaries)" +SUMMARY:${PN}-viewer = "${SUMMARY} (DBusViewer Binary)" +SUMMARY:${PN}-bin = "${SUMMARY} (Binaries)" AUTHOR = "Matthew Johnson " HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" SECTION = "libs" LICENSE = "LGPL-2.1 & AFL-2.1" DEPENDS = "libmatthew gettext-native fastjar-native" -RDEPENDS_${PN}-viewer = "java2-runtime libunixsocket-java ${PN}-bin libmatthew-debug-java ${JPN}" -RDEPENDS_${PN}-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}" -RSUGGESTS_${JPN} = "libunixsocket-java" +RDEPENDS:${PN}-viewer = "java2-runtime libunixsocket-java ${PN}-bin libmatthew-debug-java ${JPN}" +RDEPENDS:${PN}-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}" +RSUGGESTS:${JPN} = "libunixsocket-java" PR = "r1" @@ -73,5 +73,5 @@ do_install () { # and dbus-bin*.jar PACKAGES = "${PN}-viewer ${PN}-bin ${JPN}" -FILES_${PN}-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" -FILES_${PN}-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" +FILES:${PN}-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" +FILES:${PN}-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" diff --git a/recipes-extended/rxtx/rxtx_2.2.0.bb b/recipes-extended/rxtx/rxtx_2.2.0.bb index 87d84a8..27935bc 100644 --- a/recipes-extended/rxtx/rxtx_2.2.0.bb +++ b/recipes-extended/rxtx/rxtx_2.2.0.bb @@ -27,7 +27,7 @@ SRC_URI[sha256sum] = "3c30373e760f444def3650c76c5a00ae12fb1d860ec008750d084f4880 S = "${WORKDIR}/rxtx-2.2pre2" -INSANE_SKIP_${JPN} += "dev-so" +INSANE_SKIP:${JPN} += "dev-so" PACKAGE_ARCH = "${TUNE_PKGARCH}" inherit autotools-brokensep java-library remove-libtool @@ -36,7 +36,7 @@ JARFILENAME = "RXTXcomm.jar" EXTRA_OEMAKE += "RXTX_PATH=${D}${libdir_jni} \ JHOME=${D}${datadir_java}/ext" -do_configure_prepend() { +do_configure:prepend() { # Ugly but don't complain to me, but upstream ;-) sed -e 's,bin/javah,bin/gjavah,g' \ -e 's,bin/jar,bin/fastjar,g' \ @@ -47,16 +47,16 @@ do_configure_prepend() { ${S}/ltmain.sh } -do_install_prepend() { +do_install:prepend() { install -d ${D}${libdir_jni} install -d ${D}${datadir_java}/ext } -PACKAGES_remove = "${PN}" +PACKAGES:remove = "${PN}" -FILES_${JPN} += "${libdir_jni}" -RPROVIDES_${JPN} = "${PN}" -RCONFLICTS_${JPN} = "${PN}" -RREPLACES_${JPN} = "${PN}" +FILES:${JPN} += "${libdir_jni}" +RPROVIDES:${JPN} = "${PN}" +RCONFLICTS:${JPN} = "${PN}" +RREPLACES:${JPN} = "${PN}" -FILES_${PN}-dbg += "${libdir_jni}/.debug" +FILES:${PN}-dbg += "${libdir_jni}/.debug" -- cgit v1.2.3-54-g00ecf