[PATCH] UBUNTU: Disable unwanted staging builds

Stefan Bader stefan.bader at canonical.com
Wed Apr 22 18:12:35 BST 2009


If CONFIG_STAGING=y is set, the kernel build process will walk down
into the drivers/staging directory and might compile stuff we do not
want to. Subdirectories of staging are explicitely targetted in the
makefile in ubuntu/.
Modifying the ubuntu/Makefile to build those drivers we actually wanted
but have only been built because staging was active.

Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
---
 debian/config/amd64/config |    3 +--
 debian/config/i386/config  |    3 +--
 ubuntu/Makefile            |    6 ++++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 598e2a3..163fd98 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -2994,8 +2994,7 @@ CONFIG_SSFDC=m
 CONFIG_STACKTRACE=y
 CONFIG_STACKTRACE_SUPPORT=y
 # CONFIG_STACK_TRACER is not set
-CONFIG_STAGING=y
-CONFIG_STAGING_EXCLUDE_BUILD=y
+# CONFIG_STAGING is not set
 CONFIG_STALDRV=y
 CONFIG_STALLION=m
 # CONFIG_STANDALONE is not set
diff --git a/debian/config/i386/config b/debian/config/i386/config
index ae5c9e0..6940f6b 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -3227,8 +3227,7 @@ CONFIG_SSFDC=m
 CONFIG_STACKTRACE=y
 CONFIG_STACKTRACE_SUPPORT=y
 # CONFIG_STACK_TRACER is not set
-CONFIG_STAGING=y
-CONFIG_STAGING_EXCLUDE_BUILD=y
+# CONFIG_STAGING is not set
 CONFIG_STALDRV=y
 CONFIG_STALLION=m
 # CONFIG_STANDALONE is not set
diff --git a/ubuntu/Makefile b/ubuntu/Makefile
index 45b4c4c..4c6e4a6 100644
--- a/ubuntu/Makefile
+++ b/ubuntu/Makefile
@@ -18,8 +18,10 @@ obj-$(CONFIG_FS_UNIONFS)	+= unionfs/
 obj-$(CONFIG_LIRC_DEV)          += lirc/
 obj-$(CONFIG_GFS_FS)		+= gfs/
 obj-$(CONFIG_TLSUP)		+= tlsup/
-obj-$(CONFIG_RT2860)            += ../drivers/staging/rt2860
-obj-$(CONFIG_RT2870)            += ../drivers/staging/rt2870
+obj-$(CONFIG_RT2860)		+= ../drivers/staging/rt2860/
+obj-$(CONFIG_RT2870)		+= ../drivers/staging/rt2870/
+obj-$(CONFIG_RTL8187SE)		+= ../drivers/staging/rtl8187se/
+obj-$(CONFIG_USB_ATMEL)		+= ../drivers/staging/at76_usb/
 
 obj-m				+= misc/ rfkill/
 
-- 
1.5.4.3


--------------090202090805070301000304--



More information about the kernel-team mailing list