From c4e08ea7ed385af7a8ee0f3fee7dcac580fdad93 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Sat, 12 Apr 2008 18:27:38 +0000 Subject: [PATCH] Enable vfat and codepages as built-in for USB booting support for bug #193097. svn path=/trunk/; revision=514 --- releases/2008.0/ChangeLog | 7 ++ .../powerpc/installcd-pegasos-2.6.23.config | 8 +- .../installcd-ppc32apple-2.6.23.config | 10 +-- .../installcd-ppc64apple-2.6.23.config | 76 +++++++++---------- .../powerpc/livecd-ppc32apple-2.6.23.config | 10 +-- 5 files changed, 59 insertions(+), 52 deletions(-) diff --git a/releases/2008.0/ChangeLog b/releases/2008.0/ChangeLog index 062de59f..a123cd51 100644 --- a/releases/2008.0/ChangeLog +++ b/releases/2008.0/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 12 Apr 2008; Chris Gianelloni + kconfig/powerpc/installcd-ppc64apple-2.6.23.config, + kconfig/powerpc/installcd-pegasos-2.6.23.config, + kconfig/powerpc/livecd-ppc32apple-2.6.23.config, + kconfig/powerpc/installcd-ppc32apple-2.6.23.config: + Enable vfat and codepages as built-in for USB booting support for bug #193097. + 12 Apr 2008; Chris Gianelloni specs/amd64/installcd-stage2-minimal.spec, specs/x86/i686/livecd-stage2.spec, specs/x86/i686/livedvd-stage2.spec, diff --git a/releases/2008.0/kconfig/powerpc/installcd-pegasos-2.6.23.config b/releases/2008.0/kconfig/powerpc/installcd-pegasos-2.6.23.config index 78a3b27b..6bdeaa3c 100644 --- a/releases/2008.0/kconfig/powerpc/installcd-pegasos-2.6.23.config +++ b/releases/2008.0/kconfig/powerpc/installcd-pegasos-2.6.23.config @@ -1298,7 +1298,7 @@ CONFIG_UDF_NLS=y # CONFIG_FAT_FS=m CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m +CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_FS is not set @@ -1394,7 +1394,7 @@ CONFIG_BSD_DISKLABEL=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_737=m CONFIG_NLS_CODEPAGE_775=m CONFIG_NLS_CODEPAGE_850=m @@ -1418,7 +1418,7 @@ CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_2=m CONFIG_NLS_ISO8859_3=m CONFIG_NLS_ISO8859_4=m @@ -1431,7 +1431,7 @@ CONFIG_NLS_ISO8859_14=m CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m +CONFIG_NLS_UTF8=y # # Distributed Lock Manager diff --git a/releases/2008.0/kconfig/powerpc/installcd-ppc32apple-2.6.23.config b/releases/2008.0/kconfig/powerpc/installcd-ppc32apple-2.6.23.config index f23277db..06d6cd3b 100644 --- a/releases/2008.0/kconfig/powerpc/installcd-ppc32apple-2.6.23.config +++ b/releases/2008.0/kconfig/powerpc/installcd-ppc32apple-2.6.23.config @@ -1553,9 +1553,9 @@ CONFIG_UDF_NLS=y # CONFIG_FAT_FS=m CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m +CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-15" +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" CONFIG_NTFS_FS=m # CONFIG_NTFS_DEBUG is not set # CONFIG_NTFS_RW is not set @@ -1652,7 +1652,7 @@ CONFIG_BSD_DISKLABEL=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_737=m CONFIG_NLS_CODEPAGE_775=m CONFIG_NLS_CODEPAGE_850=m @@ -1676,7 +1676,7 @@ CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_2=m CONFIG_NLS_ISO8859_3=m CONFIG_NLS_ISO8859_4=m @@ -1689,7 +1689,7 @@ CONFIG_NLS_ISO8859_14=m CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m +CONFIG_NLS_UTF8=y # # Distributed Lock Manager diff --git a/releases/2008.0/kconfig/powerpc/installcd-ppc64apple-2.6.23.config b/releases/2008.0/kconfig/powerpc/installcd-ppc64apple-2.6.23.config index ac25f7c9..cb11ba75 100644 --- a/releases/2008.0/kconfig/powerpc/installcd-ppc64apple-2.6.23.config +++ b/releases/2008.0/kconfig/powerpc/installcd-ppc64apple-2.6.23.config @@ -1442,12 +1442,12 @@ CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems # -CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=y +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=y +CONFIG_NTFS_FS=m # CONFIG_NTFS_DEBUG is not set # CONFIG_NTFS_RW is not set @@ -1547,42 +1547,42 @@ CONFIG_MSDOS_PARTITION=y CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=y -CONFIG_NLS_CODEPAGE_775=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_CODEPAGE_852=y -CONFIG_NLS_CODEPAGE_855=y -CONFIG_NLS_CODEPAGE_857=y -CONFIG_NLS_CODEPAGE_860=y -CONFIG_NLS_CODEPAGE_861=y -CONFIG_NLS_CODEPAGE_862=y -CONFIG_NLS_CODEPAGE_863=y -CONFIG_NLS_CODEPAGE_864=y -CONFIG_NLS_CODEPAGE_865=y -CONFIG_NLS_CODEPAGE_866=y -CONFIG_NLS_CODEPAGE_869=y -CONFIG_NLS_CODEPAGE_936=y -CONFIG_NLS_CODEPAGE_950=y -CONFIG_NLS_CODEPAGE_932=y -CONFIG_NLS_CODEPAGE_949=y -CONFIG_NLS_CODEPAGE_874=y -CONFIG_NLS_ISO8859_8=y -CONFIG_NLS_CODEPAGE_1250=y -CONFIG_NLS_CODEPAGE_1251=y -CONFIG_NLS_ASCII=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y -CONFIG_NLS_ISO8859_3=y -CONFIG_NLS_ISO8859_4=y -CONFIG_NLS_ISO8859_5=y -CONFIG_NLS_ISO8859_6=y -CONFIG_NLS_ISO8859_7=y -CONFIG_NLS_ISO8859_9=y -CONFIG_NLS_ISO8859_13=y -CONFIG_NLS_ISO8859_14=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_KOI8_R=y -CONFIG_NLS_KOI8_U=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m CONFIG_NLS_UTF8=y # diff --git a/releases/2008.0/kconfig/powerpc/livecd-ppc32apple-2.6.23.config b/releases/2008.0/kconfig/powerpc/livecd-ppc32apple-2.6.23.config index d74faafb..9cf960dd 100644 --- a/releases/2008.0/kconfig/powerpc/livecd-ppc32apple-2.6.23.config +++ b/releases/2008.0/kconfig/powerpc/livecd-ppc32apple-2.6.23.config @@ -2109,9 +2109,9 @@ CONFIG_UDF_NLS=y # CONFIG_FAT_FS=m CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m +CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-15" +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" CONFIG_NTFS_FS=m # CONFIG_NTFS_DEBUG is not set # CONFIG_NTFS_RW is not set @@ -2216,7 +2216,7 @@ CONFIG_BSD_DISKLABEL=y # CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_737=m CONFIG_NLS_CODEPAGE_775=m CONFIG_NLS_CODEPAGE_850=m @@ -2240,7 +2240,7 @@ CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_1=y CONFIG_NLS_ISO8859_2=m CONFIG_NLS_ISO8859_3=m CONFIG_NLS_ISO8859_4=m @@ -2253,7 +2253,7 @@ CONFIG_NLS_ISO8859_14=m CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m +CONFIG_NLS_UTF8=y # # Distributed Lock Manager