diff options
| author |   Stefan Schmidt <stefan@datenfreihafen.org> | 2009-01-27 10:12:58 +0000 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-01-27 10:12:58 +0000 |
| commit | 3f298b0d3342d1fbbbc1830528698fb4dd640d34 (patch) | |
| tree | e3ed4b4b06030722ff2f0628e5af27aa7695d736 /conf | |
| parent | df756c10617bb375929b672e9d6a26952dbb31b9 (diff) | |
| download | openembedded-3f298b0d3342d1fbbbc1830528698fb4dd640d34.tar.gz | |
Revert "Merge commit 'origin/john_lee/fastboot-devel' into org.openembedded.dev"
This reverts commit 366bf6043abfbbbfa98168548f42aa9aaf6c28b9.
This did broke all image for !om-gta02. Reverted and PRs bumped.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/angstrom-2007-for-openmoko.inc | 2 | ||||
| -rw-r--r-- | conf/distro/openmoko.conf | 12 | ||||
| -rw-r--r-- | conf/machine/om-gta02.conf | 1 |
3 files changed, 2 insertions, 13 deletions
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index 5675e75723..34fbc52cfe 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -230,6 +230,8 @@ 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 c038096231..a1a65410f5 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -30,18 +30,6 @@ 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 += " \ - bluez4 \ - 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 c31828aafe..c7b06dc3cd 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -24,7 +24,6 @@ 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" |