2.4.5-ac20 problems with drivers/net/Config.in and make xconfig

2.4.5-ac20 problems with drivers/net/Config.in and make xconfig

[Steven Cole]

I got this familiar error with make xconfig and 2.4.5-ac20 (same as 2.4.6-pre6)

drivers/net/Config.in: 149: can't handle dep_bool/dep_mbool/dep_tristate condition
make[1]: *** [kconfig.tk] Error 1
make[1]: Leaving directory `/usr/src/linux-2.4.5-ac20/scripts'
make: *** [xconfig] Error 2

I applied this patch written by Keith Owens (thanks Keith):

--- linux/drivers/net/Config.in.original	Thu Jun 28 09:52:02 2001
+++ linux/drivers/net/Config.in	Thu Jun 28 09:52:25 2001
@@ -146,7 +146,11 @@
       tristate '  NE/2 (ne2000 MCA version) support' CONFIG_NE2_MCA
       tristate '  IBM LAN Adapter/A support' CONFIG_IBMLANA
    fi
-   dep_bool '  EISA, VLB, PCI and on board controllers' CONFIG_NET_PCI
+   if [ "$CONFIG_ISA" = "y" -o "$CONFIG_EISA" = "y" -o "$CONFIG_PCI" = "y" ]; then
+     bool '  EISA, VLB, PCI and on board controllers' CONFIG_NET_PCI
+   else
+     define_bool CONFIG_NET_PCI n
+   fi
    if [ "$CONFIG_NET_PCI" = "y" ]; then
       dep_tristate '    AMD PCnet32 PCI support' CONFIG_PCNET32 $CONFIG_PCI
       dep_tristate '    Adaptec Starfire support (EXPERIMENTAL)' CONFIG_ADAPTEC_STARFIRE $CONFIG_PCI $CONFIG_EXPERIMENTAL

And then I got:

[root@spc linux]# make xconfig
rm -f include/asm
( cd include ; ln -sf asm-i386 asm)
make -C scripts kconfig.tk
make[1]: Entering directory `/usr/src/linux-2.4.5-ac20/scripts'
cat header.tk >> ./kconfig.tk
./tkparse < ../arch/i386/config.in >> kconfig.tk
make[1]: *** [kconfig.tk] Error 139
make[1]: Leaving directory `/usr/src/linux-2.4.5-ac20/scripts'
make: *** [xconfig] Error 2

So, I used the old reliable make menuconfig, and it worked OK and 
2.4.5-ac20 built successfully.

Steven

Re: 2.4.5-ac20 problems with drivers/net/Config.in and make xconfig

[Keith Owens]

On Thu, 28 Jun 2001 10:05:58 -0600, 
Steven Cole <scole@lanl.gov> wrote:
>[root@spc linux]# make xconfig
>./tkparse < ../arch/i386/config.in >> kconfig.tk
>make[1]: *** [kconfig.tk] Error 139
>make[1]: Leaving directory `/usr/src/linux-2.4.5-ac20/scripts'

Sigh.  I wish people making big changes to config files would check
that the change works for all the variants of make *config.

Index: 5.52/drivers/net/Config.in
--- 5.52/drivers/net/Config.in Fri, 29 Jun 2001 11:39:55 +1000 kaos (linux-2.4/l/c/9_Config.in 1.1.2.2.1.4.1.12 644)
+++ 5.52(w)/drivers/net/Config.in Fri, 29 Jun 2001 12:14:23 +1000 kaos (linux-2.4/l/c/9_Config.in 1.1.2.2.1.4.1.12 644)
@@ -16,7 +16,7 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; the
 fi
 
 if [ "$CONFIG_ISAPNP" = "y" ]; then
-   tristate 'General Instruments Surfboard 1000' CONFIG_NET_SB1000 $CONFIG_ISAPNP
+   tristate 'General Instruments Surfboard 1000' CONFIG_NET_SB1000
 fi
 
 #
@@ -204,7 +204,6 @@ bool 'Ethernet (10 or 100Mbit)' CONFIG_N
       dep_tristate '    D-Link DE600 pocket adapter support' CONFIG_DE600 $CONFIG_ISA
       dep_tristate '    D-Link DE620 pocket adapter support' CONFIG_DE620 $CONFIG_ISA
    fi
-fi
 
 endmenu
 

Re: 2.4.5-ac20 problems with drivers/net/Config.in and make xconfig

[Steven Cole]

On Thursday 28 June 2001 20:18, Keith Owens wrote:
> On Thu, 28 Jun 2001 10:05:58 -0600,
>
> Steven Cole <scole@lanl.gov> wrote:
> >[root@spc linux]# make xconfig
> >./tkparse < ../arch/i386/config.in >> kconfig.tk
> >make[1]: *** [kconfig.tk] Error 139
> >make[1]: Leaving directory `/usr/src/linux-2.4.5-ac20/scripts'
>
> Sigh.  I wish people making big changes to config files would check
> that the change works for all the variants of make *config.
>
> Index: 5.52/drivers/net/Config.in
> --- 5.52/drivers/net/Config.in Fri, 29 Jun 2001 11:39:55 +1000 kaos
> (linux-2.4/l/c/9_Config.in 1.1.2.2.1.4.1.12 644) +++
> 5.52(w)/drivers/net/Config.in Fri, 29 Jun 2001 12:14:23 +1000 kaos
> (linux-2.4/l/c/9_Config.in 1.1.2.2.1.4.1.12 644) @@ -16,7 +16,7 @@ if [
> "$CONFIG_EXPERIMENTAL" = "y" ]; the
>  fi
>
>  if [ "$CONFIG_ISAPNP" = "y" ]; then
> -   tristate 'General Instruments Surfboard 1000' CONFIG_NET_SB1000
> $CONFIG_ISAPNP +   tristate 'General Instruments Surfboard 1000'
> CONFIG_NET_SB1000 fi
>
>  #
> @@ -204,7 +204,6 @@ bool 'Ethernet (10 or 100Mbit)' CONFIG_N
>        dep_tristate '    D-Link DE600 pocket adapter support' CONFIG_DE600
> $CONFIG_ISA dep_tristate '    D-Link DE620 pocket adapter support'
> CONFIG_DE620 $CONFIG_ISA fi
> -fi
>
>  endmenu

Here is a variant of Keith's patch.  The free-floating "fi" at line 207 was the result
of a deleted line "if [ "$CONFIG_NET_ETHERNET" = "y" ]; then".  The indentation
was the major clue.  This patch was made against 2.4.5-ac21.
Steven

--- linux/drivers/net/Config.in.original        Fri Jun 29 07:17:57 2001
+++ linux/drivers/net/Config.in Fri Jun 29 07:23:02 2001
@@ -16,7 +16,7 @@
 fi
 
 if [ "$CONFIG_ISAPNP" = "y" ]; then
-   tristate 'General Instruments Surfboard 1000' CONFIG_NET_SB1000 $CONFIG_ISAPNP
+   tristate 'General Instruments Surfboard 1000' CONFIG_NET_SB1000
 fi
 
 #
@@ -27,6 +27,7 @@
 comment 'Ethernet (10 or 100Mbit)'
 
 bool 'Ethernet (10 or 100Mbit)' CONFIG_NET_ETHERNET
+if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
    if [ "$CONFIG_ARM" = "y" ]; then  
       dep_bool '  ARM EBSA110 AM79C961A support' CONFIG_ARM_AM79C961A $CONFIG_ARCH_EBSA110
       if [ "$CONFIG_ARCH_ACORN" = "y" ]; then