merge of '82ba6ac51742ea64d989ab1d8b3b4633425bcd41'

     and 'b2521ddf7e798d79e5d8d18be1513bf0945cb051'

16 files changed, 69 insertions, 184 deletions

diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass
index 2f34d408d2..fbd2814d35 100644
--- a/classes/icecc.bbclass
+++ b/classes/icecc.bbclass
@@ -1,8 +1,18 @@
 # IceCream distributed compiling support
 #
-# We need to create a tar.bz2 of our toolchain and set
-# ICECC_VERSION, ICECC_CXX and ICEC_CC
+# Stages directories with symlinks from gcc/g++ to icecc, for both
+# native and cross compilers. Depending on each configure or compile,
+# the directories are added at the head of the PATH list and ICECC_CXX
+# and ICEC_CC are set.
 #
+# For the cross compiler, creates a tar.bz2 of our toolchain and sets
+# ICECC_VERSION accordingly.
+#
+# This class needs ICECC_PATH to be set already. It must have
+# been exported from the shell running bitbake. Setting it in
+# local.conf is not adequate.
+#
+# This class objdump, ldconfig, grep, sed installed on the build host.
 
 def icc_determine_gcc_version(gcc):
     """
@@ -10,11 +20,12 @@ def icc_determine_gcc_version(gcc):
 
     'i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 (Apple Computer, Inc. build 5363)'
     """
+    import os
     return os.popen("%s --version" % gcc ).readline().split()[2]
 
 def create_env(bb,d):
     """
-    Create a tar.bz of the current toolchain
+    Create a tar.bz2 of the current toolchain
     """
 
     # Constin native-native compilation no environment needed if
@@ -23,14 +34,12 @@ def create_env(bb,d):
     if len(prefix) == 0:
         return ""
 
-    import tarfile
-    import socket
-    import time
-    import os
+    import tarfile, socket, time, os
     ice_dir = bb.data.expand('${CROSS_DIR}', d)
     prefix  = bb.data.expand('${HOST_PREFIX}' , d)
     distro  = bb.data.expand('${DISTRO}', d)
     target_sys = bb.data.expand('${TARGET_SYS}',  d)
+    target_prefix = bb.data.expand('${TARGET_PREFIX}',  d)
     float   = bb.data.getVar('${TARGET_FPU}', d) or "hard"
     name    = socket.gethostname()
 
@@ -39,7 +48,7 @@ def create_env(bb,d):
     try:
         os.stat(os.path.join(ice_dir, target_sys, 'lib', 'ld-linux.so.2'))
         os.stat(os.path.join(ice_dir, target_sys, 'bin', 'g++'))
-    except:
+    except: # no cross compiler built yet
         return ""
 
     VERSION = icc_determine_gcc_version( os.path.join(ice_dir,target_sys,"bin","g++") )
@@ -48,11 +57,13 @@ def create_env(bb,d):
 
     try:
         os.stat(tar_file)
+	# tar file already exists
         return tar_file
-    except:
+    except: 
         try:
             os.makedirs(os.path.join(ice_dir,'ice'))
         except:
+            # directory already exists, continue
             pass
 
     # FIXME find out the version of the compiler
@@ -78,14 +89,42 @@ def create_env(bb,d):
     tar.add(os.path.join(ice_dir,target_sys,'bin','as'),
             os.path.join("usr","bin","as") )
 
+    cc = bb.data.getVar('CC', d, True)
+
+    # use bitbake's PATH so that the cross-compiler is actually found on the PATH
+    oldpath = os.environ['PATH']
+    os.environ['PATH'] = bb.data.getVar('PATH', d, True)
+
+    # FIXME falsely assuming there is only a single NEEDED per file
+    # FIXME falsely assuming the lib path is /lib
+
+    # which libc does the compiler need? (for example: libc.so.6)
+    libc = os.popen("objdump -x `which %s` | sed -n 's/.*NEEDED *//p'" % cc).read()[:-1]
+    # what is the absolute path of libc? (for example: /lib/libc.so.6)
+    # FIXME assuming only one entry is returned, which easily breaks
+    libc = os.popen("ldconfig -p | grep -e %s$ | sed 's:[^/]*/:/:'" % libc).read()[:-1]
+
+    # which loader does the compiler need?
+    ldlinux = os.popen("objdump -x %s | sed -n 's/.*NEEDED *//p'" % libc).read()[:-1]
+    ldlinux = os.popen("ldconfig -p | grep -e %s$ | sed 's:[^/]*/:/:'" % ldlinux).read()[:-1]
+
+    tar.add(libc)
+    tar.add(ldlinux)
+  
     # Now let us find cc1 and cc1plus
