[oe-commits] org.oe.dev merge of '9d4e924b0bb41a7ab01cbbbd984916dc4367895c'

[rpurdie commit]

merge of '9d4e924b0bb41a7ab01cbbbd984916dc4367895c'
     and 'e2bf9fb2e2837fb9aa6c231fa227d473844d1f88'

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: e2d31688a9fdad7d686402b98de5719584b3e09e
ViewMTN: http://monotone.openembedded.org/revision/info/e2d31688a9fdad7d686402b98de5719584b3e09e
Files:
1
conf/distro/angstrom-2008.1.conf
classes/autotools.bbclass
classes/binconfig.bbclass
packages/apr/apr-util_1.2.7.bb
packages/apr/apr_1.2.7.bb
packages/mtd/mtd-utils_1.0.0+git.bb
packages/qt4/qt_staging.inc
packages/tasks/task-base.bb
Diffs:

#
# mt diff -r9d4e924b0bb41a7ab01cbbbd984916dc4367895c -re2d31688a9fdad7d686402b98de5719584b3e09e
#
# 
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [db7d798ae0bfb0247447e34639d0beebb064abc6]
#    to [13f3d678fe8a5316bdf4bf2448984ad0f7fbc69e]
# 
============================================================
--- conf/distro/angstrom-2008.1.conf	db7d798ae0bfb0247447e34639d0beebb064abc6
+++ conf/distro/angstrom-2008.1.conf	13f3d678fe8a5316bdf4bf2448984ad0f7fbc69e
@@ -53,7 +53,7 @@ PCMCIA_MANAGER = "pcmciautils"
 PCMCIA_MANAGER = "pcmciautils"
 
 #Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19"
+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"


