STAGING fixes for 2.6.28

PATCH New Greg KH 3 participants 7 messages Nov 8, 2008 – Nov 11, 2008 Staging

lore

Share & tools

lore

Greg KH

author

2008-11-08 05:46 UTC #0 lore raw

PATCH 1/1 STAGING fixes for 2.6.28

Here are two small Kconfig staging patches against your 2.6 git tree.

They fix a Kconfig dependancy on the USB/IP drivers that Randy Dunlap found, and they add a second Kconfig option, which enables the staging drivers to be automatically excluded from a 'make allmodconfig' or 'make allyesconfig' build. This last patch will help out the -next tree a lot in its automatic build tests.

Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/staging-2.6.git/

Patches will be sent as a follow-on to this message to lkml for people to see.

thanks,

greg k-h

 drivers/staging/Kconfig       |   20 ++++++++++++++++++--
 drivers/staging/usbip/Kconfig |    2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

---------------

Greg Kroah-Hartman (2):
Staging: only build the tree if we really want to
Staging: make usbip depend on CONFIG_NET

Greg KH

author

2008-11-08 05:45 UTC #1 lore raw

PATCH 1/2 Staging: only build the tree if we really want to

From: Greg Kroah-Hartman <[email protected]>

This Kconfig change allows the common 'make allmodconfig' and 'make allyesconfig' build options to skip the staging tree, which is probably what you want to have happen anyway.

This makes the linux-next developer's life a lot easier so he doesn't have to worry about changes that break the staging tree, that's for me to worry about...

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 drivers/staging/Kconfig |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

drivers/staging/Kconfig +18 -2

index e1654f5..0a49cd7 100644
@@ -21,7 +21,23 @@ menuconfig STAGING
 
 	  If in doubt, say N here.
 
-if STAGING
+
+config STAGING_EXCLUDE_BUILD
+	bool "Exclude Staging drivers from being built"
+	default y
+	---help---
+	  Are you sure you really want to build the staging drivers?
+	  They taint your kernel, don't live up to the normal Linux
+	  kernel quality standards, are a bit crufty around the edges,
+	  and might go off and kick your dog when you aren't paying
+	  attention.
+
+	  Say N here to be able to select and build the Staging drivers.
+	  This option is primarily here to prevent them from being built
+	  when selecting 'make allyesconfg' and 'make allmodconfig' so
+	  don't be all that put off, your dog will be just fine.
+
+if !STAGING_EXCLUDE_BUILD
 
 source "drivers/staging/et131x/Kconfig"

@@ -45,4 +61,4 @@ source "drivers/staging/at76_usb/Kconfig"
 
 source "drivers/staging/poch/Kconfig"
 
-endif # STAGING
+endif # !STAGING_EXCLUDE_BUILD

Signature · 1 line

1.5.6

Stefan Richter

2008-11-08 15:59 UTC #2 lore raw

Re: [PATCH 1/2] Staging: only build the tree if we really want to

Quoted 12 lines · Greg KH

drivers/staging/Kconfig +5 -1

@@ -21,7 +21,23 @@ menuconfig STAGING
 
 	  If in doubt, say N here.
 
-if STAGING
+
+config STAGING_EXCLUDE_BUILD
+	bool "Exclude Staging drivers from being built"
+	default y
+	---help---

...

drivers/staging/Kconfig source "drivers/staging/at76_usb/Kconfig" · line 64

Quoted 10 lines

drivers/staging/Kconfig +2 -1

+if !STAGING_EXCLUDE_BUILD
 
 source "drivers/staging/et131x/Kconfig"

@@ -45,4 +61,4 @@ source "drivers/staging/at76_usb/Kconfig"
 
 source "drivers/staging/poch/Kconfig"
 
-endif # STAGING
+endif # !STAGING_EXCLUDE_BUILD

Which purpose is the STAGING kconfig variable serving after this? It controls the visibility of the menu, but switching it off won't switch off the staging drivers if they were previously enabled, would it?

Signature · 3 lines

Stefan Richter
-=====-==--- =-== -=---
http://arcgraph.de/sr/

Greg KH

2008-11-08 18:45 UTC #3 lore raw

Re: [PATCH 1/2] Staging: only build the tree if we really want to

Quoted 18 lines · Stefan Richter

