aboutsummaryrefslogtreecommitdiffstats
path: root/classes
AgeCommit message (Collapse)Author
2021-11-17openjdk-build-helper: Use python raw string for regex patternDouglas Royds
See https://docs.python.org/3/library/re.html Invalid escape sequences in Python’s usage of the backslash in string literals now generate a DeprecationWarning, and in the future this will become a SyntaxError. The solution is to use Python’s raw string notation for regular expression patterns; backslashes are not handled in any special way in a string literal prefixed with 'r'. Signed-off-by: Douglas Royds <douglas.royds@taitradio.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
2021-11-17openjdk-build-helper: fix arm64 buildJerome Brunet
When trying to build for an arm64 machine, such as qemuarm64, parsing of the recipes fails with the following messages: WARNING: /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb: Exception during build_dependencies for LLVM_CONFIGURE_ARCH WARNING: /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb: Error during finalise of /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb ERROR: ExpansionError during parsing /meta-java/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb Traceback (most recent call last): File "Var <LLVM_CONFIGURE_ARCH>", line 1, in <module> File "/meta-java/classes/openjdk-build-helper.bbclass", line 86, in openjdk_build_helper_get_llvm_configure_arch(d=<bb.data_smart.DataSmart object at 0x7f08fed017c0>): else: > if 'shark' in d.getVar('PACKAGECONFIG').split(): bb.warn("%s does not support %s in Shark builds yet" % (d.getVar('PN'), arch) ); bb.data_smart.ExpansionError: Failure expanding variable LLVM_CONFIGURE_ARCH, expression was ${@openjdk_build_helper_get_llvm_configure_arch(d)} which triggered exception AttributeError: 'NoneType' object has no attribute 'split' Using 'bb.utils.contains' solves the problem. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
2021-08-11all: manual fixes for new override syntaxAJ Bagwell
Signed-off-by: AJ Bagwell <anthony.bagwell@hivehome.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
2021-08-11all: run convert-overrides (0.9.3) script to convert to new override formatAJ Bagwell
Signed-off-by: AJ Bagwell <anthony.bagwell@hivehome.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
2020-05-01openjdk-build-helper: Fix decoding GCC major versionJacob Kroon
GCC in Fedora 32 is up to version 10, so return the whole word instead of the first letter. Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
2020-01-27java-library: inherit python nativeKraag Gorim
Several components make use of python in their build process. To not rely on python being part of the HOSTTOOLS python should be inherited. Signed-off-by: Kraag Gorim <kraaggorim@gmail.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
2020-01-21java.bbclass: remove bashism in comparisonRichard Leitner
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
2020-01-21java.bbclass: oe_makeclasspath does nothing without -sDavis, Michael
oe_makeclasspath is supposed to output for the target platform by default and the staging platform with -s. However it checks if the file exists even if -s is not defined which is always false. Additionaly remove comment around an error that never occurs. Signed-off-by: Michael Davis <michael.davis@essvote.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
2019-12-27remove True option to getVar callsAndré Draszik
getVar() has been defaulting to expanding by default for a long time (2016), thus remove the True option from getVar() calls with a regex search and replace. Search & replace made using the following command: sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \ -i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \ | cut -d':' -f1 \ | sort -u) Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
2019-12-27class/java-native: removeMohamad Noor Alim Hussin
Java-native class used NATIVE_INSTALL_WORKS which was removed from oe-core around 2010. Also updated recipes that inherit java-native to native class. Signed-off-by: Mohamad Noor Alim Hussin <mohamad.noor.alim.hussin@intel.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
2018-12-18java-library: make packages overriding PACKAGE_ARCH work againAndré Draszik
Recent changes is OE have caused the traditional approach of inheriting allarch and setting PACKAGE_ARCH not work anymore. Once allarch is inherited, PACKAGE_ARCH can not be overridden afterwards. See commit a23c482cab4f ("allarch: only enable allarch when multilib is not used") d9ba0219b2f6 in poky. http://git.openembedded.org/openembedded-core/commit/?id=a23c482cab4f874f4a6a6889716123569eb5ece9 The error manifests itself with configure trying to --host=allarch-poky-linux --target=allarch-poky-linux which fails. To work around this we can make java-library's allarch inherit conditional, as is done e.g. in OE-core for packagegroup.bbclass http://git.openembedded.org/openembedded-core/commit/?id=9c826962ec8fa45c2b035427442b90a41517144e http://git.openembedded.org/openembedded-core/commit/?id=2c9b1d304daade7b0907320aeb9c522e7ab9dcab So this commit does exactly that, and fixes the two users of this to follow the new approach. Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
2018-10-02openjdk-build-helper: add get_*_arch functionsRichard Leitner
As different parts of OpenJDK use sightly different names for ARCH'es we provide those translations functions centrally in our openjdk-build-helper class. Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
2018-08-13openjdk-build-helper: move c compiler flags retrieval to here (from openjdk-8)André Draszik
Icedtea 7 and OpenJDK 7 will need to apply new compiler flags for certain compiler version without breaking support for older (host) compilers. Move here so that the same code can be re-used. Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
2018-08-13java.bbclass: move openjdk/icedtea specific code into new classAndré Draszik
The code moved is not relevant to anything using java, just for compiling java itself. It doesn't make sense to have here. Move it into openjdk-build-helper Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
2018-06-19images/classes: add open{jdk,jre}-{7,8} testRichard Leitner
Add image classes and images for open{jdk,jre}-{7,8} oeqa tests. These will be the basis for future "quality gates". Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
2017-07-21java-library.bbclass: compatibility with per-recipe sysrootsS. Lockwood-Childs
The removebinaries task was intended to remove pre-built .jar and .class files from the unpacked source, but when per-recipe sysroots were implemented and ended up under WORKDIR, .jar or .class in those sysroots inadvertently started getting killed as well. For instance, ${WORKDIR}/recipe-sysroot-native/usr/share/java/ecj-bootstrap.jar was deleted when attempting to build jlex-native... which made javac in that sysroot rather unhappy. Solve by excluding both recipe-sysroot and recipe-sysroot-native dirs from the search-and-destroy operation. Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-12-06move from bb.data.getVar(x, d, 1) to d.getVar(x, True)Cody P Schafer
bb.data.getVar was removed, need to use the modern mechanism. Signed-off-by: Cody P Schafer <dev@codyps.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2016-08-30Reimplement helper method for parallelizing JDK buildsKyle Russell
Simplifies duplicated implementation across multiple recipes that all inherited from java.bbclass. Previously implementation was not flexible in supporting other make job-limiting flags (like -l for load) that are typically passed in through PARALLEL_MAKE. (OpenJDK doesn't know about these other flags that might have gotten tagged on after the value for -j.) Signed-off-by: Kyle Russell <bkylerussell@gmail.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2016-07-18java.bbclass: change a warning message to noteJackie Huang
The logic is to check if the destination file exists before create the symlink, and give a message about removing the existing file, it's harmless and not necessary to be a warning. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2016-01-04java.bbclass: java missing classes during compileAmy Fong
oe_makeclasspath is used to define the classpath argument passed to javac for a number of packages. The current behaviour takes a number args specifying jar files to look for and if the files exist, it adds it to a specified variable. On some builds, oe_makeclasspath cannot find the jar file. oe_makeclasspath used an invalid test to see the package is native. (testing if the build arch and package arch are the same, if so, native) We test to see if PN matches *-native or *-nativesdk instead. Signed-off-by: Amy Fong <amy.fong@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2016-01-04Revert "meta-java: rely on well known bootstrap-path"Jackie Huang
This reverts commit 04d5d0bf414c05ca59618d77f17ff9898aa1c566. Detail reason is in the following commit. Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
2015-12-08meta-java: rely on well known bootstrap-pathJens Rehsack
Instead of potential circular depending virtual/javac-native (even this recipe provides such a useable java-native), rely on well known path via cacao-native to build up to icedtea7-native in reliable manner. virtual/javac-native should be used by parts not belonging to the bootstrap phase. Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Maxin B. John <maxin.john@intel.com>
2015-02-17java-library: inherit allarchMax Krummenacher
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 <max.oss.09@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2013-09-29jamvm-native: separate bootclasspath out into shell scriptHenning Heinold
* instead of hardcode BCP and LD_LIBRARY_PATH into serval files use a shell script and set them there * this allow us again to use other vms for java-native
2013-09-29java-library.bbclass: Export BOOTCLASSPATH and LD_LIBRARY_PATHKhem Raj
They are helpful in rebuilding from shared state since jamvm is not so relocatable. Signed-off-by: Khem Raj <raj.khem@gmail.com>
2013-09-29java-library.bbclass: consider multilibKhem Raj
when multilib is enabled the prefix begins with lib32- and thats got wrong when computing JPN. Lets make sure that mlprefix is handled properly while constructing JPN for multilib package e.g. lib32-dbus-java will now create lib32-libdbus-java instead of lib32-dbus-java which was same as PN and caused warnings like WARNING: Variable key FILES_${PN} (${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} ${sysconfdir} ${sharedstatedir} ${localstatedir} ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*${SOLIBS} ${base_prefix}/lib/udev/rules.d ${prefix}/lib/udev/rules.d ${datadir}/${BPN} ${libdir}/${BPN}/* ${datadir}/pixmaps ${datadir}/applications ${datadir}/idl ${datadir}/omf ${datadir}/sounds ${libdir}/bonobo/servers) replaces original key FILES_lib32-dbus-java (${datadir_java}). Signed-off-by: Khem Raj <raj.khem@gmail.com>
2012-03-05java-library.bbclass: do not fully replace do_install with oe_jarinstallOtavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2012-03-05java-library.bbclass: allow for regular packages generationOtavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2012-03-05java.bbclass: use bbwarn as oewarn is now unsupportedOtavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2012-02-28meta-java: Fix quote errorsKhem Raj
new bitbake is strict about quoting so fix them Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
2012-01-06java.bbclass: oenote -> bbnote transitionHenning Heinold
Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
2012-01-06llvm, openjdk: Use bb.error instread of oefatalKhem Raj
oefatal is not available in oe-core so replace it with bbfatal in classes and oe.error in recipes which use it in anonymous python. bb.fatal aborts parsing. So we want to give an error but not stop parsing. Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
2011-11-26meta-java: initial commitHenning Heinold
* taken over mostly stuff from oe classic * cleaned up recipes * added license checksums * bump icedtea6-native to 1.8.11 * use jamvm from git as native