propagate from branch 'org.openembedded.dev' (head a6b798a43c05aef43ed650ab880f3edd386d0aa3)

            to branch 'org.openembedded.dev.avr32' (head 77e1041de2eef682f183f3f5199826818cb9c5b1)

10 files changed, 67 insertions, 49 deletions

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index fccf2b6d80..8e4fba9400 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -97,9 +97,9 @@ autotools_do_configure() {
 			AUTOV=`automake --version |head -n 1 |sed "s/.* //;s/\.[0-9]\+$//"`
 			automake --version
 			echo "AUTOV is $AUTOV"
-			install -d ${STAGING_DIR}/${HOST_SYS}/share/aclocal
-			install -d ${STAGING_DIR}/${HOST_SYS}/share/aclocal-$AUTOV
-			acpaths="$acpaths -I ${STAGING_DIR}/${HOST_SYS}/share/aclocal-$AUTOV -I ${STAGING_DIR}/${HOST_SYS}/share/aclocal"
+			install -d ${STAGING_DATADIR}/aclocal
+			install -d ${STAGING_DATADIR}/aclocal-$AUTOV
+			acpaths="$acpaths -I${STAGING_DATADIR}/aclocal-$AUTOV -I ${STAGING_DATADIR}/aclocal"
 			# autoreconf is too shy to overwrite aclocal.m4 if it doesn't look
 			# like it was auto-generated.  Work around this by blowing it away
 			# by hand, unless the package specifically asked not to run aclocal.
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 2cf205fbe9..c504f78283 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -387,9 +387,6 @@ oe_machinstall() {
 	fi
 }
 
-# Remove and re-create ${D} so that is it guaranteed to be empty
-do_install[cleandirs] = "${D}"
-
 addtask listtasks
 do_listtasks[nostamp] = "1"
 python do_listtasks() {
@@ -687,10 +684,10 @@ base_do_stage () {
 	:
 }
 
-do_populate_staging[dirs] = "${STAGING_DIR}/${TARGET_SYS}/bin ${STAGING_DIR}/${TARGET_SYS}/lib \
-			     ${STAGING_DIR}/${TARGET_SYS}/include \
-			     ${STAGING_DIR}/${BUILD_SYS}/bin ${STAGING_DIR}/${BUILD_SYS}/lib \
-			     ${STAGING_DIR}/${BUILD_SYS}/include \
+do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/bin ${STAGING_DIR_TARGET}/lib \
+			     ${STAGING_DIR_TARGET}/include \
+			     ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \
+			     ${STAGING_INCDIR_NATIVE} \
 			     ${STAGING_DATADIR} \
 			     ${S} ${B}"
 
@@ -703,6 +700,8 @@ python do_populate_staging () {
 
 addtask install after do_compile
 do_install[dirs] = "${D} ${S} ${B}"
+# Remove and re-create ${D} so that is it guaranteed to be empty
+do_install[cleandirs] = "${D}"
 
 base_do_install() {
 	:
diff --git a/classes/bootimg.bbclass b/classes/bootimg.bbclass
index 820749a335..0c96001096 100644
--- a/classes/bootimg.bbclass
+++ b/classes/bootimg.bbclass
@@ -12,41 +12,48 @@
 # ${APPEND} - an override list of append strings for each label
 # ${SYSLINUX_OPTS} - additional options to add to the syslinux file ';' delimited 
 
-DEPENDS_append=" dosfstools-native syslinux-native mtools-native cdrtools-native"
+do_bootimg[depends] += "dosfstools-native:do_populate_staging \
+                       syslinux-native:do_populate_staging \
+		       mtools-native:do_populate_staging \
+		       cdrtools-native:do_populate_staging"
 
-BDIR="${WORKDIR}/boot"
-ISODIR="${IMAGE_ROOTFS}/isolinux/"
+PACKAGES = " "
 
-BOOTIMG_VOLUME_ID ?= "oe"
+HDDDIR = "${S}/hdd/boot"
+ISODIR = "${S}/cd/isolinux"
+
+BOOTIMG_VOLUME_ID   ?= "oe"
 BOOTIMG_EXTRA_SPACE ?= "64"
 
 # Get the build_syslinux_cfg() function from the syslinux class
 
-SYSLINUXCFG="${BDIR}/syslinux.cfg"
-SYSLINUXMENU="${BDIR}/menu"
+SYSLINUXCFG  = "${HDDDIR}/syslinux.cfg"
+SYSLINUXMENU = "${HDDDIR}/menu"
+
 inherit syslinux
 		
 build_boot_bin() {
-	install -d ${BDIR}
-	install -m 0644 ${STAGING_KERNEL_DIR}/bzImage \
-	${BDIR}/vmlinuz
+	install -d ${HDDDIR}
+	install -m 0644 ${STAGING_DIR}/${MACHINE}${HOST_VENDOR}-${HOST_OS}/kernel/bzImage \
+	${HDDDIR}/vmlinuz
 
 	if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then 
-    		install -m 0644 ${INITRD} ${BDIR}/initrd
+    		install -m 0644 ${INITRD} ${HDDDIR}/initrd
 	fi
 
-	install -m 444 ${STAGING_DIR}/${BUILD_SYS}/share/syslinux/ldlinux.sys \
-	${BDIR}/ldlinux.sys
+	install -m 444 ${STAGING_DATADIR_NATIVE}/syslinux/ldlinux.sys \
+	${HDDDIR}/ldlinux.sys
 
 	# Do a little math, bash style
-	#BLOCKS=`du -s ${BDIR} | cut -f 1`
-	BLOCKS=`du -bks ${BDIR} | cut -f 1`
+	#BLOCKS=`du -s ${HDDDIR} | cut -f 1`
+	BLOCKS=`du -bks ${HDDDIR} | cut -f 1`
 	SIZE=`expr $BLOCKS + ${BOOTIMG_EXTRA_SPACE}`	
 
-	mkdosfs -F 12 -n ${BOOTIMG_VOLUME_ID} -d ${BDIR} \
-	-C ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-boot.bin $SIZE 
+	mkdosfs -F 12 -n ${BOOTIMG_VOLUME_ID} -d ${HDDDIR} \
+	-C ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg $SIZE 
 
-	syslinux ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-boot.bin
+	syslinux ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
+	chmod 644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
 
 	#Create an ISO if we have an INITRD
 	if [ -n "${INITRD}" ] && [ -s "${INITRD}" ] && [ "${NOISO}" != "1" ] ; then
@@ -54,12 +61,12 @@ build_boot_bin() {
 
 		# Install the kernel
 
-		install -m 0644 ${STAGING_KERNEL_DIR}/bzImage \
+		install -m 0644 ${STAGING_DIR}/${MACHINE}${HOST_VENDOR}-${HOST_OS}/kernel/bzImage \
 		        ${ISODIR}/vmlinuz
 
 		# Install the configuration files
 
-		cp ${BDIR}/syslinux.cfg ${ISODIR}/isolinux.cfg
+		cp ${HDDDIR}/syslinux.cfg ${ISODIR}/isolinux.cfg
 
 		if [ -f ${SYSLINUXMENU} ]; then
 			cp ${SYSLINUXMENU} ${ISODIR}
@@ -68,21 +75,19 @@ build_boot_bin() {
 		install -m 0644 ${INITRD} ${ISODIR}/initrd
 
 		# And install the syslinux stuff 
-		cp ${STAGING_DIR}/${BUILD_SYS}/share/syslinux/isolinux.bin \
+		cp ${STAGING_DATADIR_NATIVE}/syslinux/isolinux.bin \
 		${ISODIR}
 
 		mkisofs -V ${BOOTIMG_VOLUME_ID} \
 		-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \
 		-b isolinux/isolinux.bin -c isolinux/boot.cat -r \
 		-no-emul-boot -boot-load-size 4 -boot-info-table \
-		${IMAGE_ROOTFS}
+		${S}/cd/
 	fi
 } 
 
 python do_bootimg() {
-	docfg = bb.data.getVar('AUTO_SYSLINUXCFG', d, 1)
-	if docfg:
-		bb.build.exec_func('build_syslinux_cfg', d)
+	bb.build.exec_func('build_syslinux_cfg', d)
 	bb.build.exec_func('build_boot_bin', d)
 }
 
diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index 3250528c7a..5a0b4a5c92 100644
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -20,14 +20,14 @@ cpan_do_configure () {
 				-e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
 				-e "s:\(INSTALLVENDORLIB = \).*:\1${D}${datadir}/perl5:" \
 				-e "s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" \
-				-e "s:\(LDDLFLAGS.*\)${STAGING_DIR}/${BUILD_SYS}/lib:\1${STAGING_LIBDIR}:" \
+				-e "s:\(LDDLFLAGS.*\)${STAGING_LIBDIR_NATIVE}:\1${STAGING_LIBDIR}:" \
 				Makefile
 		else
 			sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \
 				-e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
 				-e "s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5/site_perl/${version}:" \
 				-e "s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5/site_perl/${version}:" \
-				-e "s:\(LDDLFLAGS.*\)${STAGING_DIR}/${BUILD_SYS}/lib:\1${STAGING_LIBDIR}:" \
+				-e "s:\(LDDLFLAGS.*\)${STAGING_LIBDIR_NATIVE}:\1${STAGING_LIBDIR}:" \
 				Makefile
 		fi
 	fi
diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index 3588e2344a..a6b000cb6a 100644
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -18,7 +18,7 @@ CPPFLAGS = "${BUILD_CPPFLAGS}"
 CFLAGS = "${BUILD_CFLAGS}"
 CXXFLAGS = "${BUILD_CFLAGS}"
 LDFLAGS = "${BUILD_LDFLAGS}"
-LDFLAGS_build-darwin = "-L${STAGING_DIR}/${BUILD_SYS}/lib "
+LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE} "
 
 # Overrides for paths
 
diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass
index 446e78ae1a..56cbd6444f 100644
--- a/classes/icecc.bbclass
+++ b/classes/icecc.bbclass
@@ -9,7 +9,8 @@
 # ICECC_VERSION accordingly.
 #
 #The class now handles all 3 different compile 'stages' (i.e native ,cross-kernel and target) creating the
-#necessary enviroment tar.gz file to be used by the remote machines
+#necessary enviroment tar.gz file to be used by the remote machines.
+#It also supports meta-toolchain generation
 #
 #If ICECC_PATH is not set in local.conf then the class will try to locate it using 'which'
 #but nothing is sure ;)
@@ -186,12 +187,15 @@ def create_cross_kernel_env(bb,d):
 def create_env(bb,d):
 
         #return create_cross_kernel_env(bb,d) 
+
         if bb.data.inherits_class("native", d):
           return create_native_env(bb,d)
         elif bb.data.inherits_class("kernel", d):
           return create_cross_kernel_env(bb,d)
         elif bb.data.inherits_class("cross", d):
           return create_native_env(bb,d)
+        elif bb.data.inherits_class("sdk", d):
+          return create_native_env(bb,d)
         else:  
           return create_cross_env(bb,d)
         
@@ -253,11 +257,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-intermediate", "qemu" ]
+    system_package_blacklist = [ "uclibc", "glibc-intermediate", "gcc", "qemu", "bind", "u-boot", "dhcp-forwarder", "enchant" ]
 
     for black in system_package_blacklist:
       if black in package_tmp:
-         bb.data.setVar('PARALLEL_MAKE' , '', d) 
+         bb.data.setVar("PARALLEL_MAKE" , "", d) 
          return ""
 
     #user defined exclusion list
@@ -266,7 +270,7 @@ def icc_path(bb,d,compile):
 
     for black in user_package_blacklist:
       if black in package_tmp:
-         bb.data.setVar('PARALLEL_MAKE' , '', d) 
+         bb.data.setVar("PARALLEL_MAKE" , "", d) 
          return ""
 
 
@@ -280,7 +284,6 @@ def icc_path(bb,d,compile):
          return create_path( ["gcc", "g++"], "native", bb, d)
 
     elif compile and bb.data.inherits_class("kernel", d):
-         #kernel_cc = bb.data.expand('${KERNEL_CC}', d) 
           return create_path( [get_cross_kernel_ver(bb,d), "foo"], "cross-kernel", bb, d)
 
     elif not compile or len(prefix) == 0:
@@ -305,7 +308,7 @@ def check_for_kernel(bb,d):
 def get_cross_kernel_ver(bb,d):
 
        return  bb.data.expand('${KERNEL_CC}', d).strip() or "gcc"
- 
+
 # set the icecream environment variables
 do_configure_prepend() {
     export PATH=${@icc_path(bb,d,False)}$PATH
@@ -316,7 +319,7 @@ do_configure_prepend() {
 do_compile_prepend() {
 
     export PATH=${@icc_path(bb,d,True)}$PATH
-
+ 
  #check if we are building a kernel and select gcc-cross-kernel
  if [ "${@check_for_kernel(bb,d)}" = "yes" ]; then
     export ICECC_CC="${@get_cross_kernel_ver(bb,d)}"
diff --git a/classes/module.bbclass b/classes/module.bbclass
index 7eac001ec4..7083076b5f 100644
--- a/classes/module.bbclass
+++ b/classes/module.bbclass
@@ -1,4 +1,4 @@
-RDEPENDS += "kernel (${KERNEL_VERSION})"
+RDEPENDS += "kernel (${KERNEL_VERSION}) update-modules"
 DEPENDS += "virtual/kernel"
 
 inherit module-base
diff --git a/classes/mozilla.bbclass b/classes/mozilla.bbclass
index bd8e9193d9..abf2bc7623 100644
--- a/classes/mozilla.bbclass
+++ b/classes/mozilla.bbclass
@@ -19,7 +19,7 @@ export MOZ_OBJDIR = "${S}"
 export CONFIGURE_ARGS = "${EXTRA_OECONF}"
 export HOST_LIBIDL_CFLAGS = "`${HOST_LIBIDL_CONFIG} --cflags`"
 export HOST_LIBIDL_LIBS = "`${HOST_LIBIDL_CONFIG} --libs`"
-export HOST_LIBIDL_CONFIG = "PKG_CONFIG_PATH=${STAGING_DIR}/${BUILD_SYS}/share/pkgconfig pkg-config libIDL-2.0"
+export HOST_LIBIDL_CONFIG = "PKG_CONFIG_PATH=${STAGING_DATADIR_NATIVE}/pkgconfig pkg-config libIDL-2.0"
 export HOST_CC = "${BUILD_CC}"
 export HOST_CXX = "${BUILD_CXX}"
 export HOST_CFLAGS = "${BUILD_CFLAGS}"
@@ -33,8 +33,8 @@ mozilla_do_configure() {
 		set -e
 		for cg in `find ${S} -name config.guess`; do
 			install -m 0755 \
-			${STAGING_DIR}/${BUILD_SYS}/share/gnu-config/config.guess \
-			${STAGING_DIR}/${BUILD_SYS}/share/gnu-config/config.sub \
+			${STAGING_DATADIR_NATIVE}/gnu-config/config.guess \
+			${STAGING_DATADIR_NATIVE}/gnu-config/config.sub \
 			`dirname $cg`/
 		done
 	)
diff --git a/classes/native.bbclass b/classes/native.bbclass
index 104d5a49da..d51c675909 100644
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -27,7 +27,7 @@ CPPFLAGS = "${BUILD_CPPFLAGS}"
 CFLAGS = "${BUILD_CFLAGS}"
 CXXFLAGS = "${BUILD_CFLAGS}"
 LDFLAGS = "${BUILD_LDFLAGS}"
-LDFLAGS_build-darwin = "-L${STAGING_DIR}/${BUILD_SYS}/lib "
+LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE} "
 
 STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}"
 STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}"
diff --git a/classes/qtopia4core.bbclass b/classes/qtopia4core.bbclass
new file mode 100644
index 0000000000..86bc7afc2f
--- /dev/null
+++ b/classes/qtopia4core.bbclass
@@ -0,0 +1,11 @@
+DEPENDS_prepend = "${@["qtopia-core ", ""][(bb.data.getVar('PN', d, 1) == 'qtopia-core')]}"
+inherit qmake2
+
+#
+# override variables set by qmake-base to compile QtopiaCore apps
+#
+export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore4"
+export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore4/"
+export OE_QMAKE_LIBS_QT = "qt"
+export OE_QMAKE_LIBS_X11 = ""
+EXTRA_QMAKEVARS_POST += "LIBS+=-lQtNetwork "