2000-12-16 11:06:55

by Gunther.Mayer

[permalink] [raw]
Subject: Patch: test13-pre2 fails "make xconfig" in isdn/Config.in

Hi Linus,
apply this patch if like to fix this obvious error
with "make xconfig" on plain tree:
./tkparse < ../arch/i386/config.in >> kconfig.tk
drivers/isdn/Config.in: 98: can't handle dep_bool/dep_mbool/dep_tristate condition
make[1]: *** [kconfig.tk] Error 1
make[1]: Leaving directory `/usr/src/linux/scripts'

-
Gunther




--- linux/drivers/isdn/Config.in-240t13pre2-orig Sat Dec 16 12:20:59 2000
+++ linux/drivers/isdn/Config.in Sat Dec 16 12:21:48 2000
@@ -95,7 +95,7 @@
dep_bool ' Eicon PCI DIVA Server BRI/PRI/4BRI support' CONFIG_ISDN_DRV_EICON_PCI $CONFIG_PCI
bool ' Eicon S,SX,SCOM,Quadro,S2M support' CONFIG_ISDN_DRV_EICON_ISA
fi
- dep_tristate ' Build Eicon driver type standalone' CONFIG_ISDN_DRV_EICON_DIVAS
+ bool ' Build Eicon driver type standalone' CONFIG_ISDN_DRV_EICON_DIVAS
fi

# CAPI subsystem


2000-12-16 15:19:04

by Kai Germaschewski

[permalink] [raw]
Subject: Re: Patch: test13-pre2 fails "make xconfig" in isdn/Config.in

On Sat, 16 Dec 2000, Gunther Mayer wrote:

> apply this patch if like to fix this obvious error
> with "make xconfig" on plain tree:
> ./tkparse < ../arch/i386/config.in >> kconfig.tk
> drivers/isdn/Config.in: 98: can't handle dep_bool/dep_mbool/dep_tristate condition
> make[1]: *** [kconfig.tk] Error 1
> make[1]: Leaving directory `/usr/src/linux/scripts'
>
> --- linux/drivers/isdn/Config.in-240t13pre2-orig Sat Dec 16 12:20:59 2000
> +++ linux/drivers/isdn/Config.in Sat Dec 16 12:21:48 2000
> @@ -95,7 +95,7 @@
> dep_bool ' Eicon PCI DIVA Server BRI/PRI/4BRI support' CONFIG_ISDN_DRV_EICON_PCI $CONFIG_PCI
> bool ' Eicon S,SX,SCOM,Quadro,S2M support' CONFIG_ISDN_DRV_EICON_ISA
> fi
> - dep_tristate ' Build Eicon driver type standalone' CONFIG_ISDN_DRV_EICON_DIVAS
> + bool ' Build Eicon driver type standalone' CONFIG_ISDN_DRV_EICON_DIVAS
> fi
>
> # CAPI subsystem

Sorry, my bad. (Note to myself: Always test changes before submitting with
make menuconfig and make xconfig).

However, the correct fix is:

Only in linux-2.4.0-test13-pre2.work/: .menuconfig.log
diff -ur linux-2.4.0-test13-pre2/drivers/isdn/Config.in linux-2.4.0-test13-pre2.work/drivers/isdn/Config.in
--- linux-2.4.0-test13-pre2/drivers/isdn/Config.in Sat Dec 16 15:36:21 2000
+++ linux-2.4.0-test13-pre2.work/drivers/isdn/Config.in Sat Dec 16 15:39:47 2000
@@ -95,7 +95,7 @@
dep_bool ' Eicon PCI DIVA Server BRI/PRI/4BRI support' CONFIG_ISDN_DRV_EICON_PCI $CONFIG_PCI
bool ' Eicon S,SX,SCOM,Quadro,S2M support' CONFIG_ISDN_DRV_EICON_ISA
fi
- dep_tristate ' Build Eicon driver type standalone' CONFIG_ISDN_DRV_EICON_DIVAS
+ tristate ' Build Eicon driver type standalone' CONFIG_ISDN_DRV_EICON_DIVAS
fi

# CAPI subsystem

BTW: There's probably issues with ISDN built non-modular, because that
patch didn't have much testing yet. I'll go through different cases now.

--Kai


2000-12-16 23:50:28

by Armin Schindler

[permalink] [raw]
Subject: Re: Patch: test13-pre2 fails "make xconfig" in isdn/Config.in

On Sat, 16 Dec 2000, Gunther Mayer wrote:

This patch does not fix all problems in isdn/eicon.

A bigger patch is on the way.

Thanx,
Armin

> Hi Linus,
> apply this patch if like to fix this obvious error
> with "make xconfig" on plain tree:
> ./tkparse < ../arch/i386/config.in >> kconfig.tk
> drivers/isdn/Config.in: 98: can't handle dep_bool/dep_mbool/dep_tristate condition
> make[1]: *** [kconfig.tk] Error 1
> make[1]: Leaving directory `/usr/src/linux/scripts'
>
> -
> Gunther
>
>
>
>
> --- linux/drivers/isdn/Config.in-240t13pre2-orig Sat Dec 16 12:20:59 2000
> +++ linux/drivers/isdn/Config.in Sat Dec 16 12:21:48 2000
> @@ -95,7 +95,7 @@
> dep_bool ' Eicon PCI DIVA Server BRI/PRI/4BRI support' CONFIG_ISDN_DRV_EICON_PCI $CONFIG_PCI
> bool ' Eicon S,SX,SCOM,Quadro,S2M support' CONFIG_ISDN_DRV_EICON_ISA
> fi
> - dep_tristate ' Build Eicon driver type standalone' CONFIG_ISDN_DRV_EICON_DIVAS
> + bool ' Build Eicon driver type standalone' CONFIG_ISDN_DRV_EICON_DIVAS
> fi
>
> # CAPI subsystem
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> Please read the FAQ at http://www.tux.org/lkml/
>