summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/autotools.bbclass2
-rw-r--r--classes/binconfig.bbclass2
-rw-r--r--packages/apr/apr-util_1.2.7.bb9
-rw-r--r--packages/apr/apr_1.2.7.bb3
-rw-r--r--packages/mtd/mtd-utils_1.0.0+git.bb6
-rw-r--r--packages/qt4/qt_staging.inc1
-rw-r--r--packages/tasks/task-base.bb4
7 files changed, 22 insertions, 5 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 8e4fba9400..991e472b14 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -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
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index 4e425a76d6..5ce9ff6f0d 100644
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -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"
diff --git a/packages/apr/apr-util_1.2.7.bb b/packages/apr/apr-util_1.2.7.bb
index ea81607953..904e41f8a3 100644
--- a/packages/apr/apr-util_1.2.7.bb
+++ b/packages/apr/apr-util_1.2.7.bb
@@ -14,12 +14,19 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \
--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
}
diff --git a/packages/apr/apr_1.2.7.bb b/packages/apr/apr_1.2.7.bb
index 2016ca0126..d0f2916bfa 100644
--- a/packages/apr/apr_1.2.7.bb
+++ b/packages/apr/apr_1.2.7.bb
@@ -9,10 +9,13 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2"
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}
}
diff --git a/packages/mtd/mtd-utils_1.0.0+git.bb b/packages/mtd/mtd-utils_1.0.0+git.bb
index 33f95853f6..d4e67f3aae 100644
--- a/packages/mtd/mtd-utils_1.0.0+git.bb
+++ b/packages/mtd/mtd-utils_1.0.0+git.bb
@@ -3,7 +3,7 @@ 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"
diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc
index 37002ca50e..6048d7b03e 100644
--- a/packages/qt4/qt_staging.inc
+++ b/packages/qt4/qt_staging.inc
@@ -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
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index cbb639ac3d..40ef6ddce8 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r55"
+PR = "r56"
inherit task
@@ -226,8 +226,6 @@ RRECOMMENDS_task-base-pcmcia = "\
"
task-base-pcmcia24 = "\
- ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-modules-cs', '',d)} \
- ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-modules-cs', '',d)} \
"
task-base-pcmcia26 = "\