Ignore:
Timestamp:
2010-05-23T15:17:09+02:00 (6 years ago)
Author:
marek
Message:

batman-adv: few makefile changes & upgrade dev to latest

File:
1 edited

Legend:

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

    r20380 r21541  
    1010 
    1111PKG_NAME:=batman-adv 
    12 PKG_REV:=1611 
    13 PKG_VERSION:=r$(PKG_REV) 
     12 
     13# Versions to download for maintenance build 
     14PKG_REV_MAINT:=1611 
     15PKG_KMOD_VERSION_MAINT:=5c4633c532a7a9b5adfe5dbf3f5e97fff307216e 
     16# just for the package version numbering 
     17PKG_VERSION_MAINT:=0.2.1 
     18# Versions to download for development build 
     19PKG_REV_DEV:=1679 
     20PKG_KMOD_VERSION_DEV:=de32ed5ba4b6487dbd3c4cad6c9ba8240d79c421 
     21# just for the package version numbering 
     22PKG_VERSION_DEV:=0.3.0a 
     23## Make sure git-commit hash and svn revision number fit! ## 
     24 
    1425PKG_RELEASE:=1 
    15  
    1626PKG_SOURCE_SUBDIR:=$(PKG_NAME) 
    1727 
    1828PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
    19 PKG_TOOL_VERSION=$(PKG_REV) 
    2029 
    2130ifneq ($(CONFIG_BATMAN_ADV_DEV),) 
    22         PKG_KMOD_VERSION=f9c84f3d20df87f4ebbc38b754b6b13fc1593ce2 
     31        PKG_REV:=$(PKG_REV_DEV) 
     32        PKG_VERSION:=$(PKG_VERSION_DEV) 
     33        PKG_KMOD_VERSION=$(PKG_KMOD_VERSION_DEV) 
     34        PKG_KMOD_URL=http://git.open-mesh.org/snapshot/$(PKG_KMOD_VERSION)/ 
    2335        PKG_KMOD_FNAME=batman-adv-dev-$(PKG_REV).tar.gz 
     36        PKG_TOOL_VERSION=$(PKG_REV) 
     37        PKG_TOOL_PROTO=svn 
    2438        PKG_TOOL_URL=http://downloads.open-mesh.org/svn/batman/trunk/batctl 
    2539        PKG_TOOL_FNAME:=batctl-dev-$(PKG_TOOL_VERSION).tar.gz 
    2640else 
    27         PKG_KMOD_VERSION=5c4633c532a7a9b5adfe5dbf3f5e97fff307216e 
     41        PKG_REV:=$(PKG_REV_MAINT) 
     42        PKG_VERSION:=$(PKG_VERSION_MAINT) 
     43        PKG_KMOD_VERSION=$(PKG_KMOD_VERSION_MAINT) 
     44        PKG_KMOD_URL=http://git.open-mesh.org/snapshot/$(PKG_KMOD_VERSION)/ 
    2845        PKG_KMOD_FNAME=batman-adv-maint-$(PKG_REV).tar.gz 
     46        PKG_TOOL_VERSION=$(PKG_REV) 
     47        PKG_TOOL_PROTO=svn 
    2948        PKG_TOOL_URL=http://downloads.open-mesh.org/svn/batman/branches/batctl-0.2.x/ 
    3049        PKG_TOOL_FNAME:=batctl-maint-$(PKG_TOOL_VERSION).tar.gz 
     
    7089define Download/batman-adv-kernelland 
    7190  FILE:=$(PKG_KMOD_FNAME) 
    72   URL:=http://git.open-mesh.org/snapshot/$(PKG_KMOD_VERSION)/ 
     91  URL:=$(PKG_KMOD_URL) 
    7392endef 
    7493$(eval $(call Download,batman-adv-kernelland)) 
     
    7897  FILE:=$(PKG_TOOL_FNAME) 
    7998  URL:=$(PKG_TOOL_URL) 
    80   PROTO:=svn 
     99  PROTO:=$(PKG_TOOL_PROTO) 
    81100  VERSION:=$(PKG_TOOL_VERSION) 
    82101  SUBDIR:=$(PKG_SOURCE_SUBDIR)/batctl 
     
    158177define KernelPackage/batman-adv-kernelland/install 
    159178        $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d 
    160         $(INSTALL_BIN) ./files/etc/init.d/batman-adv-kernelland $(1)/etc/init.d 
    161         $(INSTALL_DATA) ./files/etc/config/batman-adv-kernelland $(1)/etc/config 
     179        $(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d 
     180        $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config 
    162181ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),) 
    163182        $(INSTALL_DIR) $(1)/usr/sbin 
Note: See TracChangeset for help on using the changeset viewer.