6 files changed, 40 insertions, 145 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index eff7a14e42..59ef9d3f4e 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.3"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "25"
+DISTRO_REVISION = "26"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -92,7 +92,7 @@ PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
 PREFERRED_VERSION_fontconfig = "2.4.1"
 PREFERRED_VERSION_freetype = "2.2.1"
 #fix screen corruption issues
-PREFERRED_VERSION_cairo = "1.3.8"
+PREFERRED_VERSION_cairo = "1.3.10"
 
 #Small machines prefer kdrive, but we might ship full Xorg in other images
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
@@ -141,6 +141,7 @@ PREFERRED_PROVIDER_libxss = "libxss"
 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/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-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"
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf
index 8041ca8fb6..2b0c745bde 100644
--- a/conf/distro/familiar-unstable.conf
+++ b/conf/distro/familiar-unstable.conf
@@ -1,88 +1 @@
-DISTRO = "familiar"
-DISTRO_NAME = "Familiar Linux"
-DISTRO_VERSION = "unstable-${DATE}"
-
-require conf/distro/include/familiar.inc
-
-DISTRO_TYPE = "debug"
-#DISTRO_TYPE = "release"
-#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!!
-
-FEED_URIS += " \
-    base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \
-	${MACHINE}##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/machine/${MACHINE} \
-	updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates \
-	locale-en##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/en \
-	locale-fr##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/fr \
-	locale-de##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/locale/de"
-
-#SRCDATE = 20050331
-#SRCDATE = "now"
-
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
-PREFERRED_VERSION_hostap-modules ?= "0.3.9"
-
-#2.4 machines prefer 0.13e ones
-PREFERRED_VERSION_orinoco-modules ?= "0.13e"
-
-#but 0.13e doesn't build against 2.6
-PREFERRED_VERSION_orinoco-modules_h2200 ?= "0.15"
-PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
-
-# The CSL compiler is unusable because
-# 1) certain programs stop to compile
-# 2) more programs segfault
-PREFERRED_VERSION_gcc ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
-
-#
-# PIN the familiar build to a version
-#
-PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
-PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
-
-
-#
-# Base
-#
-PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcdates.inc
-PREFERRED_VERSION_busybox ?= "1.00"
-
-#
-# GlibC
-#
-PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
-
-#
-# Opie
-#
-
-OPIE_VERSION = "1.2.2"
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QT = "yes"
-require conf/distro/include/preferred-opie-versions.inc
-
-#
-# GPE
-#
-
-PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-#
-# E
-#
-require conf/distro/include/preferred-e-versions.inc
-
+WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, the Familiar Linux support in OpenEmbedded is not up-to-date. \n     If you want to produce Familiar Linux compatible packages,\n     please use the Familiar Linux fork of OpenEmbedded.\n     Otherwise, using a DISTRO like \"angstrom-2007.1\" or \"generic\"\n     probably works well enough with your MACHINE configuration.\n*\n*\n')}"
diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf
new file mode 100644
index 0000000000..2b0c745bde
--- /dev/null
+++ b/conf/distro/familiar.conf
@@ -0,0 +1 @@
+WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, the Familiar Linux support in OpenEmbedded is not up-to-date. \n     If you want to produce Familiar Linux compatible packages,\n     please use the Familiar Linux fork of OpenEmbedded.\n     Otherwise, using a DISTRO like \"angstrom-2007.1\" or \"generic\"\n     probably works well enough with your MACHINE configuration.\n*\n*\n')}"
diff --git a/conf/distro/include/familiar.inc b/conf/distro/include/familiar.inc
deleted file mode 100644
index ea360f5dc5..0000000000
--- a/conf/distro/include/familiar.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Familiar Linux
-#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
-
-MAINTAINER ?= "Familiar Developers <familiar-dev@handhelds.org>"
-
-INHERIT += "package_ipk debian multimachine"
-TARGET_OS = "linux"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
-IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
-
-ENABLE_BINARY_LOCALE_GENERATION ?= "1"
-PARALLEL_INSTALL_MODULES = "1"
-UDEV_DEVFS_RULES = "1"
-
-DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
-
-# We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 52bd88a4e9..df00fbae37 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -55,8 +55,9 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 # TMPDIR = /usr/local/projects/oetmp
 
 # Uncomment this to specify a machine to build for. See the conf directory
