diff options
| -rw-r--r-- | conf/bitbake.conf | 1 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 2 | ||||
| -rw-r--r-- | packages/tasks/task-base.bb | 16 |
3 files changed, 11 insertions, 8 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 123d9ce7a7..676421961f 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -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)} \ diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 510a752211..313aca01f7 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -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" diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 4ac49e3a7e..acdfb81c10 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 = "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" |