diff options
| author | Rene Wagner <rw@handhelds.org> | 2005-08-02 17:33:34 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-02 17:33:34 +0000 |
| commit | 1d06e416f8dcb91de109b868590775132b252029 (patch) | |
| tree | f40ab0047c2fc3ad0885e73b580a615ee1d55110 /conf | |
| parent | afdb0d5e2fb710a760d0df495db00513b9fcaa0d (diff) | |
| parent | 516ea71ffd9e6f55074a1e3706c1f85783489200 (diff) | |
merge of 0be90c0033737c7d37a25d8cd1aa94037e680561
and 6e5ce0dceab57662bdf528c2a40bdf3dc557013f
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/ucslugc-packages.conf | 3 | ||||
| -rw-r--r-- | conf/machine/nokia770.conf | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf index b76d352b8a..c6575241ba 100644 --- a/conf/distro/ucslugc-packages.conf +++ b/conf/distro/ucslugc-packages.conf @@ -14,7 +14,9 @@ ${PKGDIR}/packages/bluez-utils/*.bb \ ${PKGDIR}/packages/boost/*.bb \ ${PKGDIR}/packages/bridge-utils/*.bb \ ${PKGDIR}/packages/busybox/*.bb \ +${PKGDIR}/packages/bwmon/*.bb \ ${PKGDIR}/packages/bzip2/*.bb \ +${PKGDIR}/packages/ccxstream/*.bb \ ${PKGDIR}/packages/coreutils/*.bb \ ${PKGDIR}/packages/cpio/*.bb \ ${PKGDIR}/packages/cron/*.bb \ @@ -129,6 +131,7 @@ ${PKGDIR}/packages/sudo/*.bb \ ${PKGDIR}/packages/sysfsutils/*.bb \ ${PKGDIR}/packages/sysvinit/*.bb \ ${PKGDIR}/packages/thttpd/*.bb \ +${PKGDIR}/packages/timezones/*.bb \ ${PKGDIR}/packages/tinylogin/*.bb \ ${PKGDIR}/packages/uclibc/*.bb \ ${PKGDIR}/packages/unionfs/*.bb \ diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 7a39104c63..c928093855 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -11,10 +11,8 @@ XSERVER = "xserver-kdrive-omap" # 800x480 is big enough for me GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim sylpheed" -GPE_EXTRA_INSTALL += "gaim sylpheed" - -include conf/machine/handheld-common.conf +GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser" +GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/tune-arm926ejs.conf @@ -32,10 +30,10 @@ SERIAL_CONSOLE = "115200 ttyS0" #build omap1 till nokia releases the patches PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel sysfsutils nokia770-init \ +BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel sysfsutils nokia770-init \ pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" -BOOTSTRAP_EXTRA_RDEPENDS = "sysfsutils nokia770-init \ +BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \ pcmcia-cs apm ppp wireless-tools console-tools" # NFS Modules @@ -56,3 +54,7 @@ pcmcia-cs apm ppp wireless-tools console-tools" #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \ # kernel-module-g-ether" +include conf/machine/handheld-common.conf + + + |