diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-02-17 23:41:39 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-02-17 23:41:39 +0000 |
| commit | f423928298938b2b053cc80b68fd93d21fe614bf (patch) | |
| tree | f954452714d37227a8c5878296de6605a7c0e381 /packages | |
| parent | 1c773d6cd608602d5bc9f5f42c25dd57ccc6619c (diff) | |
| parent | f5bdd34e306db20fe744dbf9634e297afa8a3480 (diff) | |
merge of '16171ae55790573667b9c030c80a790d123e19bf'
and 'cc76392ac5a7b1ccde5981fd2e02094b88a5240a'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/angstrom/task-angstrom-x11.bb | 3 | ||||
| -rw-r--r-- | packages/tasks/task-base.bb | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index 95fb0cf0c6..36aa431d42 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r27" +PR = "r28" ALLOW_EMPTY = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -42,7 +42,6 @@ RDEPENDS_angstrom-gpe-task-base := "\ gpe-autostarter \ ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus", "",d)} \ ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \ - ${@base_contains("MACHINE_FEATURES", "touchscreen", "detect-stylus", "",d)} \ suspend-desktop \ teleport \ xauth \ diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index b4266a0940..fdbf9f75d2 100644 --- 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 = "r16" +PR = "r17" PACKAGES = "task-base \ task-base-minimal \ @@ -62,10 +62,10 @@ RDEPENDS_task-base = "\ ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ ${MACHINE_EXTRA_RDEPENDS} \ ${DISTRO_EXTRA_RDEPENDS}" |