UBUNTU: [Config] CONFIG_VFAT_FS=y

BugLink: http://bugs.launchpad.net/bugs/1626158
Fails to boot in Qemu otherwise.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 599eac1b10bfb802733d3a1ea9d57a8723b7760a..d52bdfe063105914790ed7287c844f6c22b6f2f0 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -335,7 +335,6 @@ CONFIG_EPIC100=m
 # CONFIG_EZX_PCAP is not set
 # CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
 # CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_FAT_FS=m
 CONFIG_FB=y
 CONFIG_FB_3DFX=m
 CONFIG_FB_3DFX_I2C=y
@@ -1532,7 +1531,6 @@ CONFIG_USELIB=y
 # CONFIG_USERFAULTFD is not set
 # CONFIG_USERIO is not set
 # CONFIG_VCNL4000 is not set
-CONFIG_VFAT_FS=m
 CONFIG_VFIO=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 # CONFIG_VFIO_NOIOMMU is not set

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index a409e6788a65f5f494b8e3f89aad7b2551aa56ce..e3d769f8a8db5424f1ba6edbf757514887aa32c9 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -7305,7 +7305,7 @@ CONFIG_FSCACHE_OBJECT_LIST                      policy<{'amd64': 'n', 'arm64': '
 
 # Menu: File systems >> DOS/FAT/NT Filesystems
 CONFIG_MSDOS_FS                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_VFAT_FS                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'y', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_VFAT_FS                                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_FAT_DEFAULT_CODEPAGE                     policy<{'amd64': '437', 'arm64': '437', 'armhf': '437', 'i386': '437', 'powerpc': '437', 'ppc64el': '437', 's390x': '437'}>
 CONFIG_FAT_DEFAULT_IOCHARSET                    policy<{'amd64': '"iso8859-1"', 'arm64': '"iso8859-1"', 'armhf': '"iso8859-1"', 'i386': '"iso8859-1"', 'powerpc': '"iso8859-1"', 'ppc64el': '"iso8859-1"', 's390x': '"iso8859-1"'}>
 CONFIG_NTFS_FS                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 61bda5dccd4a83961cb96f380b16e31db65fdd0c..424ec7dd0feed7ffbff920418c100c4d8fa5e50e 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -360,7 +360,6 @@ CONFIG_EXTCON=m
 # CONFIG_EZX_PCAP is not set
 # CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
 # CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_FAT_FS=m
 CONFIG_FB=y
 CONFIG_FB_3DFX=m
 CONFIG_FB_3DFX_I2C=y
@@ -1561,7 +1560,6 @@ CONFIG_USB_XHCI_PLATFORM=m
 # CONFIG_VCNL4000 is not set
 # CONFIG_VF610_ADC is not set
 # CONFIG_VF610_DAC is not set
-CONFIG_VFAT_FS=m
 # CONFIG_VFIO is not set
 CONFIG_VGASTATE=m
 # CONFIG_VIA_RHINE is not set

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 40a2a1ef4faf450fadf8beb814fbf302b04bba28..13449acc35efbf4562636247aae4914b2abd0bb8 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -355,7 +355,6 @@ CONFIG_EXTCON_USB_GPIO=m
 # CONFIG_EZX_PCAP is not set
 # CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
 # CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_FAT_FS=y
 CONFIG_FB=y
 CONFIG_FB_3DFX=m
 CONFIG_FB_3DFX_I2C=y
@@ -1638,7 +1637,6 @@ CONFIG_USB_XHCI_PLATFORM=m
 # CONFIG_VCNL4000 is not set
 # CONFIG_VF610_ADC is not set
 # CONFIG_VF610_DAC is not set
-CONFIG_VFAT_FS=y
 # CONFIG_VFIO is not set
 CONFIG_VGASTATE=m
 # CONFIG_VIA_RHINE is not set

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 4693f1db8285f9dbafe5f4f47a0d32b1b8ff9592..88301621cabbae2f3197b147af667b9b1df02e59 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2182,6 +2182,7 @@ CONFIG_FANOTIFY=y
 CONFIG_FARSYNC=m
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_FAT_FS=y
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_FA_DUMP=y
 # CONFIG_FB_3DFX_ACCEL is not set
@@ -7519,6 +7520,7 @@ CONFIG_VERSION_SIGNATURE=""
 CONFIG_VETH=m
 CONFIG_VEXPRESS_CONFIG=y
 CONFIG_VEXPRESS_SYSCFG=y
+CONFIG_VFAT_FS=y
 CONFIG_VFIO_IOMMU_SPAPR_TCE=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_IGD=y

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 06f6c0a0c706c672395424265c270e6e46bc1283..9b82bb12603ac990ba962c93058801f1489914ee 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -353,7 +353,6 @@ CONFIG_EPIC100=m
 # CONFIG_EZX_PCAP is not set
 # CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
 # CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_FAT_FS=m
 CONFIG_FB=y
 CONFIG_FB_3DFX=m
 CONFIG_FB_3DFX_I2C=y
@@ -1599,7 +1598,6 @@ CONFIG_USELIB=y
 # CONFIG_VCNL4000 is not set
 # CONFIG_VF610_ADC is not set
 # CONFIG_VF610_DAC is not set
-CONFIG_VFAT_FS=m
 CONFIG_VGASTATE=m
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 6c637d856e1ce5857ae24b054f72b6e83959b94c..5519ad6b97ba63eb8861559ea9afc4f8c5e85a25 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -119,7 +119,6 @@ CONFIG_EXTCON_MAX3355=m
 CONFIG_EXTCON_RT8973A=m
 CONFIG_EXTCON_SM5502=m
 CONFIG_EXTCON_USB_GPIO=m
-CONFIG_FAT_FS=m
 CONFIG_FB=y
 CONFIG_FB_CIRRUS=m
 CONFIG_FB_IBM_GXT4500=m
@@ -696,7 +695,6 @@ CONFIG_USB_SL811_HCD=m
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_ZD1201=m
 CONFIG_USB_ZERO=m
-CONFIG_VFAT_FS=m
 CONFIG_VGASTATE=m
 CONFIG_VIA_RHINE=m
 CONFIG_VIA_RHINE_MMIO=y

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index a34a25cd7c836591823f7bd8fb8b035a4879e1f7..8d3fc758765aa617abdbbbe4e8a75cfc12e7ca15 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -333,7 +333,6 @@ CONFIG_EPIC100=m
 # CONFIG_EZX_PCAP is not set
 # CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
 # CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_FAT_FS=m
 CONFIG_FB=y
 CONFIG_FB_3DFX=m
 CONFIG_FB_3DFX_I2C=y
@@ -1435,7 +1434,6 @@ CONFIG_USB_ZD1201=m
 # CONFIG_VCNL4000 is not set
 # CONFIG_VF610_ADC is not set
 # CONFIG_VF610_DAC is not set
-CONFIG_VFAT_FS=m
 CONFIG_VFIO=m
 # CONFIG_VFIO_IOMMU_TYPE1 is not set
 CONFIG_VFIO_NOIOMMU=y

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index ceed5e5fd462ce93a2b3ead18af37660f122311f..ab4f6785cfb96345bf6f516f95c3fcc379c2f5ea 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -241,7 +241,6 @@ CONFIG_ENCRYPTED_KEYS=m
 # CONFIG_EZX_PCAP is not set
 # CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
 # CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_FAT_FS=m
 # CONFIG_FB is not set
 # CONFIG_FDDI is not set
 # CONFIG_FEALNX is not set
@@ -991,7 +990,6 @@ CONFIG_UPROBES=y
 # CONFIG_USERFAULTFD is not set
 # CONFIG_USERIO is not set
 # CONFIG_VCNL4000 is not set
-CONFIG_VFAT_FS=m
 # CONFIG_VFIO is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set