Changeset 1c65cdcd in freewrt


Ignore:
Timestamp:
Jan 20, 2007, 12:05:53 PM (19 years ago)
Author:
Waldemar Brodkorb <wbx@…>
Children:
bd67c0e
Parents:
683a696
Message:

convert to new style, remove mini version, we need a better solution, i don't like the -mini packages

git-svn-id: ​svn://www.freewrt.org/branches/common-adk@1640 afb5a338-a214-0410-bd46-81f09a774fd1

Location:
package/hostapd
Files:
3 deleted
2 edited
1 moved

Legend:

Unmodified
Added
Removed

  • package/hostapd/Config.in

    r683a696 r1c65cdcd  
    22        tristate
    33        default n
    4         depends FWRT_PACKAGE_HOSTAPD || FWRT_PACKAGE_HOSTAPD_MINI || FWRT_PACKAGE_HOSTAPD_UTILS
     4        depends FWRT_PACKAGE_HOSTAPD || FWRT_PACKAGE_HOSTAPD_UTILS
    55        select FWRT_PACKAGE_KMOD_MADWIFI
    66
    … …  
    2424           - hostapd
    2525
    26 config FWRT_PACKAGE_HOSTAPD_MINI
    27         prompt "hostapd-mini...................... An IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator (without EAP TLS/TTLS support)"
    28         tristate
    29         default n
    30         select FWRT_COMPILE_HOSTAPD
    31         help
    32 
    33           hostapd is a user space daemon for access point and
    34           authentication servers. It implements IEEE 802.11 access point
    35           management, IEEE 802.1X/WPA/WPA2/EAP Authenticators, RADIUS
    36           client, EAP server, and RADIUS authentication server.
    37 
    38           http://hostap.epitest.fi/hostapd/
    39 
    40           Includes:
    41            - hostapd (built with WPA support only)
    42 
    4326config FWRT_PACKAGE_HOSTAPD_UTILS
    4427        prompt "hostapd-utils..................... An IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator (CLI utility)"
    … …  
    5740          Includes:
    5841           - hostapd_cli
    59 
    60 if (FWRT_PACKAGE_HOSTAPD = y) && (FWRT_PACKAGE_HOSTAPD_MINI = y)
    61         comment "WARNING: both hostapd and hostapd-mini are selected for installation !"
    62 endif

  • package/hostapd/Makefile

    r683a696 r1c65cdcd  
    55# or at http://www.freewrt.org/licence for details.
    66
    7 include $(TOPDIR)/rules.mk
     7include ${TOPDIR}/rules.mk
    88
    99PKG_NAME:=              hostapd
    … …  
    1111PKG_RELEASE:=           1
    1212PKG_MD5SUM:=            095b6e0558b09cd36b1904c7edbaa78f
     13PKG_SOURCE_URL:=        http://hostap.epitest.fi/releases/
    1314
    14 PKG_SOURCE_URL:=        http://hostap.epitest.fi/releases/
    15 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz
     15include ${TOPDIR}/mk/package.mk
    1616
    17 include $(TOPDIR)/mk/package.mk
     17$(eval $(call PKG_template,HOSTAPD,hostapd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
     18$(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
    1819
    19 define PKG_build
     20TCPPFLAGS+=             -I${STAGING_DIR}/usr/include/madwifi
     21BUILD_STYLE=            auto
     22MAKE_FLAGS+=            OPTFLAGS="${TARGET_CFLAGS}"
    2023
    21 ifneq ($(FWRT_PACKAGE_$(1)),)
    22 BUILD_TARGETS+=         $(WRKINST)/$(2)/hostapd
    23 endif
     24do-configure:
     25        ${CP} ./files/hostapd.config ${WRKBUILD}/.config
    2426
    25 $(WRKINST)/$(2)/hostapd: $(WRKBUILD)/.prepared
    26         -$(MAKE) -C $(WRKBUILD) clean
    27         $(CP) ./files/$(2).config $(WRKBUILD)/.config
    28         $(MAKE) -C $(WRKBUILD) \
    29                 $(TARGET_CONFIGURE_OPTS) \
    30                 OPTFLAGS="$(TARGET_CFLAGS)" \
    31                 CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/madwifi" \
    32                 LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
    33                 hostapd
    34         mkdir -p $(WRKINST)/$(2)
    35         $(CP) $(WRKBUILD)/hostapd $(WRKINST)/$(2)/
    36         touch $$@
    37 
    38 $$(IPKG_$(1)): $(WRKINST)/$(2)/hostapd
    39         install -m0755 -d $$(IDIR_$(1))/etc
    40         install -m0600 $(WRKBUILD)/madwifi.conf $$(IDIR_$(1))/etc/hostapd.conf
    41         install -m0755 -d $$(IDIR_$(1))/usr/sbin
    42         install -m0755 $(WRKINST)/$(2)/hostapd $$(IDIR_$(1))/usr/sbin/
    43         $(RSTRIP) $$(IDIR_$(1))
    44         $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
    45 
    46 endef
    47 
    48 $(eval $(call PKG_template,HOSTAPD,hostapd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    49 $(eval $(call PKG_template,HOSTAPD_MINI,hostapd-mini,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    50 $(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    51 
    52 $(eval $(call PKG_build,HOSTAPD,hostapd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    53 $(eval $(call PKG_build,HOSTAPD_MINI,hostapd-mini,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    54 
    55 $(WRKBUILD)/.configured:
    56         $(CP) ./files/hostapd.config $(WRKBUILD)/.config
    57         touch $@
    58 
    59 $(WRKBUILD)/.built: $(BUILD_TARGETS)
    60         $(MAKE) -C $(WRKBUILD) \
    61                 $(TARGET_CONFIGURE_OPTS) \
    62                 OPTFLAGS="$(TARGET_CFLAGS)" \
    63                 CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/madwifi" \
    64                 LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
    65                 hostapd_cli
    66         touch $@
    67 
    68 $(IPKG_HOSTAPD_UTILS): $(WRKBUILD)/.built
    69         install -m0755 -d $(IDIR_HOSTAPD_UTILS)/usr/sbin
    70         install -m0755 $(WRKBUILD)/hostapd_cli $(IDIR_HOSTAPD_UTILS)/usr/sbin/
    71         $(RSTRIP) $(IDIR_HOSTAPD_UTILS)
    72         $(IPKG_BUILD) $(IDIR_HOSTAPD_UTILS) $(PACKAGE_DIR)
     27do-install:
     28        ${INSTALL_DIR} ${IDIR_HOSTAPD_UTILS}/usr/sbin
     29        ${INSTALL_BIN} ${WRKBUILD}/hostapd_cli ${IDIR_HOSTAPD_UTILS}/usr/sbin/
     30        ${INSTALL_DIR} ${IDIR_HOSTAPD}/etc
     31        ${INSTALL_DIR} ${IDIR_HOSTAPD}/usr/sbin
     32        ${INSTALL_BIN} ${WRKBUILD}/hostapd ${IDIR_HOSTAPD}/usr/sbin/
     33        ${INSTALL_DATA} ${WRKBUILD}/hostapd.conf ${IDIR_HOSTAPD}/etc
    7334
    7435include ${TOPDIR}/mk/pkg-bottom.mk

  • package/hostapd/patches/patch-Makefile

    r683a696 r1c65cdcd  
    1 Common subdirectories: hostapd-0.5.2/logwatch and hostapd-0.5.2.new/logwatch
    2 diff -u hostapd-0.5.2/Makefile hostapd-0.5.2.new/Makefile
    3 --- hostapd-0.5.2/Makefile      2006-03-20 03:20:09.000000000 +0000
    4 +++ hostapd-0.5.2.new/Makefile  2006-03-21 22:25:23.803473592 +0000
    5 @@ -3,7 +3,7 @@
    6  DIR_HOSTAP=.
     1$FreeWRT$
     2--- hostapd-0.5.6.orig/Makefile Sat Nov 25 02:35:07 2006
     3+++ hostapd-0.5.6/Makefile      Tue Jan 16 23:45:31 2007
     4@@ -1,8 +1,8 @@
     5-CC=gcc
     6+CC?=gcc
     7 DIR_WPA_SUPPLICANT=.
    78 
    89 ifndef CFLAGS
    … …  
    1213 
    1314 # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
    14 @@ -266,7 +266,7 @@
     15@@ -336,7 +336,7 @@ install: all
    1516        for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
    1617 
    … …  
    2122 driver_conf.c: Makefile .config
    2223        rm -f driver_conf.c
    23 @@ -330,10 +330,10 @@
     24@@ -400,10 +400,10 @@ LIBS_n += -lcrypto
    2425 endif
    2526 
Note: See TracChangeset for help on using the changeset viewer.