Changeset 23631


Ignore:
Timestamp:
2010-10-25T16:13:19+02:00 (6 years ago)
Author:
dingo
Message:

[patch-team] update wing packge version to 20101023 - Split wing compilation into host and target - Signed-off-by: Roberto Riggio<roberto.riggio@…>

Location:
packages/net/wing
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • packages/net/wing/Config.in

    r22868 r23631  
    1 # Wing configuration 
    2  
    3 choice 
    4         prompt "Version" 
    5         depends on PACKAGE_wing 
    6         default WING_STABLE 
    7         help 
    8                 This option allows you to select the version of Wing to be built. 
    9  
    10 config WING_STABLE 
    11         bool "Use the stable version (multi-interface)" 
    12  
    13 config WING_TESTING 
    14         bool "Use the unstable version (multi-interfaces w/ ITACA)" 
    15  
    16 endchoice 
    17  
  • packages/net/wing/Makefile

    r23377 r23631  
    99 
    1010PKG_NAME:=wing 
    11  
    12 ifneq ($(CONFIG_WING_STABLE),) 
    13         PKG_VERSION:=20100903 
    14         PKG_RELEASE:=4 
    15         PKG_REV:=520e3168a5af4d26bec3779cfa4901d128a4bc6f 
    16 else  
    17         PKG_VERSION:=$(shell date +%Y%m%d) 
    18         PKG_RELEASE:=1 
    19         PKG_REV:=HEAD 
    20 endif 
     11PKG_VERSION:=20101023 
     12PKG_RELEASE:=1 
     13PKG_REV:=daffb8d7642c4a343951d67159504ff4f4da49ed 
    2114 
    2215PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    2720 
    2821PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
    29 PKG_BUILD_PARALLEL:=1 
    30 PKG_INSTALL:=1 
     22 
     23PKG_BUILD_DEPENDS:=wing/host 
    3124 
    3225include $(INCLUDE_DIR)/package.mk 
     26include $(INCLUDE_DIR)/host-build.mk 
    3327 
    3428define Package/wing 
     
    3731        CATEGORY:=Network 
    3832        MAINTAINER:=Roberto Riggio <roberto.riggio@create-net.org> 
    39         DEPENDS:=+kmod-tun 
     33        DEPENDS:=+kmod-tun +libpcap +libstdcpp 
    4034        URL:=http://www.wing-project.org/ 
    4135endef 
     
    4337define Package/wing/Description  
    4438        Wing is a wireless mesh routing software. The routing protocol 
    45         is derived from Roofnet. It supports multiple radio interfaces and 
    46         link quality routing using the ETX, ETT, and WCETT metrics. 
     39        is derived from Roofnet. It supports multiple radio interfaces  
     40        and link quality routing using the ETX, ETT, or WCETT metric. 
    4741endef  
    4842 
    49 define Package/wing/config 
    50         source "$(SOURCE)/Config.in" 
     43EXTRA_CFLAGS=-MD 
     44 
     45CONFIGURE_ARGS += \ 
     46        --enable-tools=host \ 
     47        --enable-userlevel \ 
     48        --enable-wifi \ 
     49        --enable-wing \ 
     50        --disable-linuxmodule \ 
     51        --disable-dynamic-linking \ 
     52 
     53HOST_CONFIGURE_ARGS += \ 
     54        --enable-userlevel \ 
     55        --enable-wifi \ 
     56        --enable-wing \ 
     57        --disable-linuxmodule \ 
     58 
     59define Host/Compile 
     60        $(call Host/Install/Default, tools elementmap.xml install) 
    5161endef 
    5262 
    53 EXTRA_LDFLAGS:=-ldl 
    54  
    55 MAKE_FLAGS+=\ 
    56         V=1 \ 
    57         MINDRIVER=$(PKG_NAME) \ 
    58         BUILD_CC=$(TARGET_CC) \ 
    59         BUILD_CXX=$(TARGET_CXX) 
    60  
    61 HOST_MAKE_FLAGS:=\ 
    62         V=1 \ 
    63         MINDRIVER=$(PKG_NAME) 
    64  
    65 define Build/Configure 
    66         (cd $(PKG_BUILD_DIR); \ 
    67                 rm -rf config.{cache,status}; \ 
    68                  ./configure \ 
    69                         --prefix=/usr \ 
    70                         --enable-userlevel \ 
    71                         --enable-wifi \ 
    72                         --enable-wing \ 
    73                         --disable-linuxmodule \ 
    74         ); 
    75         $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(HOST_MAKE_FLAGS) tools 
    76         $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(HOST_MAKE_FLAGS) elementmap.xml 
    77         $(CP) $(PKG_BUILD_DIR)/tools/click-mkmindriver/click-mkmindriver $(PKG_BUILD_DIR)/ 
    78         rm -rf $(PKG_BUILD_DIR)/config.{cache,status} 
    79         $(call Build/Configure/Default, \ 
    80                 --enable-tools=mixed \ 
    81                 --enable-userlevel \ 
    82                 --enable-wifi \ 
    83                 --enable-wing \ 
    84                 --disable-linuxmodule \ 
    85         ) 
     63define Build/Compile 
    8664        (cd $(PKG_BUILD_DIR)/userlevel; \ 
    87                 ../click-mkmindriver -p $(PKG_NAME) -C .. \ 
     65                $(STAGING_DIR_HOST)/bin/click-mkmindriver -p $(PKG_NAME) -C $(STAGING_DIR_HOST) \ 
    8866                -f $(PKG_BUILD_DIR)/conf/wing/sample.click \ 
    8967                -A --all -E Discard -E Print -E Null \ 
    9068                -E InfiniteSource -E RatedSource -E EtherEncap -E UDPIPEncap \ 
    9169                -E RadiotapDecap -E RadiotapEncap \ 
    92                 -E ProbeTXRate -E MadwifiRate -E AutoRateFallback \ 
     70                -E ProbeTXRate -E MadwifiRate -E AutoRateFallback -E Minstrel \ 
    9371                -E RoundRobinSched -E DRRSched; \ 
    94         ) 
     72        ); 
     73        $(call Build/Install/Default, MINDRIVER=$(PKG_NAME) install) 
    9574endef 
    9675 
     
    10988endef 
    11089 
     90$(eval $(call HostBuild)) 
    11191$(eval $(call BuildPackage,wing)) 
    11292 
  • packages/net/wing/patches/100-cross-compile.patch

    r23376 r23631  
    1 --- 
    2  m4/click.m4 |    8 -------- 
    3  1 file changed, 8 deletions(-) 
    4  
    5 --- wing-20100903.orig/m4/click.m4 
    6 +++ wing-20100903/m4/click.m4 
    7 @@ -235,14 +235,6 @@ AC_DEFUN([CLICK_CHECK_BUILD_DYNAMIC_LINK 
    8      if test "x$ac_build_have_dlopen" = xyes -a "x$ac_build_have_dlfcn_h" = xyes; then 
    9         ac_build_have_dynamic_linking=yes 
    10      fi 
    11 -    if test "x$ac_build_have_dynamic_linking" != "x$ac_have_dynamic_linking"; then 
    12 -       AC_MSG_ERROR([ 
    13 -========================================= 
    14 - 
    15 -Build system and host system don't have the same dynamic linking state! 
    16 - 
    17 -=========================================]) 
    18 -    fi 
    19      AC_SUBST(BUILD_DL_LIBS) 
    20      eval "$saver" 
    21  ]) 
Note: See TracChangeset for help on using the changeset viewer.