Quoted 12 lines · Greg KH
drivers/staging/Kconfig +5 -1
@@ -21,7 +21,23 @@ menuconfig STAGING
 
 	  If in doubt, say N here.
 
-if STAGING
+
+config STAGING_EXCLUDE_BUILD
+	bool "Exclude Staging drivers from being built"
+	default y
+	---help---
...
Quoted 4 lines
+if !STAGING_EXCLUDE_BUILD
source "drivers/staging/et131x/Kconfig"

Quoted 8 lines

drivers/staging/Kconfig source "drivers/staging/at76_usb/Kconfig" · line 64
Quoted 6 lines
drivers/staging/Kconfig +1 -1
@@ -45,4 +61,4 @@ source "drivers/staging/at76_usb/Kconfig"
 
 source "drivers/staging/poch/Kconfig"
 
-endif # STAGING
+endif # !STAGING_EXCLUDE_BUILD
Which purpose is the STAGING kconfig variable serving after this?

Sitting there and looking pretty :)

Quoted 3 lines

It controls the visibility of the menu, but switching it off won't switch off the staging drivers if they were previously enabled, would it?

Try it and look in wonder :)

If something affects the visibility of the menu for those config options, it controls if those options can be enabled or not.

thanks,

greg k-h

Stefan Richter

2008-11-08 19:31 UTC #4 lore raw

Re: [PATCH 1/2] Staging: only build the tree if we really want to

Quoted 7 lines · Greg KH

Quoted 3 lines · Stefan Richter
drivers/staging/Kconfig source "drivers/staging/at76_usb/Kconfig" · line 64
Quoted 2 lines
drivers/staging/Kconfig +1 -1
-endif # STAGING
+endif # !STAGING_EXCLUDE_BUILD
Which purpose is the STAGING kconfig variable serving after this?
Sitting there and looking pretty :)

Quoted 8 lines

Quoted 3 lines
It controls the visibility of the menu, but switching it off won't switch off the staging drivers if they were previously enabled, would it?
Try it and look in wonder :)
If something affects the visibility of the menu for those config options, it controls if those options can be enabled or not.

Right. But if you had STAGING on, STAGING_EXCLUDE_BUILD off, and for example ET131X on, then ET131X will still be on if you switch STAGING off and save the configuration.

Signature · 3 lines

Stefan Richter
-=====-==--- =-== -=---
http://arcgraph.de/sr/

Greg KH

author

2008-11-11 06:35 UTC #5 lore raw

Re: [PATCH 1/2] Staging: only build the tree if we really want to

Quoted 12 lines · Stefan Richter

Quoted 11 lines · Greg KH
Quoted 3 lines · Stefan Richter
drivers/staging/Kconfig source "drivers/staging/at76_usb/Kconfig" · line 64
Quoted 2 lines
drivers/staging/Kconfig +1 -1
-endif # STAGING
+endif # !STAGING_EXCLUDE_BUILD
Which purpose is the STAGING kconfig variable serving after this?
Sitting there and looking pretty :)
Quoted 3 lines
It controls the visibility of the menu, but switching it off won't switch off the staging drivers if they were previously enabled, would it?

Quoted 8 lines

Quoted 4 lines
Try it and look in wonder :)
If something affects the visibility of the menu for those config options, it controls if those options can be enabled or not.
Right. But if you had STAGING on, STAGING_EXCLUDE_BUILD off, and for example ET131X on, then ET131X will still be on if you switch STAGING off and save the configuration.

I think Linus fixed this, look at 2.6.28-rc4.

thanks,

greg k-h

Greg KH

author

2008-11-08 05:46 UTC #6 lore raw

PATCH 2/2 Staging: make usbip depend on CONFIG_NET

In reply to Greg KH

From: Greg Kroah-Hartman <[email protected]>

Thanks to Randy Dunlap for finding this problem.

Reported-by Randy Dunlap <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 drivers/staging/usbip/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/staging/usbip/Kconfig +1 -1

index 7426235..217fb7e 100644
@@ -1,6 +1,6 @@
 config USB_IP_COMMON
 	tristate "USB IP support (EXPERIMENTAL)"
-	depends on USB && EXPERIMENTAL
+	depends on USB && NET && EXPERIMENTAL
 	default N
 	---help---
 	  This enables pushing USB packets over IP to allow remote

Signature · 1 line

1.5.6