Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

5 files changed, 94 insertions, 178 deletions

diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index d773de449a..e7d7a99413 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -21,6 +21,10 @@ DISTRO_TYPE = "debug"
 # Needed for e.g. libffi builds on armv6
 OVERRIDES .= ":${FEED_ARCH}"
 
+# Set the toolchain type (internal, external) and brand (generic, csl etc.)
+TOOLCHAIN_TYPE ?= "internal"
+TOOLCHAIN_BRAND ?= ""
+
 LIBC = "glibc"
 require conf/distro/include/angstrom-glibc.inc
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O1"
@@ -54,6 +58,8 @@ PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-binutils = "binutils-cross"
 PREFERRED_PROVIDER_linux-libc-header = "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/libx11 = "libx11"
 PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
+PREFERRED_PROVIDER_util-linux = "util-linux"
+
 
 PREFERRED_VERSION_automake-native = "1.9.6"
 
diff --git a/conf/distro/include/kaeilos.inc b/conf/distro/include/kaeilos.inc
index fc0348da28..ad03976c67 100644
--- a/conf/distro/include/kaeilos.inc
+++ b/conf/distro/include/kaeilos.inc
@@ -10,17 +10,20 @@ USERDISTRO := "${DISTRO}"
 DISTRO = "kaeilos"
 DISTRO_NAME = "KaeilOS"
 
+BUILDNAME = "KaeilOS ${DISTRO_VERSION}"
+
 TARGET_VENDOR = "-kaeilos"
 
 # Add FEED_ARCH to overrides
 OVERRIDES .= ":${FEED_ARCH}"
 
 # Put links to sources in deploy/sources to make it easier for people to be GPL compliant
-SRC_DIST_LOCAL ?= "symlink"
 INHERIT += "src_distribute_local"
+SRC_DIST_LOCAL ?= "symlink"
 
 # Can be "glibc", "eglibc" or "uclibc"
-LIBC ?= "glibc"
+KAEILOSLIBC ?= "glibc"
+LIBC ?= "${KAEILOSLIBC}"
 PSTAGE_EXTRAPATH = "${LIBC}"
 
 CACHE = "${TMPDIR}/cache/${LIBC}/${MACHINE}"
@@ -34,8 +37,8 @@ require conf/distro/include/angstrom-${LIBC}.inc
 
 # We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc
 ANGSTROM_ARM_INSTRUCTION_SET ?= "arm"
-ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb"
-ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb"
+#ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb"
+#ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb"
 
 
 ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}"
@@ -72,6 +75,9 @@ INHERIT += "debian"
 #activate config checker
 INHERIT += "sanity" 
 
+#activate the blacklister
+INHERIT += "angstrom"
+
 #make devshell available as task
 INHERIT += "devshell" 
 
@@ -80,13 +86,25 @@ INHERIT += "angstrom-mirrors"
 
 #run QA tests on builds and packages and log them  
 INHERIT += "insane"
+# INHERIT += "packagehistory"
 QA_LOG = "1"
 
+#run QA tests on recipes
+INHERIT += "recipe_sanity"
+
+#save statistical info on images
+INHERIT += "testlab"
+
 ANGSTROM_PKG_FORMAT ?= "ipk"
 require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc
 
+
 # We don't want to keep OABI compat
 ARM_KEEP_OABI = "0"
+# Do keep OABI compat for om-gta01 to keep the gllin binary working
+ARM_KEEP_OABI_pn-linux-openmoko-2.6.24_om-gta01 = "1"
+ARM_KEEP_OABI_pn-linux-openmoko-2.6.28_om-gta01 = "1"
+
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
 PREFERRED_PROVIDER_qemu-native = "qemu-native"
@@ -95,8 +113,8 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 # We only want to build UTF8 locales
 LOCALE_UTF8_ONLY = "1"
 
-#qemu doesn't like armv6/eabi/vfp
-ENABLE_BINARY_LOCALE_GENERATION_armv7a = "0"
+#qemu doesn't like this fp
+ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
 
 #qemu has taken a dislike to armeb as well
 ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
@@ -121,158 +139,11 @@ TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t"
 #Set the right arch for the feeds
 #Alphabetically sorted
 
-FEED_ARCH ?= "${TARGET_ARCH}"
+FEED_ARCH ?= "${BASE_PACKAGE_ARCH}"
 
 #blackfin machines
 FEED_ARCH_bfin          = "blackfin"
 
