Angstrom: major rework of distro files:

* Absorb OABI config into main distro (thanks to woglinde's python magic)
* Group preferred providers and preferred versions as much as possible
* Document entries a bit more

1 files changed, 150 insertions, 139 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index f1f3fcdf7e..abc1f91239 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,11 +8,14 @@
 
 #DISTRO_VERSION = "2007.4"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "44"
+DISTRO_REVISION = "45"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
 
+#Images built can have to modes:
+# 'debug': empty rootpassword, strace and gdb included
+# 'release' no root password, no strace and gdb by default
 DISTRO_TYPE ?= "debug"
 #DISTRO_TYPE = "release"
 
@@ -75,6 +78,25 @@ FEED_ARCH_progear	= "i686"
 
 FEED_ARCH_efika		= "ppc603e"
 
+#strongarm machines, no EABI
+
+FEED_ARCH_collie        = "arm-oabi"
+FEED_ARCH_h3600         = "arm-oabi"
+FEED_ARCH_h3800         = "arm-oabi"
+FEED_ARCH_simpad        = "arm-oabi"
+
+#Tweak packaging for strongarm machines since they can't use EABI
+
+PACKAGE_ARCH_collie     = "arm-oabi"
+PACKAGE_ARCH_h3600      = "arm-oabi"
+PACKAGE_ARCH_h3800      = "arm-oabi"
+PACKAGE_ARCH_simpad     = "arm-oabi"
+
+PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_h3600  = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_h3800  = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi"
+
 FEED_URIS += " \
 		no-arch##${ANGSTROM_URI}/unstable/feed/all \
 		base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
@@ -87,162 +109,88 @@ FEED_URIS += " \
 #        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \
 #        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates"
 
-
-# We will lock down a SRCDATE when we go into release mode
-#SRCDATE = "20070303"
-
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9"
-PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.20-hh6"
-PREFERRED_VERSION_linux-handhelds-2.6_h4000 ?= "2.6.20-hh6"
-PREFERRED_VERSION_linux-handhelds-2.6_h5000 ?= "2.6.20-hh6"
-PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13"
-PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh6"
-PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh6"
-
-PREFERRED_VERSION_file = "4.18"
-PREFERRED_VERSION_file_native = "4.18"
-
-PREFERRED_VERSION_perl-native = "5.8.8"
-PREFERRED_VERSION_perl = "5.8.8"
-
-CVS_TARBALL_STASH = "\
+#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
+CVS_TARBALL_STASH ?= "\
 		     http://www.angstrom-distribution.org/unstable/sources/ \
 		     http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
 		    "
 
-# GPE
-require conf/distro/include/preferred-gpe-versions-2.8.inc
 
-PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
-PREFERRED_PROVIDER_esound 		?= "pulseaudio"
+# We will lock down a SRCDATE when we go into release mode
+#SRCDATE = "20070703"
 
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+PCMCIA_MANAGER = "pcmciautils"
 
-# we don't ship gtk-directfb by default
-PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ani  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-gif  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ico  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-png  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ras  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-tga  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
+#Preferred version for the kernel on various machines
+PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.16-hh9"
+PREFERRED_VERSION_linux-handhelds-2.6_h3900         ?= "2.6.20-hh6"
+PREFERRED_VERSION_linux-handhelds-2.6_h4000         ?= "2.6.20-hh6"
+PREFERRED_VERSION_linux-handhelds-2.6_h5000         ?= "2.6.20-hh6"
+PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal  ?= "2.6.19-hh13"
+PREFERRED_VERSION_linux-handhelds-2.6_hx4700        ?= "2.6.20-hh6"
+PREFERRED_VERSION_linux-handhelds-2.6_magician      ?= "2.6.20-hh6"
+
+PREFERRED_VERSION_hostap-modules                    ?= "0.4.7"
+PREFERRED_VERSION_hostap-utils                      ?= "0.4.7"
 
-PREFERRED_VERSION_fontconfig = "2.4.1"
-PREFERRED_VERSION_freetype = "2.3.3"
-PREFERRED_VERSION_freetype-native = "2.2.1"
-PREFERRED_VERSION_cairo = "1.4.4"
-PREFERRED_VERSION_glib-2.0 = "2.12.12"
-PREFERRED_VERSION_pango = "1.16.4"
+PREFERRED_VERSION_file         = "4.18"
+PREFERRED_VERSION_file_native  = "4.18"
+
+PREFERRED_VERSION_fontconfig       = "2.4.1"
+PREFERRED_VERSION_freetype         = "2.3.3"
+PREFERRED_VERSION_freetype-native  = "2.2.1"
+PREFERRED_VERSION_cairo            = "1.4.4"
+PREFERRED_VERSION_glib-2.0         = "2.12.12"
+PREFERRED_VERSION_pango            = "1.16.4"
 
 # older gtk-webcore releases don't work on ARM/EABI
 # We need to switch to a fixed SRCDATE or release as soon as possible 
-PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}"
-PREFERRED_VERSION_osb-jscore  = "0.5.2+svn${SRCDATE}"
-PREFERRED_VERSION_osb-nrcit   = "0.5.2+svn${SRCDATE}"
-PREFERRED_VERSION_osb-nrcore  = "0.5.2+svn${SRCDATE}"
+PREFERRED_VERSION_osb-browser      = "0.5.0+svn${SRCDATE}"
+PREFERRED_VERSION_osb-jscore       = "0.5.2+svn${SRCDATE}"
+PREFERRED_VERSION_osb-nrcit        = "0.5.2+svn${SRCDATE}"
+PREFERRED_VERSION_osb-nrcore       = "0.5.2+svn${SRCDATE}"
 
 #Small machines prefer kdrive, but we might ship full Xorg in other images
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-
-PREFERRED_VERSION_xserver-kdrive ?= "1.2.0"
-PREFERRED_VERSION_libxrandr ?= "1.2.1"
-PREFERRED_VERSION_xrandr ?= "1.2.0" 
-PREFERRED_VERSION_randrproto ?= "1.2.1"
-
-require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
-
+PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
+PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
 
