From c7f2b7dd60bff9092eeae6b7df7f8cae16994a21 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 17 Feb 2015 10:57:14 +0100 Subject: java-library: inherit allarch Use the allarch class to make every packages in the 'all' ARCH. Recipes inheriting java-library which build additional packages which don't belong in to all ARCH must manually setting PACKAGE_ARCH after inheritting java-library. This fixes the following error when building e.g. rhino for a second machine of different architecture in the same build directory: ERROR: The recipe rhino is trying to install files into a shared area when those files already exist. Those files and their manifest location are: /.../ipk/all/librhino-java_1.7r4-r0_all.ipk Matched in manifest-armv7at2hf-vfp-rhino-package_write_ipk Signed-off-by: Max Krummenacher Signed-off-by: Otavio Salvador --- classes/java-library.bbclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass index a74c8d3..144cd2f 100644 --- a/classes/java-library.bbclass +++ b/classes/java-library.bbclass @@ -7,8 +7,12 @@ # starts with "lib" and/or ends with "-java". In case the "lib" prefix is part of # your package's normal name (e.g. liberator) the guessing is wrong and you have # to set JPN manually! +# +# package archs are set to all, if the recipe builds also packages which +# can not be used for all archs, then set the PACKAGE_ARCH of that package +# manually, see rxtx_xx.bb for an example. -inherit java +inherit java allarch # use java_stage for native packages JAVA_NATIVE_STAGE_INSTALL = "1" @@ -35,8 +39,6 @@ DEPENDS_prepend = "virtual/javac-native fastjar-native " PACKAGES += "${JPN}" -PACKAGE_ARCH_${JPN} = "all" - FILES_${JPN} = "${datadir_java}" # File name of the libraries' main Jar file -- cgit v1.2.3-54-g00ecf