merge of '30c320b2f51c86226580e5bbf68fa8b0896a0655'

     and '8dfee9b2427785432e4161eb7cc749155230e08e'

12 files changed, 51 insertions, 28 deletions

diff --git a/classes/cpan-base.bbclass b/classes/cpan-base.bbclass
index a5fdb33895..cc0d11e515 100644
--- a/classes/cpan-base.bbclass
+++ b/classes/cpan-base.bbclass
@@ -4,8 +4,8 @@
 #
 FILES_${PN} += "${libdir}/perl5 ${datadir}/perl5"
 
-DEPENDS  += "perl perl-native"
-RDEPENDS += "perl"
+DEPENDS  += "${@["perl", "perl-native"][(bb.data.inherits_class('native', d))]}"
+RDEPENDS  += "${@["perl", ""][(bb.data.inherits_class('native', d))]}"
 
 # Determine the staged version of perl from the perl configuration file
 def get_perl_version(d):
diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index 3b1a2b72ca..3250528c7a 100644
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -8,6 +8,9 @@ EXTRA_CPANFLAGS ?= ""
 # Env var which tells perl if it should use host (no) or target (yes) settings
 export PERLCONFIGTARGET = "${@is_target(d)}"
 
+# Env var which tells perl where the perl include files are
+export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE"
+
 cpan_do_configure () {
 	yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS}
 	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass
index 15e945d518..db006b8c77 100644
--- a/classes/distutils-base.bbclass
+++ b/classes/distutils-base.bbclass
@@ -11,4 +11,5 @@ def python_dir(d):
 
 PYTHON_DIR = "${@python_dir(d)}"
 FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}"
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/${SRCNAME}/.debug"
 
diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass
index 5f57a9ea19..db15cebdd7 100644
--- a/classes/distutils.bbclass
+++ b/classes/distutils.bbclass
@@ -10,6 +10,23 @@ distutils_do_install() {
 	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
 	${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \
 	oefatal "python setup.py install execution failed."
+
+        for i in `find ${D} -name "*.py"` ; do \
+            sed -i -e s:${D}::g $i
+        done
+
+        if test -e ${D}${bindir} ; then	
+            for i in ${D}${bindir}/* ; do \
+                sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
+            done
+        fi
+
+        if test -e ${D}${sbindir} ; then
+            for i in ${D}${sbindir}/* ; do \
+                sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
+            done
+        fi
+
 }
 
 EXPORT_FUNCTIONS do_compile do_install
diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass
index 5fadee4ab6..446e78ae1a 100644
--- a/classes/icecc.bbclass
+++ b/classes/icecc.bbclass
@@ -253,10 +253,11 @@ def icc_path(bb,d,compile):
 
     #"system" package blacklist contains a list of packages that can not distribute compile tasks
     #for one reason or the other
-    system_package_blacklist = [ "uclibc", "glibc", "qemu" ]
+    system_package_blacklist = [ "uclibc", "glibc-intermediate", "qemu" ]
 
     for black in system_package_blacklist:
       if black in package_tmp:
+         bb.data.setVar('PARALLEL_MAKE' , '', d) 
          return ""
 
     #user defined exclusion list
@@ -265,6 +266,7 @@ def icc_path(bb,d,compile):
 
     for black in user_package_blacklist:
       if black in package_tmp:
+         bb.data.setVar('PARALLEL_MAKE' , '', d) 
          return ""
 
 
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index 9f243c8c9a..08c1058edf 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -54,11 +54,15 @@ def package_qa_get_machine_dict():
                         "sparc":      ( 2,     0,    0,          False,         True),
                       },
             "linux-uclibc" : { 
-                        "arm" :       (40,    97,    0,          True,          True),
-                        "armeb":      (40,    97,    0,          False,         True),
-                        "powerpc":    (20,     0,    0,          False,         True),
-                        "mipsel":     ( 8,     0,    0,          True,          True),
+                        "arm" :       (  40,    97,    0,          True,          True),
+                        "armeb":      (  40,    97,    0,          False,         True),
+                        "powerpc":    (  20,     0,    0,          False,         True),
+                        "mipsel":     (   8,     0,    0,          True,          True),
+			"avr32":      (6317,     0,    0,          False,         True),
                       },
+            "uclinux-uclibc" : {
+                        "bfin":       (   0,     0,    0,          True,         True),
+                      }, 
             "linux-gnueabi" : {
                         "arm" :       (40,     0,    0,          True,          True),
                         "armeb" :     (40,     0,    0,          False,         True),
@@ -219,7 +223,7 @@ def package_qa_check_rpath(file,name,d):
         bb.fatal("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check")
 
     #bb.note("%s -B -F%%r#F %s" % (scanelf,file))
-    output = os.popen("%s -B -F%%r#F %s" % (scanelf,file))
+    output = os.popen("%s -B -F%%r#F '%s'" % (scanelf,file))
     txt    = output.readline().split()
     #bb.note("???%s???" % bad_dir_test)
     for line in txt:
@@ -392,9 +396,9 @@ def package_qa_check_rdepends(pkg, workdir, d):
         # Now do the sanity check!!!
         for rdepend in rdepends:
             if "-dbg" in rdepend:
-                package_qa_write_error( 2, name, rdepend, d )
-                bb.error("QA issue, koen give us a better msg!!!")
-                if package_qa_make_fatal_error( 2, name, rdepend, d ):
+                package_qa_write_error( 2, pkgname, rdepend, d )
+                bb.error("QA issue: %s rdepends on %s" % (pkgname,rdepend))
+                if package_qa_make_fatal_error( 2, pkgname, rdepend, d ):
                     sane = False
 
     return sane
diff --git a/classes/kernel-arch.bbclass b/classes/kernel-arch.bbclass
index c50a7d5ebf..9208c3507a 100644
--- a/classes/kernel-arch.bbclass
+++ b/classes/kernel-arch.bbclass
@@ -11,7 +11,8 @@ valid_archs = "alpha cris ia64 \
                arm  arm26 \
                m32r mips \
 	       sh sh64 um h8300   \
-	       parisc s390  v850"
+	       parisc s390  v850 \
+	       avr32 blackfin"
 
 def map_kernel_arch(a, d):
 	import bb, re
@@ -23,7 +24,8 @@ def map_kernel_arch(a, d):
 	elif re.match('armeb$', a):		return 'arm'
 	elif re.match('mipsel$', a):		return 'mips'
 	elif re.match('sh(3|4)$', a):		return 'sh'
-	elif a in valid_archs:			return a
+	elif re.match('bfin', a):               return 'blackfin'
+        elif a in valid_archs:			return a
 	else:
 		bb.error("cannot map '%s' to a linux kernel architecture" % a)
 
diff --git a/classes/oplinux-mirrors.bbclass b/classes/oplinux-mirrors.bbclass
index 6e9d051c3f..076cd6f1fe 100644
--- a/classes/oplinux-mirrors.bbclass
+++ b/classes/oplinux-mirrors.bbclass
@@ -1,14 +1,7 @@
-MIRRORS_append () {
-ftp://.*/.*/	http://www.ifaistos.awmn/oplinux/stable/sources/
-http://.*/.*/	http://www.ifaistos.awmn/oplinux/stable/sources/
-ftp://.*/.*/	http://www.ifaistos.awmn/oplinux/unstable/sources/
-http://.*/.*/	http://www.ifaistos.awmn/oplinux/unstable/sources/
-
-ftp://.*/.*/	http://www.ifaistos.awmn/oplinux-uclibc/stable/sources/
-http://.*/.*/	http://www.ifaistos.awmn/oplinux-uclibc/stable/sources/
-ftp://.*/.*/	http:///www.ifaistos.awmn/oplinux-uclibc/unstable/sources/
-http://.*/.*/	http://www.ifaistos.awmn/oplinux-uclibc/unstable/sources/
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
 
+MIRRORS_append () {
 ftp://.*/.*/	http://digital-opsis.com/oplinux/stable/sources/
 http://.*/.*/	http://digital-opsis.com/oplinux/stable/sources/
 ftp://.*/.*/	http://digital-opsis.com/oplinux/unstable/sources/
diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass
index 39b9bd2b60..e99b31aaa3 100644
--- a/classes/palmtop.bbclass
+++ b/classes/palmtop.bbclass
@@ -16,6 +16,7 @@ EXTRA_QMAKEVARS_POST += "DEFINES+=QWS CONFIG+=qt ${CPP_SUPPORT_LIB}"
 EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", "CONFIG-=thread",d)}'
 EXTRA_QMAKEVARS_POST += "${@["LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
 DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
+QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
 
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
 FILES_${PN} = " ${palmtopdir} "
diff --git a/classes/qpf.bbclass b/classes/qpf.bbclass
index d6e58871d5..67761bd4be 100644
--- a/classes/qpf.bbclass
+++ b/classes/qpf.bbclass
@@ -9,15 +9,11 @@ do_compile() {
 }
 
 pkg_postinst_fonts() {
-#!/bin/sh
-set -e
 . /etc/profile
 ${sbindir}/update-qtfontdir
 }
 
 pkg_postrm_fonts() {
-#!/bin/sh
-set -e
 . /etc/profile
 ${sbindir}/update-qtfontdir -f
 }
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 26eca34da9..210563aed1 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -7,10 +7,11 @@
 
 do_rootfs[depends] += "ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging"
 
-IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}"
+IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}"
 
 RDEPENDS += "ipkg ipkg-collateral"
 PACKAGE_INSTALL += "ipkg ipkg-collateral"
+PACKAGE_INSTALL_NO_DEPS ?= "0"
 
 rootfs_ipk_do_indexes () {
 	set -x
diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass
index 6868750d2d..4191f4edc1 100644
--- a/classes/siteinfo.bbclass
+++ b/classes/siteinfo.bbclass
@@ -29,6 +29,9 @@ def get_siteinfo_list(d):
                "arm-linux-gnueabi":       "endian-little bit-32 common-glibc arm-common arm-linux",\
                "arm-linux-uclibc":        "endian-little bit-32 common-uclibc arm-common",\
                "arm-linux-uclibcgnueabi": "endian-little bit-32 common-uclibc arm-common arm-linux-uclibc",\
+               "avr32-linux":             "endian-big bit-32 common-glibc avr32-common",\ 
+               "avr32-linux-uclibc":      "endian-big bit-32 common-uclibc avr32-common",\
+               "bfin-uclinux-uclibc":       "endian-little bit-32 common-uclibc bfin-common",\
                "i386-linux":              "endian-little bit-32 common-glibc ix86-common",\
                "i486-linux":              "endian-little bit-32 common-glibc ix86-common",\
                "i586-linux":              "endian-little bit-32 common-glibc ix86-common",\