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

            to branch 'org.openembedded.nslu2-linux' (head 99bf568313454a05bf17df79cb135d7e4bb6c643)

109 files changed, 800 insertions, 2468 deletions

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 1d6a607559..8a387da5ca 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -140,11 +140,14 @@ autotools_do_install() {
 STAGE_TEMP="${WORKDIR}/temp-staging"
 
 autotools_stage_includes() {
-	rm -rf ${STAGE_TEMP}
-	mkdir -p ${STAGE_TEMP}
-	make DESTDIR="${STAGE_TEMP}" install
-	cp -a ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
-	rm -rf ${STAGE_TEMP}
+	if [ "${INHIBIT_AUTO_STAGE_INCLUDES}" != "1" ]
+	then
+		rm -rf ${STAGE_TEMP}
+		mkdir -p ${STAGE_TEMP}
+		make DESTDIR="${STAGE_TEMP}" install
+		cp -a ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
+		rm -rf ${STAGE_TEMP}
+	fi
 }
 
 EXPORT_FUNCTIONS do_configure do_install
diff --git a/classes/debian.bbclass b/classes/debian.bbclass
index 2480ffd664..d66c1fc763 100644
--- a/classes/debian.bbclass
+++ b/classes/debian.bbclass
@@ -79,7 +79,7 @@ python debian_package_name_hook () {
 					if pkg == orig_pkg:
 						newpkg = pkgname
 					else:
-						newpkg = pkg.replace(orig_pkg, devname)
+						newpkg = pkg.replace(orig_pkg, devname, 1)
 					if newpkg != pkg:
 						bb.data.setVar('PKG_' + pkg, newpkg, d)
 
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
new file mode 100644
index 0000000000..b7bb87360d
--- /dev/null
+++ b/classes/efl.bbclass
@@ -0,0 +1,51 @@
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+HOMEPAGE = "http://www.enlightenment.org"
+SECTION = "e/libs"
+
+SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
+SRC_URI = "http://enlightenment.freedesktop.org/files/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit autotools pkgconfig binconfig
+
+INHIBIT_AUTO_STAGE_INCLUDES  = "1"
+INHIBIT_NATIVE_STAGE_INSTALL = "1"
+
+libdirectory = "src/lib"
+libraries = "lib${SRCNAME}"
+headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h"
+
+def binconfig_suffix(d):
+	import bb
+        return ["","-native"][bb.data.inherits_class('native', d)]
+
+export CURL_CONFIG		= "${STAGING_BINDIR}/curl-config${@binconfig_suffix(d)}"
+export EDB_CONFIG		= "${STAGING_BINDIR}/edb-config${@binconfig_suffix(d)}"
+export EET_CONFIG		= "${STAGING_BINDIR}/eet-config${@binconfig_suffix(d)}"
+export EVAS_CONFIG		= "${STAGING_BINDIR}/evas-config${@binconfig_suffix(d)}"
+export ECORE_CONFIG		= "${STAGING_BINDIR}/ecore-config${@binconfig_suffix(d)}"
+export EMBRYO_CONFIG		= "${STAGING_BINDIR}/embryo-config${@binconfig_suffix(d)}"
+export ENGRAVE_CONFIG		= "${STAGING_BINDIR}/engrave-config${@binconfig_suffix(d)}"
+export ENLIGHTENMENT_CONFIG	= "${STAGING_BINDIR}/enlightenment-config${@binconfig_suffix(d)}"
+export EPSILON_CONFIG		= "${STAGING_BINDIR}/epsilon-config${@binconfig_suffix(d)}"
+export EPEG_CONFIG		= "${STAGING_BINDIR}/epeg-config${@binconfig_suffix(d)}"
+export ESMART_CONFIG		= "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}"
+export FREETYPE_CONFIG		= "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}"
+export IMLIB2_CONFIG		= "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}"
+
+do_stage_append () {
+	for i in ${libraries}
+	do
+		oe_libinstall -C ${libdirectory} $i ${STAGING_LIBDIR}
+	done
+	for i in ${headers}
+	do
+		install -m 0644 ${libdirectory}/$i ${STAGING_INCDIR}
+	done
+}
+
+PACKAGES = "${SRCNAME}-dev ${SRCNAME}-examples ${SRCNAME}"
+FILES_${SRCNAME} = "${libdir}"
+FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig"
+FILES_${SRCNAME}-examples = "${bindir} ${datadir}"
+
diff --git a/classes/native.bbclass b/classes/native.bbclass
index 3391694838..955a8ae646 100644
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -50,14 +50,17 @@ libdir = "${exec_prefix}/lib"
 includedir = "${exec_prefix}/include"
 oldincludedir = "${exec_prefix}/include"
 
-# Datadir is made arch depenedent here, primarily
+# Datadir is made arch dependent here, primarily
 # for autoconf macros, and other things that
 # may be manipulated to handle crosscompilation
 # issues.
 datadir = "${exec_prefix}/share"
 
 do_stage () {
-	oe_runmake install
+	if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ]
+	then
+		oe_runmake install
+	fi
 }
 
 do_install () {
diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb
index 80e22d1924..a0b5996d6c 100644
--- a/packages/altboot/altboot.bb
+++ b/packages/altboot/altboot.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
  
 
-PR = "r5"
+PR = "r7"
 
 
 SRC_URI = "file://altboot-menu \
@@ -39,27 +39,32 @@ pkg_postinst() {
 }
 
 pkg_postinst_spitz() {
-	
 	# Note: Spitz support is a royal pain in the ass.
 	#       Since Spitz pivot_roots by default, there is no real way
 	#	a user can install an altboot.ipk into the flash FS.
 	#	So we need to do that manually (*SIGH*)
-	
+
 	# /l/m only exists on the HDD on spitz
 	if test -d /lib/modules
 	then
-		if [ -e /media/realroot/sbin/init ]; then
-		  ROOT_MOUNT_POINT="/media/realroot"
-		elif [ -e /media/ROM/sbin/init ]; then
-		   ROOT_MOUNT_POINT="/media/ROM"   
-		fi
-		ROOT_MOUNT_DEVICE = `cat /proc/mounts | grep $REALROOT | grep jffs2 | cut -d " " -f 1`
-		mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT
-		cp -R /etc/altboot* $ROOT_MOUNT_POINT/etc
-		cp /sbin/init.altboot $ROOT_MOINT_POINT/sbin
-		mv $ROOT_MOUNT_POINT/sbin/init $ROOT_MOUNT_POINT/sbin/init.orig
-		ln -s /sbin/init.altboot $ROOT_MOUNT_POINT/sbin/init
-	fi						
+	   if [ -e /media/realroot/sbin/init ]; then
+	      ROOT_MOUNT_POINT="/media/realroot"
+	   elif [ -e /media/ROM/sbin/init ]; then
+	      ROOT_MOUNT_POINT="/media/ROM"
+	   fi
+	   if [ ! "$ROOT_MOUNT_POINT" = "" ]; then
+