From: Junqian Gordon Xu Date: Wed, 12 Mar 2008 18:43:36 +0000 (+0000) Subject: opie-image-(16mb): replace MACHINE_TASK_PROVIDER with task_boot/task_base courtesy... X-Git-Tag: Release-2010-05/1~7494^2~9^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cec1b020d3e88d90cd1aa209f69d28a0e322eb93;p=openembedded.git opie-image-(16mb): replace MACHINE_TASK_PROVIDER with task_boot/task_base courtesy of Henry von Tresckow * oebug# 3969 * add task-base-extended for devices without built in wifi * remove borken merge feeds --- diff --git a/packages/images/opie-image-16mb.bb b/packages/images/opie-image-16mb.bb index 42bf611880..3abab2e726 100644 --- a/packages/images/opie-image-16mb.bb +++ b/packages/images/opie-image-16mb.bb @@ -1,6 +1,6 @@ IMAGE_LINGUAS = "" -DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie-16mb" +DEPENDS = "task-boot task-opie-16mb" IMAGE_INSTALL = "task-boot \ ipkg ipkg-collateral \ @@ -14,6 +14,6 @@ IMAGE_INSTALL = "task-boot \ task-opie-irda" # create /etc/timestamp from build date -IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp" +IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" inherit image diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb index 04c1f260e8..54e38c498f 100644 --- a/packages/images/opie-image.bb +++ b/packages/images/opie-image.bb @@ -1,8 +1,8 @@ IMAGE_LINGUAS = "" -DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie" +DEPENDS = "task-base task-opie" -IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-applets \ +IMAGE_INSTALL = "task-base-extended task-opie-base task-opie-base-applets \ task-opie-base-inputmethods task-opie-base-apps \ task-opie-base-settings task-opie-base-decorations \ task-opie-base-styles task-opie-base-pim \