diff options
Diffstat (limited to 'classes/java-library.bbclass')
-rw-r--r-- | classes/java-library.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass index 2ce96ab..67541d2 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,15 +54,15 @@ 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_deletebinaries() { |
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}/*" \ |
61 | -name "*.class" -exec rm {} \; | 61 | -name "*.class" -exec rm {} \; |
62 | } | 62 | } |
63 | 63 | ||
64 | addtask removebinaries after do_unpack before do_patch | 64 | addtask deletebinaries 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 | } |