diff options
| author | Rene Wagner <rw@handhelds.org> | 2005-07-29 21:17:08 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-29 21:17:08 +0000 |
| commit | 96311266fb4ee5b87fec4b64f65d42431dfe5b42 (patch) | |
| tree | 977f974554e19f6b3e38fce6faf1617cd2b4fc2d | |
| parent | 39773aaf1be97eeb4bcdbd1fc9610bccb7a420a9 (diff) | |
| parent | 1c58a321e42af440ce535b75a0a59cb80061a263 (diff) | |
merge of 22b6c89379f44959daad0672b60b3b2775b9364a
and a9d332834a83bff1778ad969b7e1514a83a3c137
116 files changed, 9808 insertions, 1681 deletions
diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass index 2a2f3d5bbd..09b9cbac96 100644 --- a/classes/qt3x11.bbclass +++ b/classes/qt3x11.bbclass @@ -4,7 +4,7 @@ export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt3" export OE_QMAKE_UIC="${STAGING_BINDIR}/uic3" export OE_QMAKE_MOC="${STAGING_BINDIR}/moc3" -export OE_QMAKE_CXXFLAGS="${CXXFLAGS}" +export OE_QMAKE_CXXFLAGS="${CXXFLAGS} -DQT_NO_XIM" export OE_QMAKE_INCDIR_QT="${QTDIR}/include" export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" export OE_QMAKE_LIBS_QT="qt" diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 0c0c470bb8..5de9b8755a 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -51,7 +51,7 @@ def tinder_do_tinder_report(event): tinderclient.log """ from bb.event import getName - from bb import data, make, mkdirhier + from bb import data, mkdirhier import os, glob # variables diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index daff83460b..e4da231aa5 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -1,5 +1,6 @@ # automatically generated by bitbake freeze BBFILES := "\ +${PKGDIR}/packages/atftp/*.bb \ ${PKGDIR}/packages/audiofile/*.bb \ ${PKGDIR}/packages/autoconf/*.bb \ ${PKGDIR}/packages/automake/*.bb \ @@ -134,6 +135,7 @@ ${PKGDIR}/packages/samba/*.bb \ ${PKGDIR}/packages/sane-backends/*.bb \ ${PKGDIR}/packages/screen/*.bb \ ${PKGDIR}/packages/sed/*.bb \ +${PKGDIR}/packages/setpwc/*.bb \ ${PKGDIR}/packages/slugimage/*.bb \ ${PKGDIR}/packages/streamripper/*.bb \ ${PKGDIR}/packages/sudo/*.bb \ diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 37dd0a52f2..9e91dcfbbc 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -5,7 +5,7 @@ KERNEL ?= "kernel24" #KERNEL ?= "kernel26" -OVERRIDES := "${KERNEL}:${OVERRIDES}" +OVERRIDES =. "${KERNEL}:" TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ipaqpxa h3900" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 58a178850b..da7952d994 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -2,30 +2,32 @@ #@NAME: iPAQ hx47xx hx2xxx #@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices - TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm ipaqpxa hx4700" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa" -EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p" +IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700" +PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" + +PREFERRED_VERSION_orinoco-modules = "0.15rc1" BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params" -BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools" +BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev modutils-collateral module-init-tools" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" +BOOTSTRAP_EXTRA_RDEPENDS_append = " udev modutils-collateral module-init-tools" -PXA270_MODULES = "g_ether pxa2xx_udc" +PXA270_MODULES = "g_ether pxa27x_udc" - -SERIAL_CONSOLE = "115200 tts/0 vt100" -USE_DEVFS_kernel24 = "1" -USE_VT = "0" +SERIAL_CONSOLE = "115200 ttyS0" include conf/machine/ipaq-common.conf include conf/machine/handheld-common.conf -GUI_MACHINE_CLASS = "largescreen" +GUI_MACHINE_CLASS = "bigscreen" +GPE_EXTRA_DEPENDS += |