add a workaround for the hostapd killed issue when using more than one wifi card...

[openwrt.git] / package / hostapd / Makefile

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index f362912..7e0f087 100644 (file)
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_MD5SUM:=d5113247dc6ee17106e6bc7cb89aa507
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_MD5SUM:=d5113247dc6ee17106e6bc7cb89aa507

-PKG_CAT:=zcat

 
 PKG_BUILD_DEPENDS:=madwifi
 
 
 PKG_BUILD_DEPENDS:=madwifi
 


@@ -30,7 +29,7 @@ endef
 
 define Package/hostapd
   $(call Package/hostapd/Default)
 
 define Package/hostapd
   $(call Package/hostapd/Default)

-  DEPENDS:=+libopenssl
+  DEPENDS:=+libopenssl @!LINUX_2_6_AVR32

   TITLE+= (full)
   DESCRIPTION:=\
        This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS \\\
   TITLE+= (full)
   DESCRIPTION:=\
        This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS \\\


@@ -43,6 +42,7 @@ endef
 
 define Package/hostapd-mini
   $(call Package/hostapd/Default)
 
 define Package/hostapd-mini
   $(call Package/hostapd/Default)

+  DEPENDS:=@!LINUX_2_6_AVR32

   TITLE+= (WPA-PSK only)
   DESCRIPTION:=\
        This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator \\\
   TITLE+= (WPA-PSK only)
   DESCRIPTION:=\
        This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator \\\


@@ -71,8 +71,8 @@ define Build/CompileTarget
        $(MAKE) -C $(PKG_BUILD_DIR)_$(1) \
                $(TARGET_CONFIGURE_OPTS) \
                OPTFLAGS="$(TARGET_CFLAGS)" \
        $(MAKE) -C $(PKG_BUILD_DIR)_$(1) \
                $(TARGET_CONFIGURE_OPTS) \
                OPTFLAGS="$(TARGET_CFLAGS)" \

-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/madwifi" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/madwifi" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \

                hostapd hostapd_cli
        $(CP) $(PKG_BUILD_DIR)_$(1)/hostapd_cli $(PKG_BUILD_DIR)/
 endef
                hostapd hostapd_cli
        $(CP) $(PKG_BUILD_DIR)_$(1)/hostapd_cli $(PKG_BUILD_DIR)/
 endef


@@ -82,6 +82,8 @@ define Package/InstallTemplate
                rm -f $(PKG_BUILD_DIR)/.built; \
                $(MAKE) $(PKG_BUILD_DIR)/.built; \
        fi
                rm -f $(PKG_BUILD_DIR)/.built; \
                $(MAKE) $(PKG_BUILD_DIR)/.built; \
        fi

+       $(INSTALL_DIR) $$(1)/lib/wifi
+       $(INSTALL_DATA) ./files/hostapd.sh $$(1)/lib/wifi/hostapd.sh

        $(INSTALL_DIR) $$(1)/etc
        $(INSTALL_CONF) $(PKG_BUILD_DIR)_$(2)/madwifi.conf $$(1)/etc/hostapd.conf
        $(INSTALL_DIR) $$(1)/usr/sbin
        $(INSTALL_DIR) $$(1)/etc
        $(INSTALL_CONF) $(PKG_BUILD_DIR)_$(2)/madwifi.conf $$(1)/etc/hostapd.conf
        $(INSTALL_DIR) $$(1)/usr/sbin