lkml.org 
[lkml]   [1998]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patches in this message
/
Date
From
SubjectConfiguration patch
Hi Alan.

As you're already aware, Menuconfig has been patched such that the bug
in it relating to undefined configuration options has been fixed.
Since neither the "make config" or "make xconfig" scripts suffered
from any suchlike bug, I feel that the said problem can safely be
described as fixed.

Given that, I would like to submit the enclosed Config.diff patch
against the 2.1.131ac13 source tree, which simplifies the conditions
used on several of the lines, thus making them easier to follow.

I will note in relation to the above that until the Menuconfig bug was
fixed, one of the conditions in the config tree was in fact being
misinterpreted by "make menuconfig". The one in question is the second
hunk of this patch, where the simplified version would have been
correctly interpreted by "make menuconfig" but the original version
would not...

In addition, I would like to submit the enclosed UMSDOS.diff patch,
also against the 2.1.131ac13 source tree, which corrects what I regard
as a bug therein, which is that it is possible to select the UMSDOS
file system without also selecting the MSDOS file system upon which
the former depends...

Best wishes from Riley.
--- linux/arch/m68k/config.in.orig Sun Dec 20 15:42:42 1998
+++ linux/arch/m68k/config.in Sun Dec 20 15:53:14 1998
@@ -267,11 +267,11 @@
bool 'Mac ADB mouse support' CONFIG_ADBMOUSE
fi
if [ "$CONFIG_ATARI" = "y" ]; then
tristate 'Atari MFP serial support' CONFIG_ATARI_MFPSER
tristate 'Atari SCC serial support' CONFIG_ATARI_SCC
- if [ "$CONFIG_ATARI_SCC" = "y" -o "$CONFIG_ATARI_SCC" = "m" ]; then
+ if [ "$CONFIG_ATARI_SCC" != "n" ]; then
bool 'Atari SCC serial DMA support' CONFIG_ATARI_SCC_DMA
fi
tristate 'Atari MIDI serial support' CONFIG_ATARI_MIDI
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
tristate 'Atari DSP56k support (EXPERIMENTAL)' CONFIG_ATARI_DSP56K
--- linux/drivers/block/Config.in.orig Sun Dec 20 15:44:03 1998
+++ linux/drivers/block/Config.in Sun Dec 20 16:07:12 1998
@@ -115,17 +115,17 @@

# PARIDE doesn't need PARPORT, but if PARPORT is configured as a module,
# PARIDE must also be a module. The bogus CONFIG_PARIDE_PARPORT option
# controls the choices given to the user ...

-if [ "$CONFIG_PARPORT" = "y" -o "$CONFIG_PARPORT" = "n" ] ; then
+if [ "$CONFIG_PARPORT" != "m" ]; then
define_bool CONFIG_PARIDE_PARPORT y
else
define_bool CONFIG_PARIDE_PARPORT m
fi
dep_tristate 'Parallel port IDE device support' CONFIG_PARIDE $CONFIG_PARIDE_PARPORT
-if [ "$CONFIG_PARIDE" = "y" -o "$CONFIG_PARIDE" = "m" ]; then
+if [ "$CONFIG_PARIDE" != "n" ]; then
source drivers/block/paride/Config.in
fi

if [ "$CONFIG_BLK_DEV_HD_IDE" = "y" -o "$CONFIG_BLK_DEV_HD_ONLY" = "y" ]; then
define_bool CONFIG_BLK_DEV_HD y
--- linux/drivers/sound/Config.in.orig Sun Dec 20 15:42:59 1998
+++ linux/drivers/sound/Config.in Sun Dec 20 16:10:16 1998
@@ -23,11 +23,11 @@
fi
dep_tristate 'S3 SonicVibes' CONFIG_SOUND_SONICVIBES $CONFIG_SOUND
fi

dep_tristate 'Support for Turtle Beach MultiSound Classic, Tahiti, Monterey' CONFIG_SOUND_MSNDCLAS $CONFIG_SOUND
-if [ "$CONFIG_SOUND_MSNDCLAS" = "y" -o "$CONFIG_SOUND_MSNDCLAS" = "m" ]; then
+if [ "$CONFIG_SOUND_MSNDCLAS" != "n" ]; then
if [ "$CONFIG_SOUND_MSNDCLAS" = "y" ]; then
comment 'Compiled-in MSND Classic support requires firmware during compilation.'
define_bool CONFIG_MSNDCLAS_HAVE_BOOT y
else
define_bool CONFIG_MSNDCLAS_HAVE_BOOT n
@@ -40,11 +40,11 @@
hex 'MSND Classic memory B0000,C8000,D0000,D8000,E0000,E8000' CONFIG_MSNDCLAS_MEM D0000
hex 'MSND Classic I/O 210,220,230,240,250,260,290,3E0' CONFIG_MSNDCLAS_IO 290
fi