-    cc1 = os.popen("%s -print-prog-name=cc1" % data.getVar('CC', d, True)).read()[:-1]
-    cc1plus = os.popen("%s -print-prog-name=cc1plus" % data.getVar('CC', d, True)).read()[:-1]
-    spec = os.popen("%s -print-file-name=specs" % data.getVar('CC', d, True)).read()[:-1]
+    cc1 = os.popen("%s -print-prog-name=cc1" % cc).read()[:-1]
+    cc1plus = os.popen("%s -print-prog-name=cc1plus" % cc).read()[:-1]
+    spec = os.popen("%s -print-file-name=specs" % cc).read()[:-1]
+
+    os.environ['PATH'] = oldpath
 
     # CC1 and CC1PLUS should be there...
-    tar.add(cc1, os.path.join('usr', 'bin', 'cc1'))
-    tar.add(cc1plus, os.path.join('usr', 'bin', 'cc1plus'))
+    #tar.add(cc1, os.path.join('usr', 'bin', 'cc1'))
+    #tar.add(cc1plus, os.path.join('usr', 'bin', 'cc1plus'))
+
+    # I think they should remain absolute paths (as gcc expects them there)
+    tar.add(cc1)
+    tar.add(cc1plus)
 
     # spec - if it exists
     if os.path.exists(spec):
@@ -110,7 +149,6 @@ def create_path(compilers, type, bb, d):
     except:
         os.makedirs(staging)
 
-
     for compiler in compilers:
         gcc_path = os.path.join(staging, compiler)
         try:
@@ -120,14 +158,12 @@ def create_path(compilers, type, bb, d):
 
     return staging + ":"
 
-
 def use_icc_version(bb,d):
     # Constin native native
     prefix = bb.data.expand('${HOST_PREFIX}', d)
     if len(prefix) == 0:
         return "no"
 
-
     blacklist = [ "cross", "native" ]
 
     for black in blacklist:
@@ -150,17 +186,15 @@ def icc_path(bb,d,compile):
 
     prefix = bb.data.expand('${HOST_PREFIX}', d)
     if compile and len(prefix) != 0:
-        return create_path( [prefix+"gcc", prefix+"g++"], "cross", bb, d )
+        return create_path( [prefix+"gcc", prefix+"g++"], "cross", bb, d)
     elif not compile or len(prefix) == 0:
         return create_path( ["gcc", "g++"], "native", bb, d)
 
-
 def icc_version(bb,d):
     return create_env(bb,d)
 
-
 #
