[oe-commits] org.oe.dev merge of '7a689ee422b77b79d4b13b0d7a7c7060c257c930'
florian commit
oe at amethyst.openembedded.net
Mon Mar 17 08:51:41 UTC 2008
merge of '7a689ee422b77b79d4b13b0d7a7c7060c257c930'
and '8fbb3c656df4e525b0de65e241599ee4cf1b2658'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: a0269bea8450a3f7d6ba8018b8cbe2a7898d6bb6
ViewMTN: http://monotone.openembedded.org/revision/info/a0269bea8450a3f7d6ba8018b8cbe2a7898d6bb6
Files:
1
conf/machine/mainstone.conf
packages/apr/apr
packages/apr/apr-util
packages/c-nc
packages/pv
packages/pwgen
packages/apr/apr/configure_fixes.patch
packages/apr/apr-util/configure_fixes.patch
packages/apr/apr-util_1.2.12.bb
packages/apr/apr_1.2.12.bb
packages/c-nc/c-nc_0.5.bb
packages/initrdscripts/files/01-bootldr-buster.sh
packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb
packages/libtool/libtool.inc
packages/pv/pv_1.1.4.bb
packages/pwgen/pwgen_2.06.bb
packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-nonposix_bashisms.patch
packages/wireless-tools/wireless-tools_29.bb
classes/qmake2.bbclass
classes/qtopia4core.bbclass
conf/bitbake.conf
packages/apr/apr-util_1.2.7.bb
packages/apr/apr_1.2.7.bb
packages/espeak/espeak_1.30.bb
packages/gcc/gcc-cross-initial.inc
packages/initrdscripts/files/init.sh
packages/initrdscripts/initramfs-uniboot_1.0.bb
packages/libtool/libtool-cross_1.5.10.bb
packages/libtool/libtool-cross_1.5.22.bb
packages/libtool/libtool-cross_1.5.24.bb
packages/libtool/libtool-native_1.5.10.bb
packages/libtool/libtool-native_1.5.22.bb
packages/libtool/libtool-native_1.5.24.bb
packages/libtool/libtool_1.5.10.bb
packages/libtool/libtool_1.5.22.bb
packages/libtool/libtool_1.5.24.bb
packages/libtool/libtool_1.5.6.bb
packages/linux/linux-handhelds-2.6.inc
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
packages/python/python-lightmediascanner_svn.bb
packages/qt4/qt4-x11-free.inc
packages/qt4/qt_packaging.inc
packages/qt4/qt_staging.inc
packages/qt4/qtopia-core.inc
packages/subversion/subversion_1.4.5.bb
packages/uclibc/uclibc_0.9.29.bb
site/arm-linux
Diffs:
#
# mt diff -r7a689ee422b77b79d4b13b0d7a7c7060c257c930 -ra0269bea8450a3f7d6ba8018b8cbe2a7898d6bb6
#
#
#
# patch "conf/machine/mainstone.conf"
# from [e235c4e17b6bf284340f79803bdcb5a4f93d9e5c]
# to [355b60cc742949814d43264e16283d224b8df4bb]
#
============================================================
--- conf/machine/mainstone.conf e235c4e17b6bf284340f79803bdcb5a4f93d9e5c
+++ conf/machine/mainstone.conf 355b60cc742949814d43264e16283d224b8df4bb
@@ -14,8 +14,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
-# used by opie-collections.inc
ROOT_FLASH_SIZE = "16"
MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen keyboard alsa irda"
+EXTRA_IMAGECMD_jffs2 = "--little-endian -e 0x40000 --pad=0x02000000"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e 0x40000 --pad=0x01000000"
#
# mt diff -r8fbb3c656df4e525b0de65e241599ee4cf1b2658 -ra0269bea8450a3f7d6ba8018b8cbe2a7898d6bb6
#
#
#
# add_dir "packages/apr/apr"
#
# add_dir "packages/apr/apr-util"
#
# add_dir "packages/c-nc"
#
# add_dir "packages/pv"
#
# add_dir "packages/pwgen"
#
# add_file "packages/apr/apr/configure_fixes.patch"
# content [5e849d8b4a1b55d9bfb77536400dc6831a948907]
#
# add_file "packages/apr/apr-util/configure_fixes.patch"
# content [5e6541f99ae7a2db6ce2787142108a49984687fb]
#
# add_file "packages/apr/apr-util_1.2.12.bb"
# content [dc1badf7cf7f2131e45ac0ef4851197f4d8514ce]
#
# add_file "packages/apr/apr_1.2.12.bb"
# content [1c44d09d91c6eeeb9f28b54d241343149e7f3cb7]
#
# add_file "packages/c-nc/c-nc_0.5.bb"
# content [85e267eb9e3257a9374622a1346e40e03bfbc790]
#
# add_file "packages/initrdscripts/files/01-bootldr-buster.sh"
# content [4b513ffd4445d13ea94fcf8d11f8c2e6595f547a]
#
# add_file "packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb"
# content [3769506f197a56b63696a02fd31a8f87a0d2c55a]
#
# add_file "packages/libtool/libtool.inc"
# content [5e2573546ae1416fc12ad8b2d350176cf1379549]
#
# add_file "packages/pv/pv_1.1.4.bb"
# content [b3f56e909b6bc174f2cd1b7df23d05b568851564]
#
# add_file "packages/pwgen/pwgen_2.06.bb"
# content [08cdecdd4658825f71e13bfa0973f96fd60b1e7b]
#
# add_file "packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-nonposix_bashisms.patch"
# content [d1d87a1d45487ab3992cb1b898e57bb621192a8d]
#
# add_file "packages/wireless-tools/wireless-tools_29.bb"
# content [2db019d75981b9804f0be92a076def62dfdcd544]
#
# patch "classes/qmake2.bbclass"
# from [e469f74476f5cd684b559146bbd4e808de9dcadb]
# to [8079b5564afd7c19bbc0088e21ca4e780a85b65f]
#
# patch "classes/qtopia4core.bbclass"
# from [b1d6e66685818c4024d7bfabaf21b47344f94360]
# to [9e44d07549e666bc39b473d49004ee2a271a4f3e]
#
# patch "conf/bitbake.conf"
# from [45b49bcfc0ae43467fb81cf6e557fa940512f5cf]
# to [70cb68395c739ccdb760bd8420dc346bf585df73]
#
# patch "packages/apr/apr-util_1.2.7.bb"
# from [662620cf3dc2aeaff4ac4ed3b34ed9acd9d2a39a]
# to [d73fa6884d2e4c9e46ab044d063aed3634f62268]
#
# patch "packages/apr/apr_1.2.7.bb"
# from [f51f9d791644263063719fdd0f9d24f9a44f7134]
# to [00bf1ea494a00a7ca7787d42f13f06305e77420c]
#
# patch "packages/espeak/espeak_1.30.bb"
# from [0b187e4c430c8a401c4d5bd39c356847ef639578]
# to [a8eccd7e70daf05d588bdf9ab26438a62a6dfe71]
#
# patch "packages/gcc/gcc-cross-initial.inc"
# from [9ba43750cd0139966a6dcf2b4103056bf5ff486a]
# to [3169e83832ff092444d8ebefd61421998dbb8520]
#
# patch "packages/initrdscripts/files/init.sh"
# from [96fb4bc0a57019aa64a5b8316e5868a507195f87]
# to [c3caf34532f8b24aeef2f195ceffcd7ace300962]
#
# patch "packages/initrdscripts/initramfs-uniboot_1.0.bb"
# from [614ab72976521dc2833ecb9383e5556d18c05fa6]
# to [7e0c529c41c46e4ac3fe84cf042dddb05f824a5d]
#
# patch "packages/libtool/libtool-cross_1.5.10.bb"
# from [54bc11a40b3ffda524161118db81f8521ce06a24]
# to [fc61ef91876b8d677edc7bed56134504f5702d12]
#
# patch "packages/libtool/libtool-cross_1.5.22.bb"
# from [138113c078dbe30ab78a0d2ce0fb2f678723f078]
# to [5da896dba30f57599cdf078623842f395bff1b37]
#
# patch "packages/libtool/libtool-cross_1.5.24.bb"
# from [0aab7e15f589c0f61b67b253ce2e2b5105f5c496]
# to [b99c3310986c4141e212de9d4025e54df41f5541]
#
# patch "packages/libtool/libtool-native_1.5.10.bb"
# from [1637e2be734e54d7a59c21c3b10070585210ca96]
# to [8206614a1859c7f3de932c2c296721e671a28608]
#
# patch "packages/libtool/libtool-native_1.5.22.bb"
# from [033211d8e0f97f94c886544a0033645580a09c7f]
# to [68e41d1e179b4767e90116b23b5d5df1053c9071]
#
# patch "packages/libtool/libtool-native_1.5.24.bb"
# from [e5197c6fc402385737e26c1e4b3d057bc0c695c7]
# to [0a235422a53d4fa133e16c6e6ff5339a2fab020d]
#
# patch "packages/libtool/libtool_1.5.10.bb"
# from [e55c651cb0816e704d1aba735e8f2c01bae83dca]
# to [193a405689f2baba7b2c7eb26a551f5155c5011d]
#
# patch "packages/libtool/libtool_1.5.22.bb"
# from [6e9eb377b6284e78d06253d7cdd39a01e65f158b]
# to [31859451d723ca5b165d95756aa559fab043d457]
#
# patch "packages/libtool/libtool_1.5.24.bb"
# from [9aefa1ce0f4e6f6e2f585bfda7dded75c05269e1]
# to [2ddadb328145c416cc38bff265f28ae3a262fb8c]
#
# patch "packages/libtool/libtool_1.5.6.bb"
# from [317d9d0f9428cae00d85a4e969eb5a86494975f4]
# to [51a8970294e9293c7e753a5ed3555fee631262a3]
#
# patch "packages/linux/linux-handhelds-2.6.inc"
# from [6340ab138c2fe06105f6138355bf1deb236a34c9]
# to [70d018f15aa5f5a88cbad6314c69d71719eb911f]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
# from [ea6a3535f12c6cdabbeb6856aae9c02ba6166d35]
# to [1fe13d52ca457feb5a103d0b1ccbce114ec04797]
#
# patch "packages/python/python-lightmediascanner_svn.bb"
# from [ed36f161da571ebe8825db20d3e604b2b97c3ff6]
# to [778bc16e62613a73db9a236456a1e283fc86bde8]
#
# patch "packages/qt4/qt4-x11-free.inc"
# from [4252aa567a338367399f3245e33c08da05b15677]
# to [89c46cc5b77c68a9396f847011f40dda890459a6]
#
# patch "packages/qt4/qt_packaging.inc"
# from [10c4b21735e8cff175978c971577e1cac4681cad]
# to [39f09b583e2e9f61e01f5d75bf57e75690501ed4]
#
# patch "packages/qt4/qt_staging.inc"
# from [299c95fa7b3b469f300d50bb8dfe49412a6ec9bf]
# to [f74af3775f1a2c2fb8670eca49ab7c2a89d91a53]
#
# patch "packages/qt4/qtopia-core.inc"
# from [3fc8e29466adb68cfe7d5609ee964d7ba4951bbe]
# to [ece71d23b6e95ccfa2dd065273aa0b93013c811a]
#
# patch "packages/subversion/subversion_1.4.5.bb"
# from [b3247341e42924a7030a8993469f0c0eddeae7cd]
# to [044b4a42f948f26fcfc5218e2ad210298c3e4d4e]
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
# from [fbb16deda11e2a7ee5fd50b757a8cc92d0bb3294]
# to [3425ad6998ad40cbf49c5bd4b2ed1991f9232f23]
#
# patch "site/arm-linux"
# from [e8c70e76869b6a3fc4d35dfe9beb6db6d0de7c99]
# to [c91285190c4ff9d8468045483e474f39e0cb6e73]
#
============================================================
--- packages/apr/apr/configure_fixes.patch 5e849d8b4a1b55d9bfb77536400dc6831a948907
+++ packages/apr/apr/configure_fixes.patch 5e849d8b4a1b55d9bfb77536400dc6831a948907
@@ -0,0 +1,22 @@
+Index: apr-1.2.12/configure.in
+===================================================================
+--- apr-1.2.12.orig/configure.in 2008-03-08 21:41:43.000000000 +0000
++++ apr-1.2.12/configure.in 2008-03-08 21:43:08.000000000 +0000
+@@ -13,12 +13,11 @@
+ dnl
+ dnl Include our own M4 macros along with those for libtool
+ dnl
+-sinclude(build/apr_common.m4)
+-sinclude(build/apr_network.m4)
+-sinclude(build/apr_threads.m4)
+-sinclude(build/apr_hints.m4)
+-sinclude(build/libtool.m4)
+-sinclude(build/ltsugar.m4)
++#sinclude(build/apr_common.m4)
++#sinclude(build/apr_network.m4)
++#sinclude(build/apr_threads.m4)
++#sinclude(build/apr_hints.m4)
++#sinclude(build/libtool.m4)
+
+ dnl Hard-coded inclusion at the tail end of apr_private.h:
+ AH_BOTTOM([
============================================================
--- packages/apr/apr-util/configure_fixes.patch 5e6541f99ae7a2db6ce2787142108a49984687fb
+++ packages/apr/apr-util/configure_fixes.patch 5e6541f99ae7a2db6ce2787142108a49984687fb
@@ -0,0 +1,25 @@
+Index: apr-util-1.2.12/configure.in
+===================================================================
+--- apr-util-1.2.12.orig/configure.in 2008-03-08 19:15:00.000000000 +0000
++++ apr-util-1.2.12/configure.in 2008-03-08 19:15:13.000000000 +0000
+@@ -8,13 +8,13 @@
+ AC_CONFIG_HEADER(include/private/apu_config.h)
+ AC_CONFIG_AUX_DIR(build)
+
+-sinclude(build/apu-conf.m4)
+-sinclude(build/apu-iconv.m4)
+-sinclude(build/apu-hints.m4)
+-sinclude(build/apr_common.m4)
+-sinclude(build/find_apr.m4)
+-sinclude(build/dbm.m4)
+-sinclude(build/dbd.m4)
++#sinclude(build/apu-conf.m4)
++#sinclude(build/apu-iconv.m4)
++#sinclude(build/apu-hints.m4)
++#sinclude(build/apr_common.m4)
++#sinclude(build/find_apr.m4)
++#sinclude(build/dbm.m4)
++#sinclude(build/dbd.m4)
+
+ dnl Generate ./config.nice for reproducing runs of configure
+ dnl
============================================================
--- packages/apr/apr-util_1.2.12.bb dc1badf7cf7f2131e45ac0ef4851197f4d8514ce
+++ packages/apr/apr-util_1.2.12.bb dc1badf7cf7f2131e45ac0ef4851197f4d8514ce
@@ -0,0 +1,29 @@
+DESCRIPTION = "Apache Portable Runtime (APR) companion library"
+SECTION = "libs"
+DEPENDS = "apr expat gdbm"
+LICENSE = "Apache License, Version 2.0"
+
+PR = "r2"
+
+# apache mirrors?
+SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
+ file://configure_fixes.patch;patch=1"
+
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \
+ --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \
+ --without-sqlite2 \
+ --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_prepend() {
+ cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
+}
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/apr/apr_1.2.12.bb 1c44d09d91c6eeeb9f28b54d241343149e7f3cb7
+++ packages/apr/apr_1.2.12.bb 1c44d09d91c6eeeb9f28b54d241343149e7f3cb7
@@ -0,0 +1,26 @@
+DESCRIPTION = "Apache Portable Runtime (APR) library"
+SECTION = "libs"
+LICENSE = "Apache License, Version 2.0"
+
+PR = "r0"
+
+# apache mirrors?
+SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
+ file://configure_fixes.patch;patch=1"
+
+inherit autotools lib_package binconfig
+
+OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
+
+do_stage() {
+ autotools_stage_all
+ install -d ${STAGING_DATADIR}/apr
+ cp ${S}/build/apr_rules.mk ${STAGING_DATADIR}/apr/
+ sed -i s,apr_builddir=.*,apr_builddir=,g ${STAGING_DATADIR}/apr/apr_rules.mk
+ sed -i s,apr_builders=.*,apr_builders=,g ${STAGING_DATADIR}/apr/apr_rules.mk
+ sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${TARGET_PREFIX}libtool,g ${STAGING_DATADIR}/apr/apr_rules.mk
+ sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g ${STAGING_DATADIR}/apr/apr_rules.mk
+ cp ${S}/build/mkdir.sh ${STAGING_DATADIR}/apr/
+ cp ${S}/build/make_exports.awk ${STAGING_DATADIR}/apr/
+ cp ${S}/build/make_var_export.awk ${STAGING_DATADIR}/apr/
+}
============================================================
--- packages/c-nc/c-nc_0.5.bb 85e267eb9e3257a9374622a1346e40e03bfbc790
+++ packages/c-nc/c-nc_0.5.bb 85e267eb9e3257a9374622a1346e40e03bfbc790
@@ -0,0 +1,19 @@
+DESCRIPTION = "A Mastermind style game in GTK+"
+SECTION = "x11/games"
+LICENSE = "GPLv2"
+HOMEPAGE = "http://freshmeat.net/projects/c-nc/"
+DEPENDS = "gtk+"
+AUTHOR = "Alexandru Scvortov <scvalex at gmail.com>"
+PV = "0.5"
+
+inherit autotools
+
+SRC_URI = "http://c-nc.googlecode.com/files/c-nc-${PV}.tar.gz"
+
+do_install() {
+ install -d ${D}${bindir} ${D}${docdir}/c-nc
+ install -m 0755 ${S}/c-nc ${D}${bindir}
+ install -d ${D}${datadir}/applications/
+ install -m 0755 ${S}/c-nc.desktop ${D}${datadir}/applications/
+}
+
============================================================
--- packages/initrdscripts/files/01-bootldr-buster.sh 4b513ffd4445d13ea94fcf8d11f8c2e6595f547a
+++ packages/initrdscripts/files/01-bootldr-buster.sh 4b513ffd4445d13ea94fcf8d11f8c2e6595f547a
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+cmdl=`cat /proc/cmdline`
+#cmdl="console=ttySA0,115200 console=ttySB0,115200"
+if expr "$cmdl" : '.*mtdparts=ipaq' > /dev/null; then
+ echo "!!!!!!!!"
+ echo "Detected Compaq bootldr or derivative"
+ echo "Kernel command line is assumed to be bogus and ignored"
+ echo "!!!!!!!!"
+ CMDLINE=" "
+ sleep 3
+fi
+
+# The main trouble is the bogus console=ttySA0 passed by bootldr
+# It appears that kernel doesn't have protection against only invalid
+# consoles being passed on the command line, which means that the
+# kernel is deaf and dumb when booted by bootldr
+
+INVALID_CONSOLE=0
+VALID_CONSOLE=0
+
+for arg in $cmdl; do
+ optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'`
+ case $arg in
+ console=*)
+ if expr "$optarg" : 'ttySA[0-9]\+' > /dev/null; then
+ INVALID_CONSOLE=1
+ elif expr "$optarg" : 'ttyS\?[0-9]\+' > /dev/null; then
+ VALID_CONSOLE=1
+ fi
+ ;;
+ esac
+done
+
+if [ $INVALID_CONSOLE -eq 1 -a $VALID_CONSOLE -eq 0 ]; then
+ echo "!!!!!!!!"
+ echo "No valid system console is detected"
+ echo "Explicitly using /dev/tty0 for input/output"
+ echo "!!!!!!!!"
+ CONSOLE="/dev/tty0"
+fi
============================================================
--- packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb 3769506f197a56b63696a02fd31a8f87a0d2c55a
+++ packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb 3769506f197a56b63696a02fd31a8f87a0d2c55a
@@ -0,0 +1,12 @@
+SRC_URI = "file://01-bootldr-buster.sh"
+PR = "r1"
+DESCRIPTION = "An initramfs module for ignoring bogus kernel commandline from Compaq bootldr"
+RDEPENDS = "initramfs-uniboot"
+
+do_install() {
+ install -d ${D}/initrd.d
+ install -m 0755 ${WORKDIR}/01-bootldr-buster.sh ${D}/initrd.d/
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} += " /initrd.d/* "
============================================================
--- packages/libtool/libtool.inc 5e2573546ae1416fc12ad8b2d350176cf1379549
+++ packages/libtool/libtool.inc 5e2573546ae1416fc12ad8b2d350176cf1379549
@@ -0,0 +1,8 @@
+DESCRIPTION = "Generic library support script \
+This is GNU libtool, a generic library support script. Libtool hides \
+the complexity of generating special library types (such as shared \
+libraries) behind a consistent interface."
+HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
+LICENSE = "GPL"
+SECTION = "devel"
+
============================================================
--- packages/pv/pv_1.1.4.bb b3f56e909b6bc174f2cd1b7df23d05b568851564
+++ packages/pv/pv_1.1.4.bb b3f56e909b6bc174f2cd1b7df23d05b568851564
@@ -0,0 +1,11 @@
+DESCRIPTION = "Pipe Viewer is a terminal-based tool for monitoring the progress of data through a pipeline."
+SECTION = "console/utils"
+HOMEPAGE = "http://www.ivarch.com/programs/pv.shtml"
+LICENSE = "Artistic License 2.0"
+
+inherit autotools
+
+SRC_URI = "http://pipeviewer.googlecode.com/files/pv-${PV}.tar.bz2"
+
+
+EXTRA_OEMAKE = "LD='${LD}'"
============================================================
--- packages/pwgen/pwgen_2.06.bb 08cdecdd4658825f71e13bfa0973f96fd60b1e7b
+++ packages/pwgen/pwgen_2.06.bb 08cdecdd4658825f71e13bfa0973f96fd60b1e7b
@@ -0,0 +1,7 @@
+DESCRIPTION = "Password generator which creates passwords which can be easily memorized by a human"
+HOMEPAGE = "http://sf.net/projects/pwgen/"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pwgen/pwgen-${PV}.tar.gz"
+
+inherit autotools
============================================================
--- packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-nonposix_bashisms.patch d1d87a1d45487ab3992cb1b898e57bb621192a8d
+++ packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-nonposix_bashisms.patch d1d87a1d45487ab3992cb1b898e57bb621192a8d
@@ -0,0 +1,13 @@
+Index: uClibc-0.9.29/extra/config/lxdialog/check-lxdialog.sh
+===================================================================
+--- uClibc-0.9.29.orig/extra/config/lxdialog/check-lxdialog.sh 2008-03-09 21:58:29.000000000 +0100
++++ uClibc-0.9.29/extra/config/lxdialog/check-lxdialog.sh 2008-03-09 21:58:39.000000000 +0100
+@@ -57,7 +57,7 @@
+ printf "Usage: $0 [-check compiler options|-header|-library]\n"
+ }
+
+-if [ $# == 0 ]; then
++if [ $# -eq 0 ]; then
+ usage
+ exit 1
+ fi
============================================================
--- packages/wireless-tools/wireless-tools_29.bb 2db019d75981b9804f0be92a076def62dfdcd544
+++ packages/wireless-tools/wireless-tools_29.bb 2db019d75981b9804f0be92a076def62dfdcd544
@@ -0,0 +1,3 @@
+require wireless-tools.inc
+
+PR = "r0"
============================================================
--- classes/qmake2.bbclass e469f74476f5cd684b559146bbd4e808de9dcadb
+++ classes/qmake2.bbclass 8079b5564afd7c19bbc0088e21ca4e780a85b65f
@@ -14,6 +14,6 @@ export OE_QMAKE_INCDIR_QT = "${STAGING_I
export OE_QMAKE_LINK = "${CXX}"
export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4"
-export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qt4"
+export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
export OE_QMAKE_LIBS_QT = "qt"
export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
============================================================
--- classes/qtopia4core.bbclass b1d6e66685818c402%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list