-PREFERRED_VERSION_gtk+ = "2.10.12"
-PREFERRED_VERSION_libgnomeui = "2.16.1"
+PREFERRED_VERSION_xserver-kdrive    ?= "1.2.0"
+PREFERRED_VERSION_libxrandr         ?= "1.2.1"
+PREFERRED_VERSION_xrandr            ?= "1.2.0" 
+PREFERRED_VERSION_randrproto        ?= "1.2.1"
 
-PREFERRED_VERSION_prismstumbler = "0.7.3"
-
-#zap extra stuff taking place in $MACHINE.conf 
-GPE_EXTRA_INSTALL = ""
-
-
-# E
-require conf/distro/include/preferred-e-versions.inc
-
-#Make sure we use 2.6 on machines with a 2.4/2.6 selector
-KERNEL = "kernel26"
-MACHINE_KERNEL_VERSION = "2.6"
-
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
-
-# Virtuals:
-PREFERRED_PROVIDER_virtual/db ?= "db"
-PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-
-# Others:
-PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
-PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-PREFERRED_PROVIDER_tslib-conf ?= "tslib"
-PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
-PREFERRED_PROVIDER_ntp = "ntp"
-PREFERRED_PROVIDER_hotplug = "udev"
-PREFERRED_PROVIDER_libxss = "libxss"
-
-#NPTL stuff
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-
-
-#shouldn't that be uclibc-initial????
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
+PREFERRED_VERSION_gtk+               = "2.10.12"
+PREFERRED_VERSION_libgnomeui         = "2.16.1"
+PREFERRED_VERSION_prismstumbler      = "0.7.3"
 
 #use EABI toolchain
-PREFERRED_VERSION_gcc ?= "4.1.2"
-PREFERRED_VERSION_gcc-cross ?= "4.1.2"
-PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
+PREFERRED_VERSION_gcc               ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross         ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross-sdk     ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2"
 
-PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
-PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
+PREFERRED_VERSION_binutils          ?= "2.17.50.0.5"
+PREFERRED_VERSION_binutils-cross    ?= "2.17.50.0.5"
 PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
 
 #avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross"
