RFC: make all angstrom java related setting overridable from local.conf

RFC: make all angstrom java related setting overridable from local.conf

[Robert Schuster]

[-- Attachment #1.1: Type: text/plain, Size: 179 bytes --]

Hi,
atm angstrom does not allow me to override versions for the Java recipes
in local.conf. With the attached that is being made possible.

Ok, for .dev?

Regards,
Robert

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: oe-angstrom-jalimo.patch --]
[-- Type: text/x-patch; name="oe-angstrom-jalimo.patch", Size: 2064 bytes --]

diff --git a/conf/distro/include/angstrom-jalimo.conf b/conf/distro/include/angstrom-jalimo.conf
index 2aed63b..06698c0 100644
--- a/conf/distro/include/angstrom-jalimo.conf
+++ b/conf/distro/include/angstrom-jalimo.conf
@@ -1,32 +1,32 @@
 # Put a 'require conf/distro/include/angstrom-jalimo.conf' in your local.conf if you want to build from the jalimo overlay
 
 # initial stuff
-PREFERRED_VERSION_jamvm-initial = "1.4.5"
-PREFERRED_VERSION_classpath-initial = "0.93"
+PREFERRED_VERSION_jamvm-initial ?= "1.4.5"
+PREFERRED_VERSION_classpath-initial ?= "0.93"
 
 # Native VM
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
-PREFERRED_VERSION_jamvm-native = "1.5.3"
-#PREFERRED_VERSION_cacao-native = "0.99.3"
-PREFERRED_VERSION_classpath-native = "0.98"
+PREFERRED_PROVIDER_virtual/java-native ?= "jamvm-native"
+PREFERRED_VERSION_jamvm-native ?= "1.5.3"
+#PREFERRED_VERSION_cacao-native ?= "0.99.3"
+PREFERRED_VERSION_classpath-native ?= "0.98"
 
 # Native compiler settings
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
-PREFERRED_VERSION_libecj-bootstrap = "3.6"
+PREFERRED_PROVIDER_virtual/javac-native ?= "ecj-bootstrap-native"
+PREFERRED_VERSION_libecj-bootstrap ?= "3.6"
 
 # Target VM
-PREFERRED_VERSION_cacao = "0.99.3"
-PREFERRED_VERSION_cacaoh-native = "0.99.3"
+PREFERRED_VERSION_cacao ?= "0.99.3"
+PREFERRED_VERSION_cacaoh-native ?= "0.99.3"
 
-PREFERRED_VERSION_jamvm = "1.5.2"
-PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
-PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_VERSION_jamvm ?= "1.5.2"
+PREFERRED_PROVIDER_swt3.4-gtk ?= "swt3.4-gtk"
+PREFERRED_PROVIDER_classpath ?= "classpath"
 
-PREFERRED_VERSION_openjdk-6-jre = "6b18-1.8"
-PREFERRED_VERSION_icedtea6-native = "1.7.3"
+PREFERRED_VERSION_openjdk-6-jre ?= "6b18-1.8"
+PREFERRED_VERSION_icedtea6-native ?= "1.7.3"
 
 # Stage JAR files not into ARCH related dirs
-STAGING_DIR_JAVA = "${STAGING_DIR}/java"
+STAGING_DIR_JAVA ?= "${STAGING_DIR}/java"
 STAGING_DATADIR_JAVA ?= "${STAGING_DIR_JAVA}"
 
 

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 270 bytes --]

Re: RFC: make all angstrom java related setting overridable from local.conf

[Phil Blundell]

On Thu, 2010-07-22 at 12:18 +0200, Robert Schuster wrote:
> atm angstrom does not allow me to override versions for the Java recipes
> in local.conf. With the attached that is being made possible.

Can you not override them as:

PREFERRED_VERSION_cacao_local = "0.99.4"

already?  If that's not working then it sounds like there is a bug
elsewhere.  Adding these weak assignments ought not to be necessary.

p.

Re: RFC: make all angstrom java related setting overridable from local.conf

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 22-07-10 12:18, Robert Schuster wrote:
> Hi,
> atm angstrom does not allow me to override versions for the Java recipes
> in local.conf. With the attached that is being made possible.

The patch doesn't match your description. Could you please send a patch
that changes the *version* assignments to weak so it matches your
description *or* update the description to explain with providers and
STAGING_DIR_JAVA needs tweaking as well?

regards,

Koen

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMSCeaMkyGM64RGpERAnwRAJ0aPFq1TTp8V1/wmbH6sr8IHo+S8ACgrD6p
aa5bM2lLOqvUisFUXGXn8Og=
=uG3m
-----END PGP SIGNATURE-----