Ignore:
Timestamp:
2011-11-13T19:35:03+01:00 (4 years ago)
Author:
jow
Message:

[backfire/packages] git: merge r29036

Location:
branches/packages_10.03.1
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.1/net/git/Makefile

    r26975 r29037  
    1010PKG_NAME:=git 
    1111PKG_VERSION:=1.7.5.2 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    6565        $(INSTALL_DIR) $(1) 
    6666        $(CP) $(PKG_INSTALL_DIR)/* $(1)/ 
     67        ln -s /usr/bin/git $(1)/usr/libexec/git-core/git 
    6768endef 
    6869 
  • branches/packages_10.03.1/utils/usb-modeswitch-data/Makefile

    r27560 r29037  
    11# 
    2 # Copyright (C) 2010 OpenWrt.org 
     2# Copyright (C) 2010-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=usb-modeswitch-data 
    11 PKG_VERSION:=20110705 
     11PKG_VERSION:=20111023 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://www.draisberghof.de/usb_modeswitch/ 
    16 PKG_MD5SUM:=5046e7be8d10d2fe699f9af21a0c3769 
     16PKG_MD5SUM:=6e7cb67d0428bda241600b038ba11aeb 
    1717 
    1818include $(INCLUDE_DIR)/package.mk 
  • branches/packages_10.03.1/utils/usb-modeswitch/Makefile

    r27560 r29037  
    11# 
    2 # Copyright (C) 2008-2010 OpenWrt.org 
     2# Copyright (C) 2008-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=usb-modeswitch 
    11 PKG_VERSION:=1.1.8 
    12 PKG_RELEASE:=1 
     11PKG_VERSION:=1.2.0 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://www.draisberghof.de/usb_modeswitch 
    16 PKG_MD5SUM:=1aaaa45e0465843e4973d7778bfbafbb 
     16PKG_MD5SUM:=1932ab96d6e3c5e0a6bdfac863338627 
    1717 
    1818include $(INCLUDE_DIR)/package.mk 
  • branches/packages_10.03.1/utils/usb-modeswitch/files/modeswitch.hotplug

    r22903 r29037  
    121121                [ -n "$configs" ] && { 
    122122                        log "$DEVICENAME: Selecting ${configs%% *} for mode switching" 
    123                         $modeswitch -c "${configs%% *}" 
     123                        # ugly workaround, but working for all hw we got for testing 
     124                        switching_done=0 
     125                        switching_tries=0 
     126                        local usb_dir="/sys/$DEVPATH"        
     127                        [ -f "$usb_dir/idVendor" ] || usb_dir="${usb_dir%/*}" 
     128                        while [ $switching_done -lt 1 -a $switching_tries -le 6 ]; do 
     129                                $modeswitch -I -D -n -s 30 -c "${configs%% *}" 
     130                                if [ $(sanitize "$usb_dir/idProduct") = $uPid ]; then 
     131                                        log "switching seemingly failed" 
     132                                else 
     133                                        switching_done=1 
     134                                fi 
     135                                switching_tries=$(( $switching_tries + 1 )) 
     136                        done 
    124137                } 
    125138        } 
Note: See TracChangeset for help on using the changeset viewer.