fastboot: task-base.bb, task-boot.bb: customize openmoko distro more.

Remove avahi.  Use hardcoded packages for bluetooth and usbgadget
support.  Use initscripts-openmoko instead of initscripts.

Increase the PRs of task-base and task-boot to reflect the changes.

diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
index 34fbc52..5675e75 100644 (file)
--- 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 7e7aa1d..844bb29 100644 (file)
--- 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/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 220ae48..60f0908 100644 (file)
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r76"
+PR = "r77"
 
 inherit task
 

diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index 46f80f0..7cd3472 100644 (file)
--- a/packages/tasks/task-boot.bb
+++ b/packages/tasks/task-boot.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r45"
+PR = "r46"
 
 inherit task