diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-07-05 16:21:53 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-07-05 16:21:53 +0000 |
| commit | 8d3f7b27e80ba08d2dc0e8167f01d27527697e06 (patch) | |
| tree | b1fa703042aa93dc9aaa90df0695211de7d9e807 /conf | |
| parent | b0dc3a8d1dc7e79b7960ee7503d80a7d43b8793f (diff) | |
| parent | 2ed2875b6c56be3a2f2b9db557e22024d3e92dd6 (diff) | |
merge of '6ecc6574ba0db38196a290448aaaf3706bcacee3'
and '7314baf01ff720449ddb034e256e260501df588f'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 4 | ||||
| -rw-r--r-- | conf/distro/include/preferred-opie-versions-1.2.3-pre.inc | 2 | ||||
| -rw-r--r-- | conf/machine/h2200.conf | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 38561149d7..a4dd4b18a8 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -319,8 +319,8 @@ BOOTSTRAP_EXTRA_RRECOMMENDS = "" export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt2" export QPEDIR = "${STAGING_DIR}/${HOST_SYS}" export OPIEDIR = "${STAGING_DIR}/${HOST_SYS}" -export palmtopdir = "${prefix}" -export palmqtdir = "${prefix}" +export palmtopdir = "${libdir}/opie" +export palmqtdir = "${palmtopdir}" ################################################################## # Download locations and utilities. diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc index 4d422ca537..fe71a6ab90 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc @@ -3,7 +3,7 @@ QTE_VERSION ?= "2.3.10" PALMTOP_USE_MULTITHREADED_QT ?= "yes" -OPIE_SRCDATE ?= "20070702" +OPIE_SRCDATE ?= "20070703" OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}" OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}" diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 6c43e75625..56f1d17c04 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -26,7 +26,7 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" -MACHINE_EXTRA_RDEPENDS = "h2200-bootloader" +MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround" EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" # |