#
# mt diff -re2bf9fb2e2837fb9aa6c231fa227d473844d1f88 -re2d31688a9fdad7d686402b98de5719584b3e09e
#
# 
# 
# patch "classes/autotools.bbclass"
#  from [e96cf316d44ecfcef44a4db7bddfb8d80facbdc7]
#    to [701ff1aa962fc32e4a4625ed4cce861e47ca5694]
# 
# patch "classes/binconfig.bbclass"
#  from [660275cce8f7fec339f68e7aa419d334663a5a21]
#    to [58dc018aedba1b26f08340968881e9b10ad2c6a0]
# 
# patch "packages/apr/apr-util_1.2.7.bb"
#  from [5bea7d4ba65baaae2f314e0e4725e74384c7d8c6]
#    to [662620cf3dc2aeaff4ac4ed3b34ed9acd9d2a39a]
# 
# patch "packages/apr/apr_1.2.7.bb"
#  from [9816898cd2e93fcd6a95f7506682ab0955872666]
#    to [f51f9d791644263063719fdd0f9d24f9a44f7134]
# 
# patch "packages/mtd/mtd-utils_1.0.0+git.bb"
#  from [28c59a29a8f4cc26b7723edd88cd3ee953be98f4]
#    to [db38f6e2d20f70fbb76af8a5fd01ade273c67858]
# 
# patch "packages/qt4/qt_staging.inc"
#  from [138e3742b0fa71c3307af21a755fcc6e6f9c90da]
#    to [1e20c2e834a2fdefaabe874c5cb9f9602a6325ef]
# 
# patch "packages/tasks/task-base.bb"
#  from [d0254a959c66b155e6d69adbbcdb70daa866cc07]
#    to [797b15619704c023c1e4777ddc0474fcea386fcd]
# 
============================================================
--- classes/autotools.bbclass	e96cf316d44ecfcef44a4db7bddfb8d80facbdc7
+++ classes/autotools.bbclass	701ff1aa962fc32e4a4625ed4cce861e47ca5694
@@ -174,6 +174,8 @@ autotools_stage_all() {
 	fi
 	if [ -d ${STAGE_TEMP}/${libdir} ]
 	then
+		find ${STAGE_TEMP}/${libdir} -name '*.la' -exec sed -i s,installed=yes,installed=no, {} \;
+
 		for i in ${STAGE_TEMP}/${libdir}/*.la
 		do
 			if [ ! -f "$i" ]; then
============================================================
--- classes/binconfig.bbclass	660275cce8f7fec339f68e7aa419d334663a5a21
+++ classes/binconfig.bbclass	58dc018aedba1b26f08340968881e9b10ad2c6a0
@@ -20,6 +20,8 @@ def get_binconfig_mangle(d):
 		s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'"
 		s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
 		s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
+		if bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d):
+		    s += bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d)
 	return s
 
 BINCONFIG_GLOB ?= "*-config"
============================================================
--- packages/apr/apr-util_1.2.7.bb	5bea7d4ba65baaae2f314e0e4725e74384c7d8c6
+++ packages/apr/apr-util_1.2.7.bb	662620cf3dc2aeaff4ac4ed3b34ed9acd9d2a39a
@@ -14,12 +14,19 @@ EXTRA_OECONF = "--with-apr=${STAGING_BIN
 		--without-sqlite3 \
 		--with-expat=${STAGING_DIR_HOST}${layout_prefix}"
 
+
 inherit autotools lib_package binconfig
 
+OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
+
 do_configure() {
+  cp ${STAGING_DATADIR}/apr_rules.mk ${S}/build/rules.mk
   oe_runconf
 }
 
 do_stage() {
-	autotools_stage_all
+  autotools_stage_all
+  sed -i s,/usr/lib/libgdbm.la,-lgdbm,g   ${STAGING_LIBDIR}/libaprutil-1.la
+  sed -i s,/usr/lib/libexpat.la,-lexpat,g ${STAGING_LIBDIR}/libaprutil-1.la
+  sed -i s,/usr/lib/libapr-1.la,-lapr-1,g ${STAGING_LIBDIR}/libaprutil-1.la
 }
============================================================
--- packages/apr/apr_1.2.7.bb	9816898cd2e93fcd6a95f7506682ab0955872666
+++ packages/apr/apr_1.2.7.bb	f51f9d791644263063719fdd0f9d24f9a44f7134
@@ -9,10 +9,13 @@ inherit autotools lib_package binconfig
 
 inherit autotools lib_package binconfig
 
+OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
+
 do_configure() {
   oe_runconf
 }
 
 do_stage() {
   autotools_stage_all
+  cp ${S}/build/apr_rules.mk ${STAGING_DATADIR}
 }
============================================================
--- packages/mtd/mtd-utils_1.0.0+git.bb	28c59a29a8f4cc26b7723edd88cd3ee953be98f4
+++ packages/mtd/mtd-utils_1.0.0+git.bb	db38f6e2d20f70fbb76af8a5fd01ade273c67858
@@ -1,9 +1,9 @@ LICENSE = "GPLv2"
 DESCRIPTION = "Tools for managing memory technology devices."
 SECTION = "base"
 DEPENDS = "zlib lzo"
 HOMEPAGE = "http://www.linux-mtd.infradead.org/"
 LICENSE = "GPLv2"
-PR = "r6"
+PR = "r7"
 
 # This is the default package, thus we lock to a specific git version so 
 # upstream changes will not break builds.
@@ -40,3 +40,7 @@ do_install () {
 		install -m 0755 $binary ${D}${bindir}
 	done
 }
+
+PACKAGES =+ "mkfs-jffs mkfs-jffs2"
+FILES_mkfs-jffs = "${bindir}/mkfs.jffs"
+FILES_mkfs-jffs2 = "${bindir}/mkfs.jffs2"
============================================================
--- packages/qt4/qt_staging.inc	138e3742b0fa71c3307af21a755fcc6e6f9c90da
+++ packages/qt4/qt_staging.inc	1e20c2e834a2fdefaabe874c5cb9f9602a6325ef
@@ -18,6 +18,7 @@ do_stage() {
 
     for i in ${STAGE_TEMP}/${libdir}/*.la
     do
+        sed -i s,installed=yes,installed=no, $i
         cp -fpPR $i ${STAGING_LIBDIR}/${QT_DIR_NAME}/
         oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/${QT_DIR_NAME}
     done
============================================================
--- packages/tasks/task-base.bb	d0254a959c66b155e6d69adbbcdb70daa866cc07
+++ packages/tasks/task-base.bb	797b15619704c023c1e4777ddc0474fcea386fcd
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r55"
+PR = "r56"
 
 inherit task
 
@@ -226,8 +226,6 @@ task-base-pcmcia24 = "\
     "
 
 task-base-pcmcia24 = "\
-    ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-modules-cs', '',d)} \
-    ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-modules-cs', '',d)} \
     "
 
 task-base-pcmcia26 = "\