dep_tristate 'Support for Turtle Beach MultiSound Pinnacle, Fiji' CONFIG_SOUND_MSNDPIN $CONFIG_SOUND
-if [ "$CONFIG_SOUND_MSNDPIN" = "y" -o "$CONFIG_SOUND_MSNDPIN" = "m" ]; then
+if [ "$CONFIG_SOUND_MSNDPIN" != "n" ]; then
if [ "$CONFIG_SOUND_MSNDPIN" = "y" ]; then
comment 'Compiled-in MSND Pinnacle support requires firmware during compilation.'
define_bool CONFIG_MSNDPIN_HAVE_BOOT y
else
define_bool CONFIG_MSNDPIN_HAVE_BOOT n
@@ -74,11 +74,11 @@
int 'MSND buffer size (kB)' CONFIG_MSND_FIFOSIZE 128
fi

dep_tristate 'OSS sound modules' CONFIG_SOUND_OSS $CONFIG_SOUND

-if [ "$CONFIG_SOUND_OSS" = "y" -o "$CONFIG_SOUND_OSS" = "m" ]; then
+if [ "$CONFIG_SOUND_OSS" != "n" ]; then
dep_tristate 'ProAudioSpectrum 16 support' CONFIG_SOUND_PAS $CONFIG_SOUND_OSS
if [ "$CONFIG_SOUND_PAS" = "y" ]; then
int 'PAS16 IRQ 3, 4, 5, 7, 9, 10, 11, 12, 14 or 15' CONFIG_PAS_IRQ 10
int 'PAS16 DMA 0, 1, 3, 5, 6 or 7' CONFIG_PAS_DMA 3
bool 'Enable PAS16 joystick port' CONFIG_PAS_JOYSTICK
@@ -97,11 +97,11 @@
fi

dep_tristate 'Generic OPL2/OPL3 FM synthesizer support' CONFIG_SOUND_ADLIB $CONFIG_SOUND_OSS

dep_tristate 'Gravis Ultrasound support' CONFIG_SOUND_GUS $CONFIG_SOUND_OSS
- if [ "$CONFIG_SOUND_GUS" = "y" -o "$CONFIG_SOUND_GUS" = "m" ]; then
+ if [ "$CONFIG_SOUND_GUS" != "n" ]; then
bool '16 bit sampling option of GUS (_NOT_ GUS MAX)' CONFIG_GUS16
bool 'GUS MAX support' CONFIG_GUSMAX
fi
if [ "$CONFIG_SOUND_GUS" = "y" ]; then
hex 'I/O base for GUS 210, 220, 230, 240, 250 or 260' CONFIG_GUS_BASE 220
@@ -132,11 +132,11 @@
bool ' Have DSPxxx.LD firmware file' CONFIG_PSS_HAVE_BOOT
if [ "$CONFIG_PSS_HAVE_BOOT" = "y" ]; then
string ' Full pathname of DSPxxx.LD firmware file' CONFIG_PSS_BOOT_FILE
fi
fi
- if [ "$CONFIG_SOUND_PSS" = "y" -o "$CONFIG_SOUND_PSS" = "m" ]; then
+ if [ "$CONFIG_SOUND_PSS" != "n" ];
bool ' Enable PSS mixer (Beethoven ADSP-16 and other compatibile)' CONFIG_PSS_MIXER
fi

dep_tristate 'Microsoft Sound System support' CONFIG_SOUND_MSS $CONFIG_SOUND_OSS
if [ "$CONFIG_SOUND_MSS" = "y" ]; then
@@ -171,11 +171,11 @@
string ' Full pathname of TRXPRO.HEX firmware file' CONFIG_TRIX_BOOT_FILE
fi
fi

dep_tristate 'Support for OPTi MAD16 and/or Mozart based cards' CONFIG_SOUND_MAD16 $CONFIG_SOUND_OSS
- if [ "$CONFIG_SOUND_MAD16" = "y" -o "$CONFIG_SOUND_MAD16" = "m" ]; then
+ if [ "$CONFIG_SOUND_MAD16" != "n" ]; then
bool 'Support MIDI in older MAD16 based cards (requires SB)' CONFIG_MAD16_OLDCARD
fi
if [ "$CONFIG_SOUND_MAD16" = "y" ]; then
hex 'MAD16 audio I/O base 530, 604, E80 or F40' CONFIG_MAD16_BASE 530
int 'MAD16 audio IRQ 7, 9, 10 or 11' CONFIG_MAD16_IRQ 11
--- linux/drivers/sound/lowlevel/Config.in.orig Sun Jun 7 18:37:41 1998
+++ linux/drivers/sound/lowlevel/Config.in Sun Dec 20 16:12:04 1998
@@ -1,26 +1,26 @@
dep_tristate 'ACI mixer (miroPCM12)' CONFIG_ACI_MIXER $CONFIG_SOUND_OSS

dep_tristate 'AWE32 synth' CONFIG_AWE32_SYNTH $CONFIG_SOUND_OSS

-if [ "$CONFIG_SOUND_OSS" = "y" -o "$CONFIG_SOUND" = "m" ]; then
+if [ "$CONFIG_SOUND_OSS" != "n" ]; then
dep_tristate 'Gallant Audio Cards (SC-6000 and SC-6600 based)' CONFIG_AEDSP16 $CONFIG_SOUND_OSS
- if [ "$CONFIG_AEDSP16" = "y" -o "$CONFIG_AEDSP16" = "m" ]; then
+ if [ "$CONFIG_AEDSP16" != "n" ]; then
hex ' I/O base for Audio Excel DSP 16 220 or 240' CONFIG_AEDSP16_BASE 220
fi

