From 4f8343ce4d85f0665cf909e241a0a7a235349cc3 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 18 Feb 2007 18:38:21 +0000 Subject: task-base: Make "wifi" belong to COMBINED_FEATURES. * This is consistent with how "bluetooth" is handled already, and, assuming that distro supports wifi, essentially allows machine to decide if wifi packages go into rootfs or would be installed from feed. This is helpful for machines which don't have wifi and devoid of any means of external card extension, or for machines with very small ROM (like, for example, h3600 with its 16Mb, in which wifi packages simply don't fit, so h3600 users with CF sleeve and wifi card would need to install support manually, after deleting packages they can sacrifice for this). * Approved by Marcin Juszkiewicz --- packages/tasks/task-base.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') 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}" -- cgit v1.2.3 From c7e9d91801258b73c621704a1f16715f6084f271 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 18 Feb 2007 18:50:03 +0000 Subject: task-angstrom-x11: Remove dependency on detect-stylus. * detect-stylus is no longer used in OE, which adopted convention of having the touchscreen device at /dev/input/touchscreen0 (for all 2.6 devices being created by udev rule). --- packages/angstrom/task-angstrom-x11.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'packages') diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index 95fb0cf0c6..9644d4e527 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -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 \ -- cgit v1.2.3 From d26700b3505de269e1238bcb1ee2170d545058a0 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 18 Feb 2007 18:52:57 +0000 Subject: task-angstrom-x11: Bump PR for latest change. --- packages/angstrom/task-angstrom-x11.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index 9644d4e527..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}" -- cgit v1.2.3