-#armv4t machines
-
-FEED_ARCH_acern30 	= "armv4t"
-FEED_ARCH_amsdelta 	= "armv4t"
-FEED_ARCH_ep93xx 	= "armv4t"
-FEED_ARCH_eteng500 	= "armv4t"
-FEED_ARCH_om-gta01 	= "armv4t"
-FEED_ARCH_om-gta02 	= "armv4t"
-FEED_ARCH_h1940 	= "armv4t"
-FEED_ARCH_h6300 	= "armv4t"
-FEED_ARCH_kb9202 	= "armv4t"
-FEED_ARCH_ks8695 	= "armv4t"
-FEED_ARCH_rx1950 	= "armv4t"
-FEED_ARCH_rx3000 	= "armv4t"
-FEED_ARCH_sarge-at91 	= "armv4t"
-FEED_ARCH_smdk2440 	= "armv4t"
-FEED_ARCH_smdk2443 	= "armv4t"
-
-#armv5t machines
-
-FEED_ARCH_a1200 	= "armv5te"
-FEED_ARCH_a780 		= "armv5te"
-FEED_ARCH_akita 	= "armv5te"
-FEED_ARCH_asus620 	= "armv5te"
-FEED_ARCH_asus730 	= "armv5te"
-FEED_ARCH_at91sam9263ek = "armv5te"
-FEED_ARCH_aximx50 	= "armv5te"
-FEED_ARCH_aximx50v 	= "armv5te"
-FEED_ARCH_c7x0 		= "armv5te"
-FEED_ARCH_compulab-pxa270 = "armv5te"
-FEED_ARCH_davinci-dvevm = "armv5te"
-FEED_ARCH_devkitidp-pxa255 = "armv5te"
-FEED_ARCH_e680 		= "armv5te"
-FEED_ARCH_er0100 	= "armv5te"
-FEED_ARCH_gumstix 	= "armv5te"
-FEED_ARCH_gumstix-verdex = "armv5te"
-FEED_ARCH_gumstix-connex = "armv5te"
-FEED_ARCH_h1910 	= "armv5te"
-FEED_ARCH_h2200 	= "armv5te"
-FEED_ARCH_h3900 	= "armv5te"
-FEED_ARCH_h4000 	= "armv5te"
-FEED_ARCH_h5000 	= "armv5te"
-FEED_ARCH_htcalpine 	= "armv5te"
-FEED_ARCH_htcapache 	= "armv5te"
-FEED_ARCH_htcblueangel 	= "armv5te"
-FEED_ARCH_htchimalaya 	= "armv5te"
-FEED_ARCH_htcsable 	= "armv5te"
-FEED_ARCH_htctornado 	= "armv5te"
-FEED_ARCH_htcuniversal 	= "armv5te"
-FEED_ARCH_hx2000 	= "armv5te"
-FEED_ARCH_hx4700 	= "armv5te"
-FEED_ARCH_ixp4xxle 	= "armv5te"
-FEED_ARCH_logicpd-pxa270 = "armv5te"
-FEED_ARCH_looxc550 	= "armv5te"
-FEED_ARCH_lsarm 	= "armv5te"
-FEED_ARCH_magician 	= "armv5te"
-FEED_ARCH_mainstone 	= "armv5te"
-FEED_ARCH_mnci 		= "armv5te"
-FEED_ARCH_mtx-3 	= "armv5te"
-FEED_ARCH_mx21ads 	= "armv5te"
-FEED_ARCH_n2100 	= "armv5te"
-FEED_ARCH_navman-icn330 = "armv5te"
-FEED_ARCH_netbook-pro 	= "armv5te"
-FEED_ARCH_nokia770 	= "armv5te"
-FEED_ARCH_rokre2 	= "armv5te"
-FEED_ARCH_nslu2le 	= "armv5te"
-FEED_ARCH_omap1510inn 	= "armv5te"
-FEED_ARCH_omap1610h2 	= "armv5te"
-FEED_ARCH_omap1710h3 	= "armv5te"
-FEED_ARCH_omap5912osk 	= "armv5te"
-FEED_ARCH_palmld 	= "armv5te"
-FEED_ARCH_palmt650 	= "armv5te"
-FEED_ARCH_palmt680 	= "armv5te"
-FEED_ARCH_palmtc 	= "armv5te"
-FEED_ARCH_palmtt 	= "armv5te"
-FEED_ARCH_palmtt3 	= "armv5te"
-FEED_ARCH_palmtt5 	= "armv5te"
-FEED_ARCH_palmtx 	= "armv5te"
-FEED_ARCH_palmz31 	= "armv5te"
-FEED_ARCH_palmz71 	= "armv5te"
-FEED_ARCH_palmz72 	= "armv5te"
-FEED_ARCH_poodle 	= "armv5te"
-FEED_ARCH_qemuarm 	= "armv5te"
-FEED_ARCH_spitz 	= "armv5te"
-FEED_ARCH_tosa 		= "armv5te"
-FEED_ARCH_triton 	= "armv5te"
-
-FEED_ARCH_ixp4xxbe 	= "armv5teb"
-FEED_ARCH_nslu2be 	= "armv5teb"
-
-# armv6
-
-FEED_ARCH_mx31ads 	= "armv6"
-FEED_ARCH_mx31moboard	= "armv6"
-FEED_ARCH_nokia800	= "armv6"  
-FEED_ARCH_omap2420h4	= "armv6"
-FEED_ARCH_omap2430sdp   = "armv6"
-
-#i486 machines
-FEED_ARCH_geodegx 	= "i486"
-FEED_ARCH_geodelx 	= "i486"
-FEED_ARCH_netvista 	= "i486"
-FEED_ARCH_wrap 		= "i486"
-FEED_ARCH_x86 		= "i486"
-
-#i586 machines
-FEED_ARCH_epia 		= "i586"
-FEED_ARCH_i586-generic 	= "i586"
-FEED_ARCH_qemux86 	= "i586"
-
-#i686 machines
-
-FEED_ARCH_alix 		= "i686"
-FEED_ARCH_colinux	= "i686"
-FEED_ARCH_guinness 	= "i686"
-FEED_ARCH_i686-generic 	= "i686"
-FEED_ARCH_progear 	= "i686"
-
-#powerpc machines
-
-FEED_ARCH_dht-walnut 	= "ppc405"
-FEED_ARCH_magicbox 	= "ppc405"
-FEED_ARCH_xilinx-ml403 	= "ppc405"
-FEED_ARCH_xilinx-ml410 	= "ppc405"
-FEED_ARCH_sequoia 	= "ppc440e"
-FEED_ARCH_efika 	= "ppc603e"
-FEED_ARCH_lite5200 	= "ppc603e"
-FEED_ARCH_lsppchd 	= "ppc603e"
-FEED_ARCH_lsppchg 	= "ppc603e"
-FEED_ARCH_storcenter 	= "ppc603e"
-FEED_ARCH_turbostation 	= "ppc603e"
-FEED_ARCH_mpc8313e-rdb 	= "ppce300c3"
-FEED_ARCH_mpc8323e-rdb 	= "ppce300c2"
-
-
-#strongarm machines, no EABI
-
-FEED_ARCH_collie 	= "arm-oabi"
-FEED_ARCH_h3600 	= "arm-oabi"
-FEED_ARCH_h3800 	= "arm-oabi"
-FEED_ARCH_htcwallaby 	= "arm-oabi"
-FEED_ARCH_jornada56x 	= "arm-oabi"
-FEED_ARCH_jornada7xx 	= "arm-oabi"
-FEED_ARCH_shark 	= "arm-oabi"
-FEED_ARCH_simpad 	= "arm-oabi"
-
-
 #Tweak packaging for strongarm machines since they can't use EABI
 
 PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