-# set the IceCream  environment variables
+# set the icecream environment variables
 do_configure_prepend() {
     export PATH=${@icc_path(bb,d,False)}$PATH
     export ICECC_CC="gcc"
@@ -173,6 +207,7 @@ do_compile_prepend() {
     export ICECC_CXX="${HOST_PREFIX}g++"
 
     if [ "${@use_icc_version(bb,d)}" = "yes" ]; then
+        print ICECC_VERSION="${@icc_version(bb,d)}"
         export ICECC_VERSION="${@icc_version(bb,d)}"
     fi
 }
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index dfdb4b9375..9cbb19cd2d 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -6,9 +6,9 @@
 #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
 #@--------------------------------------------------------------------
 
-#DISTRO_VERSION = "2007.1"
+#DISTRO_VERSION = "2007.3"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "18"
+DISTRO_REVISION = "19"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -50,6 +50,10 @@ FEED_ARCH_tosa		= "armv5te"
 FEED_ARCH_guinness	= "i686"
 FEED_ARCH_progear	= "i686"
 
+#powerpc machines
+
+FEED_ARCH_efika		= "ppc603e"
+
 FEED_URIS += " \
 		no-arch##${ANGSTROM_URI}/unstable/feed/all \
 		base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
@@ -152,6 +156,7 @@ PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
 PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
 
 PREFERRED_VERSION_linux-libc-headers_i686 ?= "2.6.18"
+PREFERRED_VERSION_linux-libc-headers_powerpc ?= "2.6.18"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
 
 PREFERRED_VERSION_glibc ?= "2.5"
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 7270e52484..38ec778b7a 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -16,6 +16,7 @@ TARGET_FPU = ""
 TARGET_ARCH = "arm"
 TARGET_CC_ARCH = "-march=armv4"
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O2"
+FULL_OPTIMIZATION_pn-fetchmail = "-fexpensive-optimizations -fomit-frame-pointer -O1"
 OEINCLUDELOGS = "yes"
 KERNEL_CONSOLE = "tty1"
 # prebuilt toolchain doesn't know about -isystem
diff --git a/packages/dpkg/dpkg-1.13.11/.mtn2git_empty b/packages/dpkg/dpkg-1.13.11/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/dpkg/dpkg-1.13.11/.mtn2git_empty
+++ /dev/null
diff --git a/packages/dpkg/dpkg-1.13.11/autofoo.patch b/packages/dpkg/dpkg-1.13.11/autofoo.patch
deleted file mode 100644
index 691121e418..0000000000
--- a/packages/dpkg/dpkg-1.13.11/autofoo.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- dpkg-1.10.23/configure.in~autofoo
-+++ dpkg-1.10.23/configure.in
-@@ -227,21 +227,36 @@
- # OpenBSD passes AC_TRY_COMPILE for va_copy even though 
- # it doesn't seem to exist, which is odd. We need to use
- # AC_TRY_RUN.
-+#
-+# If crosscompiling, use AC_TRY_COMPILE. -CL
- AC_TRY_RUN([
- #include <stdarg.h>
- main(){
- va_list v1,v2;
- va_copy(v1, v2);
- exit(0);}
--], [AC_MSG_RESULT(yes)
--AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])],[AC_MSG_RESULT(no)
--AC_MSG_CHECKING([for va_list assignment copy])
-+], [dpkg_cv_va_copy=yes], [dpkg_cv_va_copy=no],
- AC_TRY_COMPILE([
- #include <stdarg.h>
-+main(){
-+va_list v1,v2;
-+va_copy(v1, v2);
-+exit(0);}
-+], [dpkg_cv_va_copy=yes], [dpkg_vc_va_copy=no]))
-+
-+if test "$dpkg_cv_va_copy" = "yes"; then
-+	AC_MSG_RESULT(yes)
-+	AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])
-+else
-+	AC_MSG_RESULT(no)
-+	AC_MSG_CHECKING([for va_list assignment copy])
-+	AC_TRY_COMPILE([
-+#include <stdarg.h>
- ],[
- va_list v1,v2;
- v1 = v2;
--], AC_MSG_RESULT(yes),AC_MSG_ERROR(no))])
-+], AC_MSG_RESULT(yes), AC_MSG_ERROR(no))
-+fi
- 
- DPKG_C_GCC_ATTRIBUTE([,,],supported,[int x],[,,],ATTRIB,[Define if function attributes a la GCC 2.5 and higher are available.],
-   DPKG_C_GCC_ATTRIBUTE(noreturn,noreturn,[int x],noreturn,NORETURN,[Define if nonreturning functions a la GCC 2.5 and higher are available.])
diff --git a/packages/dpkg/dpkg_1.10.28.bb b/packages/dpkg/dpkg_1.10.28.bb
deleted file mode 100644
index ae62fdbcf0..0000000000
--- a/packages/dpkg/dpkg_1.10.28.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require dpkg.inc
-DEPENDS += "bzip2"
-
-SRC_URI += "file://autofoo.patch;patch=1"
-
-inherit autotools gettext
-
-EXTRA_OECONF = "--without-static-progs \
-		--without-dselect \
-		--with-start-stop-daemon \
-		--with-zlib \
-		--with-bz2lib \
-		--without-sgml-doc"
diff --git a/packages/dpkg/dpkg_1.13.11.bb b/packages/dpkg/dpkg_1.13.11.bb
deleted file mode 100644
index 08a9c06fbf..0000000000
--- a/packages/dpkg/dpkg_1.13.11.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require dpkg.inc
-DEPENDS += "bzip2"
-
-inherit autotools gettext
-
-EXTRA_OECONF = "--without-static-progs \
-		--without-dselect \
-		--with-start-stop-daemon \
-		--with-zlib \
-		--with-bz2lib \
-		--without-sgml-doc"
diff --git a/packages/dpkg/dpkg_1.13.4.bb b/packages/dpkg/dpkg_1.13.4.bb
deleted file mode 100644
index ae62fdbcf0..0000000000
--- a/packages/dpkg/dpkg_1.13.4.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require dpkg.inc
-DEPENDS += "bzip2"
-
-SRC_URI += "file://autofoo.patch;patch=1"
-
-inherit autotools gettext
-
-EXTRA_OECONF = "--without-static-progs \
-		--without-dselect \
-		--with-start-stop-daemon \
-		--with-zlib \
-		--with-bz2lib \
-		--without-sgml-doc"
diff --git a/packages/dpkg/files/autofoo.patch b/packages/dpkg/files/autofoo.patch
deleted file mode 100644
index 691121e418..0000000000
--- a/packages/dpkg/files/autofoo.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- dpkg-1.10.23/configure.in~autofoo
-+++ dpkg-1.10.23/configure.in
-@@ -227,21 +227,36 @@
- # OpenBSD passes AC_TRY_COMPILE for va_copy even though 
- # it doesn't seem to exist, which is odd. We need to use
- # AC_TRY_RUN.
-+#
-+# If crosscompiling, use AC_TRY_COMPILE. -CL
- AC_TRY_RUN([
- #include <stdarg.h>
- main(){
- va_list v1,v2;
- va_copy(v1, v2);
- exit(0);}
--], [AC_MSG_RESULT(yes)
--AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])],[AC_MSG_RESULT(no)
--AC_MSG_CHECKING([for va_list assignment copy])
-+], [dpkg_cv_va_copy=yes], [dpkg_cv_va_copy=no],
- AC_TRY_COMPILE([
- #include <stdarg.h>
-+main(){
-+va_list v1,v2;
-+va_copy(v1, v2);
-+exit(0);}
-+], [dpkg_cv_va_copy=yes], [dpkg_vc_va_copy=no]))
-+
-+if test "$dpkg_cv_va_copy" = "yes"; then
-+	AC_MSG_RESULT(yes)
-+	AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])
-+else
-+	AC_MSG_RESULT(no)
-+	AC_MSG_CHECKING([for va_list assignment copy])
-+	AC_TRY_COMPILE([
-+#include <stdarg.h>
- ],[
- va_list v1,v2;
- v1 = v2;
--], AC_MSG_RESULT(yes),AC_MSG_ERROR(no))])
-+], AC_MSG_RESULT(yes), AC_MSG_ERROR(no))
-+fi
- 
- DPKG_C_GCC_ATTRIBUTE([,,],supported,[int x],[,,],ATTRIB,[Define if function attributes a la GCC 2.5 and higher are available.],
-   DPKG_C_GCC_ATTRIBUTE(noreturn,noreturn,[int x],noreturn,NORETURN,[Define if nonreturning functions a la GCC 2.5 and higher are available.])
diff --git a/packages/dpkg/files/nochroot.patch b/packages/dpkg/files/nochroot.patch
deleted file mode 100644
index 3a8beaebbf..0000000000
--- a/packages/dpkg/files/nochroot.patch
+++ /dev/null
@@ -1,18 +0,0 @@
----
- src/help.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- dpkg-1.13.22.orig/src/help.c
-+++ dpkg-1.13.22/src/help.c
-@@ -175,9 +175,11 @@ static const char* preexecscript(const c
-    */
-   size_t instdirl;
- 
-+#if 0
-   if (*instdir) {
-     if (chroot(instdir)) ohshite(_("failed to chroot to `%.250s'"),instdir);
-   }
-+#endif
-   if (f_debug & dbg_scripts) {
-     fprintf(stderr,"D0%05o: fork/exec %s (",dbg_scripts,path);
-     while (*++argv) fprintf(stderr," %s",*argv);
diff --git a/packages/fetchmail/fetchmail_6.2.5.bb b/packages/fetchmail/fetchmail_6.2.5.bb
index 2a81319085..89df7fe017 100644
--- a/packages/fetchmail/fetchmail_6.2.5.bb
+++ b/packages/fetchmail/fetchmail_6.2.5.bb
@@ -16,8 +16,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/f/${PN}/${PN}_${PV}.orig.tar.gz \
 
 inherit autotools gettext
 
-FULL_OPTIMIZATION_sharprom-compatible = "-fexpensive-optimizations -fomit-frame-pointer -O1"
-
 do_configure_prepend () {
 	if [ ! -e acinclude.m4 ]; then
 		cat aclocal.m4 > acinclude.m4
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index 903a7764ae..4cad10fd73 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -63,7 +63,6 @@ def get_glibc_fpu_setting(bb, d):
 EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
 
 OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
-EXTRA_OECONF_append_arm-linuxeabi = " --without-fp"
 
 do_install() {
 	oe_runmake install_root=${D} install
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
index be8074907d..8fb2600550 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
@@ -24,7 +24,7 @@ set_arch() {
 		ia64*)    ARCH=ia64 ;;
 		mips*)    ARCH=mips ;;
 		m68k*)    ARCH=m68k ;;
-		powerpc*) ARCH=ppc ;;
+		powerpc*) ARCH=powerpc ;;
 		s390*)    ARCH=s390 ;;
 		sh*)      ARCH=sh ;;
 		sparc64*) ARCH=sparc64 ;;
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
index ba2afc5346..2513b4e54c 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
 SECTION = "devel"
 LICENSE = "GPL"
