diff options
| author | John Lee <john_lee@openmoko.org> | 2009-01-12 14:39:16 +0800 |
|---|---|---|
| committer | John Lee <john_lee@openmoko.org> | 2009-01-12 14:39:16 +0800 |
| commit | 366bf6043abfbbbfa98168548f42aa9aaf6c28b9 (patch) | |
| tree | ec24779b5ed382cbd3077595cd54a62fad4741c7 /conf | |
| parent | b4e78908d6ed0b4a142dabc9e72b1a81b7f3c581 (diff) | |
| parent | 5c898f6e20d5d27a1cc0747746d35f706fd6dfff (diff) | |
Merge commit 'origin/john_lee/fastboot-devel' into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/angstrom-2007-for-openmoko.inc | 2 | ||||
| -rw-r--r-- | conf/distro/openmoko.conf | 13 | ||||
| -rw-r--r-- | conf/machine/om-gta02.conf | 1 |
3 files changed, 14 insertions, 2 deletions
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index 34fbc52cfe..5675e75723 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -230,8 +230,6 @@ DISTRO_EXTRA_RRECOMMENDS += " \ kernel-module-vfat \ kernel-module-ext2 \ kernel-module-af-packet \ - avahi-daemon \ - avahi-autoipd \ openssh-sftp-server \ " diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 7e7aa1d022..844bb29e4b 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -30,6 +30,19 @@ DISTRO_FEED_URI ?= "http://downloads.openmoko.org/repository/testing" AB_DEPLOY_EXTRA ?= "" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}" +DISTRO_INITSCRIPTS = "initscripts-openmoko" + +# We try to minimize the distro features in the default image. +DISTRO_FEATURES = "wifi ppp alsa ext2 vfat usbhost" + +# Some features (bluetooth, usbgadget) include packages we do not like. +# Pick some of the packages manually. +DISTRO_EXTRA_RDEPENDS += " \ + bluez-utils \ + bluez-utils-compat \ + kernel-module-g-ether \ + " + # 2.18 seems to break badly on 64-bit systems PREFERRED_VERSION_binutils ?= "2.17.50.0.12" PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12" diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index c7b06dc3cd..c31828aafe 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -24,6 +24,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\ # no need to bypass this as in om-gta01, since this model is not using a multiplexed ttySAC0 SERIAL_CONSOLE = "115200 ttySAC2" +USE_VT = "0" # used by some images ROOT_FLASH_SIZE = "256" |