@@ -289,4 +160,53 @@ DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 # KaeilOS *always* has some form of release config, so error out if someone thinks he knows better 
 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')}"
 
+
+# Configuration for tinderbox, so people only need:
+# INHERIT          += "tinderclient"
+# in their local.conf 
+
+#Name of the client
+TINDER_MACHINE  = "${MACHINE}-${LIBC}-build-image"
+
+# Which lof file to write to, which tree to report to
+TINDER_LOG        = "${TMPDIR}/tinder.log"
+TINDER_TREE       = "KaeilOS"
+
+# HTTP posting    
+#TINDER_HOST       ?= "ewi546.ewi.utwente.nl"
+#TINDER_URL        ?= "/tinderbox"
+
+# Which branch do we build
+TINDER_BRANCH     = "org.openembedded.dev"
+   
+## Clobbing
+## 0 for rebuilding everything from scratch
+## 1 for incremental builds
+TINDER_CLOBBER    = "1"
+
+## Do a report at all
+TINDER_REPORT     = "1"
+
+# Configuration for seppuku autobuilder, people only need to put:
+# INHERIT += "seppuku oestats-client"
+# SEPPUKU_USER         = "your_bugzilla@user.id"
+# SEPPUKU_PASS         = "your_bugzilla_password"
+# OESTATS_BUILDER      = "your_name" 
+# in their local.conf
+
+# seppuku bbclass
+SEPPUKU_LOGIN        = "http://bugs.openembedded.net/query.cgi?"
+SEPPUKU_QUERY        = "http://bugs.openembedded.net/buglist.cgi?"
+SEPPUKU_NEWREPORT    = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%20unstable&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_ADDCOMMENT   = "http://bugs.openembedded.net/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_ATTACHMENT   = "http://bugs.openembedded.net/attachment.cgi?"
+SEPPUKU_AUTOBUILD    = "1"
+
+SEPPUKU_PRODUCT      = "Openembedded"
+SEPPUKU_COMPONENT    = "org.openembedded.dev"
+
+OESTATS_SERVER      ?= "tinderbox.openembedded.org"
+
+
+
 # We want images supporting the following features (for task-base)
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 1d84e96ce4..f4cb5f4d61 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -187,9 +187,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4913"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "215"
-SRCREV_pn-opkg-native ?= "215"
-SRCREV_pn-opkg-sdk ?= "215"
+SRCREV_pn-opkg ?= "219"
+SRCREV_pn-opkg-native ?= "219"
+SRCREV_pn-opkg-sdk ?= "219"
 SRCREV_pn-opkg-utils ?= "4578"
 SRCREV_pn-opkg-utils-native ?= "4595"
 SRCREV_pn-oprofileui ?= "173"
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index af7c6072bd..c98234fb9a 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -5,8 +5,8 @@
 #############################################################################
 
 # Base line versions, good for most things