-DEFAULT_PREFERENCE = "-1"
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "unifdef-native"
 PR = "r1"
@@ -21,7 +20,7 @@ set_arch() {
 		ia64*)    ARCH=ia64 ;;
 		mips*)    ARCH=mips ;;
 		m68k*)    ARCH=m68k ;;
-		powerpc*) ARCH=ppc ;;
+		powerpc*) ARCH=powerpc ;;
 		s390*)    ARCH=s390 ;;
 		sh*)      ARCH=sh ;;
 		sparc64*) ARCH=sparc64 ;;
diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index 96de95f487..470fabc6c7 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "604"
+IXP4XX_KERNEL_SVN_REV = "605"
 #
 # The directory containing the patches to be applied is
 # specified below
diff --git a/packages/mythtv/mythtv_0.18.1.bb b/packages/mythtv/mythtv_0.18.1.bb
index 7f8dc739e1..2686fa86a2 100644
--- a/packages/mythtv/mythtv_0.18.1.bb
+++ b/packages/mythtv/mythtv_0.18.1.bb
@@ -2,15 +2,14 @@ DESCRIPTION = "A full featured personal video recorder system."
 HOMEPAGE = "http://www.mythtv.org"
 LICENSE = "GPL"
 SECTION = "x11/multimedia"
+DEPENDS = "libxinerama lame libxv libxxf86vm libxvmc lirc qt-x11-free"
+RDEPENDS = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats"
 PR = "r1"
 
 SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2 \
 	file://msmpeg-underscore-pic.patch;patch=1 \
 	file://settings.pro"
 
-DEPENDS = "libxinerama lame libxv libxxf86vm libxvmc lirc"
-RDEPENDS = "qt-x11-plugins"
-
 inherit qmake qt3x11
 
 # there is a -march=586 somewhere in the source tree