2003-06-26 17:55:29

by Matthew Wilcox

[permalink] [raw]
Subject: [PATCH] BINFMT_ZFLAT can't be a module


BINFMT_ZFLAT is an attribute of BINFMT_FLAT not a distinct option in
its own right. So the test in lib/Kconfig has to be changed to something
like this:

Index: lib/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/lib/Kconfig,v
retrieving revision 1.4
diff -u -p -r1.4 Kconfig
--- lib/Kconfig 8 Apr 2003 15:20:57 -0000 1.4
+++ lib/Kconfig 26 Jun 2003 18:07:41 -0000
@@ -17,8 +17,8 @@ config CRC32
#
config ZLIB_INFLATE
tristate
- default y if CRAMFS=y || PPP_DEFLATE=y || JFFS2_FS=y || ZISOFS_FS=y || BINFMT_ZFLAT=y || CRYPTO_DEFLATE=y
- default m if CRAMFS=m || PPP_DEFLATE=m || JFFS2_FS=m || ZISOFS_FS=m || BINFMT_ZFLAT=m || CRYPTO_DEFLATE=m
+ default y if CRAMFS=y || PPP_DEFLATE=y || JFFS2_FS=y || ZISOFS_FS=y || CRYPTO_DEFLATE=y || (BINFMT_FLAT=y && BINFMT_ZFLAT=y)
+ default m if CRAMFS=m || PPP_DEFLATE=m || JFFS2_FS=m || ZISOFS_FS=m || CRYPTO_DEFLATE=m || (BINFMT_FLAT=m && BINFMT_ZFLAT=y)

config ZLIB_DEFLATE
tristate

--
"It's not Hollywood. War is real, war is primarily not about defeat or
victory, it is about death. I've seen thousands and thousands of dead bodies.
Do you think I want to have an academic debate on this subject?" -- Robert Fisk


2003-06-26 18:25:58

by Roman Zippel

[permalink] [raw]
Subject: Re: [PATCH] BINFMT_ZFLAT can't be a module

Hi,

On Thu, 26 Jun 2003, Matthew Wilcox wrote:

> BINFMT_ZFLAT is an attribute of BINFMT_FLAT not a distinct option in
> its own right. So the test in lib/Kconfig has to be changed to something
> like this:
>
> Index: lib/Kconfig
> ===================================================================
> RCS file: /var/cvs/linux-2.5/lib/Kconfig,v
> retrieving revision 1.4
> diff -u -p -r1.4 Kconfig
> --- lib/Kconfig 8 Apr 2003 15:20:57 -0000 1.4
> +++ lib/Kconfig 26 Jun 2003 18:07:41 -0000
> @@ -17,8 +17,8 @@ config CRC32
> #
> config ZLIB_INFLATE
> tristate
> - default y if CRAMFS=y || PPP_DEFLATE=y || JFFS2_FS=y || ZISOFS_FS=y || BINFMT_ZFLAT=y || CRYPTO_DEFLATE=y
> - default m if CRAMFS=m || PPP_DEFLATE=m || JFFS2_FS=m || ZISOFS_FS=m || BINFMT_ZFLAT=m || CRYPTO_DEFLATE=m
> + default y if CRAMFS=y || PPP_DEFLATE=y || JFFS2_FS=y || ZISOFS_FS=y || CRYPTO_DEFLATE=y || (BINFMT_FLAT=y && BINFMT_ZFLAT=y)
> + default m if CRAMFS=m || PPP_DEFLATE=m || JFFS2_FS=m || ZISOFS_FS=m || CRYPTO_DEFLATE=m || (BINFMT_FLAT=m && BINFMT_ZFLAT=y)

This can be simplified now to:

config ZLIB_INFLATE
def_tristate CRAMFS || PPP_DEFLATE || JFFS2_FS || \
ZISOFS_FS || CRYPTO_DEFLATE || \
(BINFMT_FLAT && BINFMT_ZFLAT)

bye, Roman

2003-06-26 18:42:54

by Matthew Wilcox

[permalink] [raw]
Subject: Re: [PATCH] BINFMT_ZFLAT can't be a module

On Thu, Jun 26, 2003 at 08:40:05PM +0200, Roman Zippel wrote:
> > - default y if CRAMFS=y || PPP_DEFLATE=y || JFFS2_FS=y || ZISOFS_FS=y || BINFMT_ZFLAT=y || CRYPTO_DEFLATE=y
> > - default m if CRAMFS=m || PPP_DEFLATE=m || JFFS2_FS=m || ZISOFS_FS=m || BINFMT_ZFLAT=m || CRYPTO_DEFLATE=m
> > + default y if CRAMFS=y || PPP_DEFLATE=y || JFFS2_FS=y || ZISOFS_FS=y || CRYPTO_DEFLATE=y || (BINFMT_FLAT=y && BINFMT_ZFLAT=y)
> > + default m if CRAMFS=m || PPP_DEFLATE=m || JFFS2_FS=m || ZISOFS_FS=m || CRYPTO_DEFLATE=m || (BINFMT_FLAT=m && BINFMT_ZFLAT=y)
>
> This can be simplified now to:
>
> config ZLIB_INFLATE
> def_tristate CRAMFS || PPP_DEFLATE || JFFS2_FS || \
> ZISOFS_FS || CRYPTO_DEFLATE || \
> (BINFMT_FLAT && BINFMT_ZFLAT)

Could you document this in Documentation/kbuild/kconfig-language.txt
please? The thing is, I'm not sure it'll work, and it's hard to convince
myself without docs.

Here's what I want:

CRAMFS FLAT ZFLAT outcome
Y Y Y Y
Y Y N Y
Y M Y Y
Y M N Y
Y N - Y

M Y Y Y
M Y N M (*)
M M Y M
M M N M
M N - M

N Y Y Y
N Y N N
N M Y M
N M N N
N N - N

Does dep_tristate give me that? Particularly the one with a (*) by it.

--
"It's not Hollywood. War is real, war is primarily not about defeat or
victory, it is about death. I've seen thousands and thousands of dead bodies.
Do you think I want to have an academic debate on this subject?" -- Robert Fisk

2003-06-26 18:59:39

by Roman Zippel

[permalink] [raw]
Subject: Re: [PATCH] BINFMT_ZFLAT can't be a module

Hi,

On Thu, 26 Jun 2003, Matthew Wilcox wrote:

> > config ZLIB_INFLATE
> > def_tristate CRAMFS || PPP_DEFLATE || JFFS2_FS || \
> > ZISOFS_FS || CRYPTO_DEFLATE || \
> > (BINFMT_FLAT && BINFMT_ZFLAT)
>
> Could you document this in Documentation/kbuild/kconfig-language.txt
> please?

Expressions are documented and 'def_tristate ...' is short for 'tristate'
and 'default ...'

> Does dep_tristate give me that? Particularly the one with a (*) by it.

Yes.

bye, Roman

2003-06-27 10:37:19

by Juan Quintela

[permalink] [raw]
Subject: Re: [PATCH] BINFMT_ZFLAT can't be a module

>>>>> "roman" == Roman Zippel <[email protected]> writes:

Hi

roman> Expressions are documented and 'def_tristate ...' is short for 'tristate'
roman> and 'default ...'

/me wonders if default_tristate or tristate_default will not be better
(it looks confusing with define_tristate).

Later, Juan.

--
In theory, practice and theory are the same, but in practice they
are different -- Larry McVoy