- if [ "$CONFIG_AEDSP16" = "y" -o "$CONFIG_AEDSP16" = "m" ]; then
+ if [ "$CONFIG_AEDSP16" != "n" ]; then
comment 'SC-6600 Audio Cards have no jumper switches at all'
bool 'SC-6600 based audio cards (new Audio Excel DSP 16)' CONFIG_SC6600
if [ "$CONFIG_SC6600" = "y" ]; then
comment 'SC-6600 specific configuration'
bool 'Activate SC-6600 Joystick Interface' CONFIG_SC6600_JOY
int 'SC-6600 CDROM Interface (4=None, 3=IDE, 1=Panasonic, 0=?Sony?)' CONFIG_SC6600_CDROM 4
hex 'SC-6600 CDROM Interface I/O Address' CONFIG_SC6600_CDROMBASE 0
fi

- if [ "$CONFIG_SOUND_SB" = "y" -o "$CONFIG_SOUND_SB" = "m" ]; then
+ if [ "$CONFIG_SOUND_SB" != "n" ]; then
if [ "$CONFIG_AEDSP16_MSS" != "y" ]; then
bool 'Audio Excel DSP 16 (SBPro emulation)' CONFIG_AEDSP16_SBPRO
if [ "$CONFIG_AEDSP16_SBPRO" = "y" ]; then
comment 'Audio Excel DSP 16 [Sound Blaster Pro]'
hex 'I/O base for Audio Excel DSP 16 220, 240' CONFIG_AEDSP16_BASE $CONFIG_SB_BASE
@@ -28,11 +28,11 @@
int 'Audio Excel DSP 16 DMA 0, 1 or 3' CONFIG_AEDSP16_SB_DMA $CONFIG_SB_DMA
fi
fi
fi

- if [ "$CONFIG_SOUND_MSS" = "y" -o "$CONFIG_SOUND_MSS" = "m" ]; then
+ if [ "$CONFIG_SOUND_MSS" != "n" ]; then
if [ "$CONFIG_AEDSP16_SBPRO" != "y" ]; then
bool 'Audio Excel DSP 16 (MSS emulation)' CONFIG_AEDSP16_MSS
if [ "$CONFIG_AEDSP16_MSS" = "y" ]; then
comment 'Audio Excel DSP 16 [Microsoft Sound System]'
hex 'I/O base for Audio Excel DSP 16 220 or 240' CONFIG_AEDSP16_BASE 220
@@ -40,11 +40,11 @@
int 'Audio Excel DSP 16 DMA 0, 1 or 3' CONFIG_AEDSP16_MSS_DMA $CONFIG_MSS_DMA
fi
fi
fi

- if [ "$CONFIG_SOUND_MPU401" = "y" -o "$CONFIG_SOUND_MPU401" = "m" ]; then
+ if [ "$CONFIG_SOUND_MPU401" != "n" ]; then
bool 'Audio Excel DSP 16 (MPU401 emulation)' CONFIG_AEDSP16_MPU401
if [ "$CONFIG_AEDSP16_MPU401" = "y" ]; then
comment 'Audio Excel DSP 16 [MPU-401]'
if [ "$CONFIG_AEDSP16_SBPRO" != "y" -a "$CONFIG_AEDSP16_MSS" != "y" ]; then
hex 'I/O base for Audio Excel DSP 16 220 or 240' CONFIG_AEDSP16_BASE 220--- linux/fs/Config.in.orig Sun Dec 20 15:44:03 1998
+++ linux/fs/Config.in Sun Dec 20 16:19:14 1998
@@ -17,7 +17,11 @@
# msdos filesystems
tristate 'DOS FAT fs support' CONFIG_FAT_FS
+if [ "$CONFIG_FAT_FS" != "n" ]; then
-dep_tristate 'MSDOS fs support' CONFIG_MSDOS_FS $CONFIG_FAT_FS
+ dep_tristate 'MSDOS fs support' CONFIG_MSDOS_FS $CONFIG_FAT_FS
+ if [ "$CONFIG_MSDOS_FS" != "n" ]; then
-dep_tristate 'UMSDOS: Unix-like filesystem on top of standard MSDOS filesystem' CONFIG_UMSDOS_FS $CONFIG_MSDOS_FS
+ dep_tristate 'UMSDOS: Unix-like filesystem on top of standard MSDOS filesystem' CONFIG_UMSDOS_FS $CONFIG_MSDOS_FS
+ fi
-dep_tristate 'VFAT (Windows-95) fs support' CONFIG_VFAT_FS $CONFIG_FAT_FS
+ dep_tristate 'VFAT (Windows-95) fs support' CONFIG_VFAT_FS $CONFIG_FAT_FS
+fi

bool '/proc filesystem support' CONFIG_PROC_FS
\
 
 \ /
  Last update: 2005-03-22 13:46    [W:0.056 / U:0.288 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site