-PREFERRED_VERSION_avr32-gcc = "4.1.2"
-PREFERRED_VERSION_avr32-gcc-cross = "4.1.2"
-PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.0.2"
+PREFERRED_VERSION_avr32-gcc               = "4.1.2"
+PREFERRED_VERSION_avr32-gcc-cross         = "4.1.2"
+PREFERRED_VERSION_gcc-cross-sdk_avr32     = "4.0.2"
 PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2"
 
-
-
 PREFERRED_VERSION_binutils_avr32 = "2.17"
 PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
 PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
 
-
-
-
+#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.20"
 
+#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing.
 PREFERRED_VERSION_glibc ?= "2.5"
 PREFERRED_VERSION_uclibc ?= "0.9.29"
 
@@ -264,29 +212,92 @@ PREFERRED_VERSION_glibc-initial ?= "2.5"
 # Busybox <1.1.0 doesn't have EABI support
 PREFERRED_VERSION_busybox = "1.2.1"
 
-PCMCIA_MANAGER = "pcmciautils"
-
 PREFERRED_VERSION_dbus ?= "1.0.2"
 PREFERRED_VERSION_dbus-glib ?= "0.72"
 
-PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
-PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
-PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
-PREFERRED_VERSION_hostap-modules ?= "0.4.7"
-PREFERRED_VERSION_hostap-utils ?= "0.4.7"
-
 PREFERRED_VERSION_wpa-supplicant = "0.5.5"
 
+
+#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
+require conf/distro/include/preferred-gpe-versions-2.8.inc
+require conf/distro/include/preferred-e-versions.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
+
+
+# Virtuals:
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
+
+#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo)
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc               = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc    = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc  = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc            = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc        = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc         = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc          = "glibc-intermediate"
+
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc    = "uclibc-initial"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc  = "uclibc-initial"
+
+# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
+PREFERRED_PROVIDER_hostap-conf                      ?= "hostap-conf"
+PREFERRED_PROVIDER_hostap-modules_h2200             ?= "hostap-modules"
+PREFERRED_PROVIDER_hostap-modules_hx4700            ?= "hostap-modules"
+
+PREFERRED_PROVIDER_virtual/db           ?= "db"
+PREFERRED_PROVIDER_virtual/db-native    ?= "db-native"
+PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
+PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
+PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
+
+# Others:
+PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
+PREFERRED_PROVIDER_esound 		?= "pulseaudio"
+PREFERRED_PROVIDER_gconf                ?= "gconf-dbus"
+PREFERRED_PROVIDER_gnome-vfs            ?= "gnome-vfs"
+PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
+PREFERRED_PROVIDER_tslib                ?= "tslib"
+PREFERRED_PROVIDER_tslib-conf           ?= "tslib"
+PREFERRED_PROVIDER_libgpewidget         ?= "libgpewidget"
+PREFERRED_PROVIDER_ntp                  ?= "ntp"
+PREFERRED_PROVIDER_hotplug               = "udev"
+PREFERRED_PROVIDER_libxss                = "libxss"
+
+# we don't ship gtk-directfb by default
+PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ani  ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-gif  ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ico  ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx  ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-png  ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm  ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ras  ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-tga  ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
+
+
+#Silence a warning during parsing
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+
+
+
 #Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff
 # c7x0, akita, spitz, nokia770, h2200, h6300, hx4700, simpad
 
 
 # add altboot to compatible models, will be replaced with angstrom-bootmanager
-#EXTRA_STUFF_append_c7x0 = "altboot"
-#EXTRA_STUFF_append_akita = "altboot"
-#EXTRA_STUFF_append_spitz = "altboot"
-#EXTRA_STUFF_append_poodle = "altboot"
-#EXTRA_STUFF_append_tosa = "altboot"
+#EXTRA_STUFF_append_c7x0          +=  "altboot"
+#EXTRA_STUFF_append_akita         += "altboot"
+#EXTRA_STUFF_append_spitz         += "altboot"
+#EXTRA_STUFF_append_poodle        += "altboot"
+#EXTRA_STUFF_append_tosa          += "altboot"
 
 
 # do some task-base stuff here