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 /recipes-extended | |
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 'recipes-extended')
-rw-r--r-- | recipes-extended/dbus/dbus-java_2.7.bb | 14 | ||||
-rw-r--r-- | recipes-extended/rxtx/rxtx_2.2.0.bb | 18 |
2 files changed, 16 insertions, 16 deletions
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 @@ | |||
1 | SUMMARY = "A pure Java D-Bus Implementation" | 1 | SUMMARY = "A pure Java D-Bus Implementation" |
2 | SUMMARY_${PN}-viewer = "${SUMMARY} (DBusViewer Binary)" | 2 | SUMMARY:${PN}-viewer = "${SUMMARY} (DBusViewer Binary)" |
3 | SUMMARY_${PN}-bin = "${SUMMARY} (Binaries)" | 3 | SUMMARY:${PN}-bin = "${SUMMARY} (Binaries)" |
4 | AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>" | 4 | AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>" |
5 | HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" | 5 | HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" |
6 | SECTION = "libs" | 6 | SECTION = "libs" |
7 | LICENSE = "LGPL-2.1 & AFL-2.1" | 7 | LICENSE = "LGPL-2.1 & AFL-2.1" |
8 | 8 | ||
9 | DEPENDS = "libmatthew gettext-native fastjar-native" | 9 | DEPENDS = "libmatthew gettext-native fastjar-native" |
10 | RDEPENDS_${PN}-viewer = "java2-runtime libunixsocket-java ${PN}-bin libmatthew-debug-java ${JPN}" | 10 | RDEPENDS:${PN}-viewer = "java2-runtime libunixsocket-java ${PN}-bin libmatthew-debug-java ${JPN}" |
11 | RDEPENDS_${PN}-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}" | 11 | RDEPENDS:${PN}-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}" |
12 | RSUGGESTS_${JPN} = "libunixsocket-java" | 12 | RSUGGESTS:${JPN} = "libunixsocket-java" |
13 | 13 | ||
14 | PR = "r1" | 14 | PR = "r1" |
15 | 15 | ||
@@ -73,5 +73,5 @@ do_install () { | |||
73 | # and dbus-bin*.jar | 73 | # and dbus-bin*.jar |
74 | PACKAGES = "${PN}-viewer ${PN}-bin ${JPN}" | 74 | PACKAGES = "${PN}-viewer ${PN}-bin ${JPN}" |
75 | 75 | ||
76 | FILES_${PN}-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" | 76 | FILES:${PN}-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" |
77 | FILES_${PN}-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" | 77 | 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 | |||
27 | 27 | ||
28 | S = "${WORKDIR}/rxtx-2.2pre2" | 28 | S = "${WORKDIR}/rxtx-2.2pre2" |
29 | 29 | ||
30 | INSANE_SKIP_${JPN} += "dev-so" | 30 | INSANE_SKIP:${JPN} += "dev-so" |
31 | 31 | ||
32 | PACKAGE_ARCH = "${TUNE_PKGARCH}" | 32 | PACKAGE_ARCH = "${TUNE_PKGARCH}" |
33 | inherit autotools-brokensep java-library remove-libtool | 33 | inherit autotools-brokensep java-library remove-libtool |
@@ -36,7 +36,7 @@ JARFILENAME = "RXTXcomm.jar" | |||
36 | EXTRA_OEMAKE += "RXTX_PATH=${D}${libdir_jni} \ | 36 | EXTRA_OEMAKE += "RXTX_PATH=${D}${libdir_jni} \ |
37 | JHOME=${D}${datadir_java}/ext" | 37 | JHOME=${D}${datadir_java}/ext" |
38 | 38 | ||
39 | do_configure_prepend() { | 39 | do_configure:prepend() { |
40 | # Ugly but don't complain to me, but upstream ;-) | 40 | # Ugly but don't complain to me, but upstream ;-) |
41 | sed -e 's,bin/javah,bin/gjavah,g' \ | 41 | sed -e 's,bin/javah,bin/gjavah,g' \ |
42 | -e 's,bin/jar,bin/fastjar,g' \ | 42 | -e 's,bin/jar,bin/fastjar,g' \ |
@@ -47,16 +47,16 @@ do_configure_prepend() { | |||
47 | ${S}/ltmain.sh | 47 | ${S}/ltmain.sh |
48 | } | 48 | } |
49 | 49 | ||
50 | do_install_prepend() { | 50 | do_install:prepend() { |
51 | install -d ${D}${libdir_jni} | 51 | install -d ${D}${libdir_jni} |
52 | install -d ${D}${datadir_java}/ext | 52 | install -d ${D}${datadir_java}/ext |
53 | } | 53 | } |
54 | 54 | ||
55 | PACKAGES_remove = "${PN}" | 55 | PACKAGES:remove = "${PN}" |
56 | 56 | ||
57 | FILES_${JPN} += "${libdir_jni}" | 57 | FILES:${JPN} += "${libdir_jni}" |
58 | RPROVIDES_${JPN} = "${PN}" | 58 | RPROVIDES:${JPN} = "${PN}" |
59 | RCONFLICTS_${JPN} = "${PN}" | 59 | RCONFLICTS:${JPN} = "${PN}" |
60 | RREPLACES_${JPN} = "${PN}" | 60 | RREPLACES:${JPN} = "${PN}" |
61 | 61 | ||
62 | FILES_${PN}-dbg += "${libdir_jni}/.debug" | 62 | FILES:${PN}-dbg += "${libdir_jni}/.debug" |