Ignore:
Timestamp:
2010-06-22T16:37:40+02:00 (6 years ago)
Author:
marek
Message:

batman-adv: hotfix for maint branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/net/batman-advanced/Makefile

    r21541 r21880  
    1717PKG_VERSION_MAINT:=0.2.1 
    1818# Versions to download for development build 
    19 PKG_REV_DEV:=1679 
    20 PKG_KMOD_VERSION_DEV:=de32ed5ba4b6487dbd3c4cad6c9ba8240d79c421 
     19PKG_REV_DEV:=1715 
     20PKG_KMOD_VERSION_DEV:=520e8f9d66bc972e6f818c57e063efffb7f52be4 
    2121# just for the package version numbering 
    2222PKG_VERSION_DEV:=0.3.0a 
     
    5050endif 
    5151 
    52 PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman-adv-kernelland 
     52PKG_KMOD_BUILD_DIR:=$(PKG_BUILD_DIR)/batman-adv 
    5353PKG_TOOL_BUILD_DIR:=$(PKG_BUILD_DIR)/batctl 
    5454 
     
    7070endef 
    7171 
    72 define KernelPackage/batman-adv-kernelland 
     72define KernelPackage/batman-adv 
    7373$(call Package/batman-adv/Default) 
    7474  SUBMENU:=Network Support 
     
    7979endef 
    8080 
    81 define KernelPackage/batman-adv-kernelland/config 
     81define KernelPackage/batman-adv/config 
    8282        source "$(SOURCE)/Config.in" 
    8383endef 
    8484 
    85 define KernelPackage/batman-adv-kernelland/description 
     85define KernelPackage/batman-adv/description 
    8686B.A.T.M.A.N. layer 2 
    8787endef 
    8888 
    89 define Download/batman-adv-kernelland 
     89define Download/batman-adv 
    9090  FILE:=$(PKG_KMOD_FNAME) 
    9191  URL:=$(PKG_KMOD_URL) 
    9292endef 
    93 $(eval $(call Download,batman-adv-kernelland)) 
     93$(eval $(call Download,batman-adv)) 
    9494 
    9595ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),) 
    9696define Download/batctl 
    9797  FILE:=$(PKG_TOOL_FNAME) 
    98   URL:=$(PKG_TOOL_URL) 
     98  URL:=$(PKG_TOOL_URL)@$(PKG_TOOL_VERSION) 
    9999  PROTO:=$(PKG_TOOL_PROTO) 
    100100  VERSION:=$(PKG_TOOL_VERSION) 
     
    125125endif 
    126126endif 
    127         mv "$(PKG_BUILD_DIR)/batman-adv" "$(PKG_KMOD_BUILD_DIR)" 
     127        #mv "$(PKG_BUILD_DIR)/batman-adv" "$(PKG_KMOD_BUILD_DIR)" 
    128128        $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR),) 
    129129ifneq ($(CONFIG_BATMAN_ADV_DEV),) 
     
    135135endef 
    136136 
    137 MAKE_BATADV_KERNELLAND_ARGS += \ 
     137MAKE_BATMAN_ADV_ARGS += \ 
    138138        CROSS_COMPILE="$(TARGET_CROSS)" \ 
    139139        ARCH="$(LINUX_KARCH)" \ 
     
    159159endef 
    160160 
    161 ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batman-adv-kernelland),) 
    162         BUILD_KMOD_ADV = $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATADV_KERNELLAND_ARGS) 
     161ifneq ($(DEVELOPER)$(CONFIG_PACKAGE_kmod-batman-adv),) 
     162        BUILD_KMOD_ADV = $(MAKE) -C "$(LINUX_DIR)" $(MAKE_BATMAN_ADV_ARGS) 
    163163        BUILD_BATCTL = $(MAKE) -C $(PKG_TOOL_BUILD_DIR) $(MAKE_BATCTL_ARGS) 
    164164endif 
     
    175175endef 
    176176 
    177 define KernelPackage/batman-adv-kernelland/install 
     177define KernelPackage/batman-adv/install 
    178178        $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d 
    179179        $(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d 
     
    185185endef 
    186186 
    187 $(eval $(call KernelPackage,batman-adv-kernelland)) 
     187$(eval $(call KernelPackage,batman-adv)) 
Note: See TracChangeset for help on using the changeset viewer.