-# for machines currently known to OpenEmbedded.
-# MACHINE = "collie"
+# for machines currently known to OpenEmbedded. This will automatically take care
+# of TARGET_ARCH
+# MACHINE = "c7x0"
 
 # Use this to specify the target architecture. Note that this is only
 # needed when building for a machine not known to OpenEmbedded. Better use
@@ -66,25 +67,26 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 # Use this to specify the target operating system.  The default is "linux",
 # for a normal linux system with glibc. Set this to "linux-uclibc" if you want
 # to build a uclibc based system.
+# Normally the DISTRO of your choosing will take care of this 
 # TARGET_OS = "linux"
 # TARGET_OS = "linux-uclibc"
 
 # Uncomment this to select a distribution policy. See the conf directory
 # for distributions currently known to OpenEmbedded.
-# Although they no longer contain version number in the (file-)name
-# familiar-unstable and openzaurus-unstable are so called "versioned"
-# distros, i.e. they explicitely select specific versions of various
-# packages.
+# Although it no longer contain version number in the (file-)name
+# openzaurus-unstable is a so called "versioned"  distro, i.e. they 
+# explicitely select specific versions of various packages.
 # Stay away from unversioned distros unless you really know what you are doing
 # DISTRO = "generic"
 
-# So far, angstrom.conf and familiar.conf set ENABLE_BINARY_LOCALE_GENERATION
+# So far, angstrom.conf sets ENABLE_BINARY_LOCALE_GENERATION
 # to generate binary locale packages at build time using qemu-native and
 # thereby guarantee i18n support on all devices. If your build breaks on 
 # qemu-native consider disabling ENABLE_BINARY_LOCALE_GENERATION (note that
 # this breaks i18n on devices with less than 128MB RAM) or installing
 # a working third-party qemu (e.g. provided by your distribution) and
-# adding qemu-native to ASSUME_PROVIDED
+# adding qemu-native to ASSUME_PROVIDED. Caveat emptor, since third-party
+# qemus lack patches needed to work with various OE targets.
 # ENABLE_BINARY_LOCALE_GENERATION = "0"
 # ASSUME_PROVIDED += "qemu-native"
 
@@ -108,7 +110,8 @@ IMAGE_FSTYPES = "jffs2 tar"
 # BBDEBUG = "yes"
 
 # Uncomment these two if you want BitBake to build images useful for debugging. 
-# Note that INHIBIT_PACKAGE_STRIP needs a package format to be defined
+# Note that INHIBIT_PACKAGE_STRIP needs a package format to be defined.
+# Also note that OE now produces -dbg packages which contain debugging symbols.
 # DEBUG_BUILD = "1"
 # INHIBIT_PACKAGE_STRIP = "1"
 
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index f00dc9eb96..323aa8f061 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -1,37 +1,34 @@
 #@TYPE: Machine
-#@NAME: Compaq iPAQ 39xx
-#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx
-
-KERNEL ?= "kernel24"
-#KERNEL ?= "kernel26"
-
-INHERIT += "linux-kernel-base"
-
-OVERRIDES =. "${KERNEL}:"
+#@NAME: HP iPAQ h39xx
+#@DESCRIPTION: Machine configuration for the HP iPAQ h39xx
 
+#
+# Hardware-based properties
+#
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
-PREFERRED_PROVIDER_virtual/kernel_kernel26 = "linux-handhelds-2.6"
-EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p"
 
-ROOT_FLASH_SIZE = "32"
+require conf/machine/include/tune-xscale.conf
 
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
+ROOT_FLASH_SIZE = "32"
+VOLATILE_STORAGE_SIZE = "64"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen"
 
-H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic nmc_asic3 mtdchar h3900-uda1380"
-H3900_MODULES_kernel26 = " h3900_lcd asic2_adcts g_ether apm h3900_battery pcmcia-core"
-# pxa2xx_udc is built in to the kernel
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-SERIAL_CONSOLE = "115200 tts/0 vt100"
+#
+# Modules autoload and other boot properties
+#
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_g_ether = "g_ether"
 
-USE_DEVFS_kernel24 = "1"
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-
-GUI_MACHINE_CLASS = "smallscreen"
-
-# not using tune-xscale so as to retain backwards compatibility
-require conf/machine/include/tune-xscale.conf
+require conf/machine/include/LAB-settings.conf