-PREFERRED_GCC_VERSION                ?= "4.4.1"
-PREFERRED_BINUTILS                   ?= "2.19.51"
+PREFERRED_GCC_VERSION                ?= "4.4.2"
+PREFERRED_BINUTILS                   ?= "2.20"
 
 # Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
 PREFERRED_VERSION_glibc             ?= "2.6.1"
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 421483ff6f..4d790f4e1f 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -3,7 +3,7 @@
 #@NAME: KaeilOS(R) - http://www.kaeilos.com
 #@DESCRIPTION: KaeilOS Linux Distribution for Kernel 2.6 based devices
 #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
-#@VERSION: 21-10-2009
+#@VERSION: 23-10-2009
 #
 # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
 # Product website : http://www.KaeilOS.com
@@ -15,9 +15,9 @@
 #DISTRO_VERSION = "2009.1"
 DISTRO_VERSION = "2009.1-test-${DATE}"
 DISTRO_REVISION = "1"
-DISTRO_PR = ".4"
+DISTRO_PR = ".5"
 
-OLDEST_KERNEL ?= "2.6.28"
+OLDEST_KERNEL ?= "2.6.16"
 
 #build staging from packages
 INHERIT += "packaged-staging"
@@ -74,12 +74,9 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
 #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.23"
 
-#Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
-PREFERRED_VERSION_glibc 		?= "2.6.1"
-PREFERRED_VERSION_glibc-initial 	?= "2.6.1"
-# Maybe one day I'll upgrade this too
-#PREFERRED_VERSION_glibc 		?= "2.9"
-#PREFERRED_VERSION_glibc-initial 	?= "2.9"
+# see into glibc-package.bbclass : added KaeilOS hack supporting glibc 2.9
+PREFERRED_VERSION_glibc 		?= "2.9"
+PREFERRED_VERSION_glibc-initial 	?= "2.9"
 
 PREFERRED_VERSION_uclibc        	?= "0.9.30"
 PREFERRED_VERSION_uclibc-initial	?= "0.9.30"
@@ -107,10 +104,6 @@ ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
 # Blackfin has its own gcc
 ANGSTROM_GCC_VERSION_bfin			= "4.1.2"
 
-ANGSTROM_GCC_VERSION_armv7a		= "4.3.1" 
-
-ANGSTROM_GCC_VERSION_486sx = "4.3.2"
-
 # Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
 #KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
 
@@ -133,11 +126,6 @@ PREFERRED_VERSION_gcc-cross-sdk          ?= "${ANGSTROM_GCC_VERSION}"
 PREFERRED_VERSION_gcc-cross-initial      ?= "${ANGSTROM_GCC_VERSION}"
 PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}"
 
-#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
-#require conf/distro/include/preferred-e-versions.inc
-#require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
-#require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
-
 #avr32 only has patches for binutils 2.17 in OE
 PREFERRED_VERSION_binutils_avr32 = "2.17"
 PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
@@ -157,7 +145,6 @@ PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
 PREFERRED_PROVIDER_virtual/libx11       ?= "libx11"
 
 # Others:
-#PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 PREFERRED_PROVIDER_esound               ?= "pulseaudio"
 PREFERRED_PROVIDER_gconf                ?= "gconf"
@@ -175,6 +162,7 @@ PREFERRED_PROVIDER_bluez-libs            = "bluez4"
 PREFERRED_PROVIDER_bluez-utils           = "bluez4"
 PREFERRED_PROVIDER_util-linux            = "util-linux-ng"
 
+# see recipes/bluez/bluez4*.bb for further dependencies of this setting 
 ANGSTROM_BLACKLIST_pn-bluez-libs	= "bluez-libs 3.x has been replaced by bluez4"
 ANGSTROM_BLACKLIST_pn-bluez-utils	= "bluez-utils 3.x has been replaced by bluez4"
 
@@ -254,6 +242,8 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     kernel-module-ext2 \
     kernel-module-ext3 \
     kernel-module-af-packet \
+    avahi-daemon \
+    avahi-autoipd \
     openssh-sftp-server \
     ${DEBUG_APPS} \
     "