# 
# old_revision [a5563210e57ff1a3cb7ddee80670313b6e95fdaa]
# 
# patch "packages/tasks/task-base.bb"
#  from [f42fce68f538f09a771fa2674b72feff0e5c88b4]
#    to [01ca51df062e419dcf92aca42814c26197770110]
# 
============================================================
--- packages/tasks/task-base.bb	f42fce68f538f09a771fa2674b72feff0e5c88b4
+++ packages/tasks/task-base.bb	01ca51df062e419dcf92aca42814c26197770110
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r28"
+PR = "r29"
 
 PACKAGES = 'task-boot \
             task-base \
@@ -105,7 +105,6 @@ RDEPENDS_task-base = "\
     ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'task-base-usbgadget', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \
-    ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \
     \
@@ -114,8 +113,31 @@ RDEPENDS_task-base = "\
     ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \
+    \
+    ${ADD_WIFI} \
+    ${ADD_BT} \
     "
 
+ADD_WIFI = ""
+ADD_BT = ""
+
+python __anonymous () {
+    import bb
+    # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them)
+    # then include task-base-wifi in task-base
+
+    distro_features = bb.data.getVar("DISTRO_FEATURES", d, 1)
+    machine_features= bb.data.getVar("MACHINE_FEATURES", d, 1)
+
+    if distro_features.find("bluetooth") and not machine_features.find("bluetooth") and (machine_features.find("pcmcia") or machine_features.find("pci")  or  machine_features.find("usbhost")):
+	bb.data.setVar("ADD_BT", "task-base-bluetooth", d)
+
+    if distro_features.find("wifi") and not machine_features.find("wifi") and (machine_features.find("pcmcia") or machine_features.find("pci")  or  machine_features.find("usbhost")):
+	bb.data.setVar("ADD_WIFI", "task-base-wifi", d)
+}
+
+
+
 #
 # packages added by distribution
 #