[oe-commits] org.oe.dev task-base: Introduce "vfat" feature to get VFAT support.

[pfalcon commit]

task-base: Introduce "vfat" feature to get VFAT support.
* A COMBINED_FEATURE, machine and distro both must have it set for support 
to appear in images.
* For now, deploy just kernel modules. Necessity of dosfstools requires
more thought (and unlikely - vfat cannot be rootfs, so there's nothing to
test/recover as emergency measure, and users can install the tools during
normal operation).

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 9ecf040d01020ce72d56cb39e1d500c8ec8213e0
ViewMTN: http://monotone.openembedded.org/revision/info/9ecf040d01020ce72d56cb39e1d500c8ec8213e0
Files:
1
conf/bitbake.conf
conf/distro/include/angstrom.inc
packages/tasks/task-base.bb
Diffs:

#
# mt diff -rbc668ae9f53d5e7dbaeee92daced9790f1be61e0 -r9ecf040d01020ce72d56cb39e1d500c8ec8213e0
#
# 
# 
# patch "conf/bitbake.conf"
#  from [a1f6c5d6d3d4d66c93aa695c408f6bd53a242eb4]
#    to [b14f08a63b2e6c059abc0f50bbbb04c3b06c5cd5]
# 
# patch "conf/distro/include/angstrom.inc"
#  from [52dbd93aadf5979fc5b657ed07068f613d323a74]
#    to [b2fcc97fd9d2dd36be72566d73b0c456e0bc36da]
# 
# patch "packages/tasks/task-base.bb"
#  from [f33c49fb3e3820bd151a0e0035b125643a46b85a]
#    to [7f73b918596938fdd930b0e6060e79b168f69500]
# 
============================================================
--- conf/bitbake.conf	a1f6c5d6d3d4d66c93aa695c408f6bd53a242eb4
+++ conf/bitbake.conf	b14f08a63b2e6c059abc0f50bbbb04c3b06c5cd5
@@ -588,6 +588,7 @@ COMBINED_FEATURES = "\
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \
+    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "vfat", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \
============================================================
--- conf/distro/include/angstrom.inc	52dbd93aadf5979fc5b657ed07068f613d323a74
+++ conf/distro/include/angstrom.inc	b2fcc97fd9d2dd36be72566d73b0c456e0bc36da
@@ -269,5 +269,5 @@ SEPPUKU_COMPONENT    = "build"
 
 
 # We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci"
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci"
 DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci"
============================================================
--- packages/tasks/task-base.bb	f33c49fb3e3820bd151a0e0035b125643a46b85a
+++ packages/tasks/task-base.bb	7f73b918596938fdd930b0e6060e79b168f69500
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r51"
+PR = "r52"
 
 inherit task
 
@@ -15,6 +15,7 @@ PACKAGES = ' \
             ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa", "", d)} \
             ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm", "", d)} \
             ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2", "", d)} \
+            ${@base_contains("MACHINE_FEATURES", "vfat", "task-base-vfat", "", d)} \
             ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda", "",d)} \
             ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard", "", d)} \
             ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci", "",d)} \
@@ -87,6 +88,7 @@ RDEPENDS_task-base = "\
     \
     ${@base_contains('COMBINED_FEATURES', 'alsa', 'task-base-alsa', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'ext2', 'task-base-ext2', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', 'vfat', 'task-base-vfat', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \
@@ -159,14 +161,8 @@ RRECOMMENDS_task-base-kernel24 = "\
     kernel-module-input \
     kernel-module-uinput"
 
-# utf8 - Standard FS encoding
-# iso8859-1, cp437 - These 2 are default encodings used by VFAT
-# If you don't need VFAT support - don't enable them in defconfig. 
-# If you build them, you want VFAT support and they're included by default.
 RRECOMMENDS_task-base-kernel26 = "\
     kernel-module-nls-utf8 \
-    kernel-module-nls-iso8859-1 \
-    kernel-module-nls-cp437 \
     kernel-module-input \
     kernel-module-uinput \
     kernel-module-rtc-dev \
@@ -194,6 +190,12 @@ RDEPENDS_task-base-ext2 = "\
     e2fsprogs-e2fsck \
     e2fsprogs-mke2fs"
 
+RRECOMMENDS_task-base-vfat = "\
+    kernel-module-msdos \
+    kernel-module-vfat \
+    kernel-module-nls-iso8859-1 \
+    kernel-module-nls-cp437"
+
 RDEPENDS_task-base-alsa = "\
     alsa-utils-alsactl \
     alsa-utils-alsamixer"