Changeset 290

Timestamp:

Jul 24, 2011, 12:17:54 AM (12 years ago)

Author:

amain

Message:

Fix bug #102.

• extract_kmodpk.sh: only detect if .ko files are already installed
• Config.in: remove b43 firmware selection ( can still be selected with make openwrt/menuconfig )

Location:

trunk

Files:

• Config.in (modified) (2 diffs)
• rules/extract_kmodpkg.sh (modified) (1 diff)

trunk/Config.in

@@ -732 +732 @@
      http://madwifi-project.org/
 
-menuconfig PACKAGE_kmod-b43
+config PACKAGE_kmod-b43
         bool "kmod-b43.................................. Broadcom 43xx wireless support"
         default y
@@ -738 +738 @@
           Kernel module for Broadcom 43xx wireless support (mac80211 stack) new
           http://linuxwireless.org/en/users/Drivers/b43
-
-        menu "Configuration"
-                depends on PACKAGE_kmod-b43
-
-        choice
-                prompt "b43 firmware version"
-                default B43_EXPERIMENTAL
-                help
-                  This option allows you to select the version of the b43 firmware. DebWrt note: 
-                  Over the years this experimental version showed better results then the stable
-                  version
-
-        config B43_STABLE
-                bool "4.150.10.5 (stable)"
-                help
-                  Stable firmware for BCM43xx devices.
-
-                  If unsure, select this.
-
-        config B43_EXPERIMENTAL
-                bool "4.178.10.4 (experimental)"
-                help
-                  Experimental firmware for BCM43xx devices.
-
-                  This firmware is not tested as much as the "stable" firmware.
-
-                  If unsure, select the "stable" firmware.
-
-        config B43_OPENFIRMWARE
-                bool "Open FirmWare for WiFi networks"
-                help
-                  Opensource firmware for BCM43xx devices.
-
-                  Do _not_ select this, unless you know what you are doing.
-                  The Opensource firmware is not suitable for embedded devices, yet.
-                  It does not support QoS, which is bad for AccessPoints.
-                  It does not support hardware crypto acceleration, which is a showstopper
-                  for embedded devices with low CPU resources.
-
-                  If unsure, select the "stable" firmware.
-
-        endchoice
-
-        config B43_FW_SQUASH
-                bool "Remove unnecessary firmware files"
-                depends on !B43_OPENFIRMWARE
-                default n
-                help
-                  This options allows you to remove unnecessary b43 firmware files
-                  from the final rootfs image. This can reduce the rootfs size by
-                  up to 200k.
-
-                  If unsure, say Y.
-
-        config B43_FW_SQUASH_COREREVS
-                string "Core revisions to include"
-                depends on B43_FW_SQUASH
-                default "5,6,7,8,9,10,13,14,15"
-                help
-                  This is a comma seperated list of core revision numbers.
-
-                  Example (keep files for rev5 only):
-                    5
-
-                  Example (keep files for rev5 and rev11):
-                    5,11
-
-        config B43_FW_SQUASH_PHYTYPES
-                string "PHY types to include"
-                depends on B43_FW_SQUASH
-                default "G,LP"
-                help
-                  This is a comma seperated list of PHY types:
-                    A  => A-PHY
-                    AG => Dual A-PHY G-PHY
-                    G  => G-PHY
-                    LP => LP-PHY
-                    N  => N-PHY
-
-                  Example (keep files for G-PHY only):
-                    G
-
-                  Example (keep files for G-PHY and N-PHY):
-                    G,N
-
-        endmenu
 
 config PACKAGE_kmod-b43legacy

trunk/rules/extract_kmodpkg.sh

@@ -35 +35 @@
 
    # Only copy kernel module files if they do not already exist!
-   findc=$(find $droot -type f -name $kmodf | wc -l)
+   if [ ".ko" = "${kmodf/*.ko/.ko}" ]; then
+      findc=$(find $droot -type f -name $kmodf | wc -l) 
+   else
+      findc=0
+   fi
+
    if [ "$findc" -eq 0 ]; then
           tokmod=${kmod/$tardir/}