disable alsa and openswan on brcm-2.6

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2321 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/target/linux/package/Makefile b/openwrt/target/linux/package/Makefile
index db63d4f..a3d06b7 100644 (file)
--- a/openwrt/target/linux/package/Makefile
+++ b/openwrt/target/linux/package/Makefile
@@ -2,13 +2,17 @@
 include $(TOPDIR)/rules.mk
 
 ifneq ($(BOARD),ar7)
 include $(TOPDIR)/rules.mk
 
 ifneq ($(BOARD),ar7)

+ifneq ($(BOARD)-$(KERNEL),brcm-2.6)

 package-$(BR2_PACKAGE_KMOD_ALSA) += alsa
 endif
 package-$(BR2_PACKAGE_KMOD_ALSA) += alsa
 endif

+endif

 package-$(BR2_PACKAGE_KMOD_FUSE) += fuse
 package-$(BR2_PACKAGE_KMOD_HOSTAP) += hostap
 package-$(BR2_PACKAGE_KMOD_MADWIFI) += madwifi
 package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo
 package-$(BR2_PACKAGE_KMOD_FUSE) += fuse
 package-$(BR2_PACKAGE_KMOD_HOSTAP) += hostap
 package-$(BR2_PACKAGE_KMOD_MADWIFI) += madwifi
 package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo

+ifneq ($(BOARD)-$(KERNEL),brcm-2.6)

 package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan
 package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan

+endif

 package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
 package-y += base-files
 
 package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
 package-y += base-files
 

diff --git a/openwrt/target/linux/package/alsa/Config.in b/openwrt/target/linux/package/alsa/Config.in
index 62dd21b..a68be7a 100644 (file)
--- a/openwrt/target/linux/package/alsa/Config.in
+++ b/openwrt/target/linux/package/alsa/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KMOD_ALSA
        prompt "kmod-alsa......................... Alsa Sound Drivers"
 config BR2_PACKAGE_KMOD_ALSA
        prompt "kmod-alsa......................... Alsa Sound Drivers"

+       prompt "kmod-alsa......................... Alsa Sound Drivers (FIXME, does not build on 2.6/mipsel)" if BR2_LINUX_2_6_BRCM

        tristate
        default m if CONFIG_DEVEL
        depends BR2_PACKAGE_KMOD_USB_CONTROLLER
        tristate
        default m if CONFIG_DEVEL
        depends BR2_PACKAGE_KMOD_USB_CONTROLLER

diff --git a/openwrt/target/linux/package/openswan/Config.in b/openwrt/target/linux/package/openswan/Config.in
index 59a943f..52b52ba 100644 (file)
--- a/openwrt/target/linux/package/openswan/Config.in
+++ b/openwrt/target/linux/package/openswan/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KMOD_OPENSWAN
        prompt "kmod-openswan..................... Openswan kernel module"
 config BR2_PACKAGE_KMOD_OPENSWAN
        prompt "kmod-openswan..................... Openswan kernel module"

+       prompt "kmod-openswan..................... Openswan kernel module (FIXME, does not build on 2.6/mipsel)" if BR2_LINUX_2_6_BRCM

        tristate
        default m if CONFIG_DEVEL
        help
        tristate
        default m if CONFIG_DEVEL
        help