Changeset 588

Show
Ignore:
Timestamp:
09/12/06 20:11:35 (2 years ago)
Author:
wbx
Message:

merge wbx-target-cleanup to trunk.
- mk directory for some top level makefiles (build.mk,vars.mk)
- add a separate configfs partition to all models, 128 kb big
- add model and platform specific startup files and kernel configs
- delete target/linux/package, add all addon kernel packages to packages
- simplify target/linux/brcm-2.4/Makefile, abstraction to mk/ comes later
- add target/image directory, place where the different images are created
- default off for all extra packages, be sure that you enable all packages

you need to get a dsl-capable router. snapshots will be created by a specific config which contains all needed stuff (iptables, pppoe, pptp, haserl, webif)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/Makefile

    r543 r588  
    2929 
    3030GMAKE?=         $(PWD)/lbin/gmake 
    31 GMAKE_FMK=      ${GMAKE} -f $(PWD)/build.mk 
     31GMAKE_FMK=      ${GMAKE} -f $(PWD)/mk/build.mk 
    3232GMAKE_INV=      ${GMAKE_FMK} --no-print-directory 
    3333 

  • trunk/freewrt/package/Config.in

    r527 r588  
    1212source "package/busybox/Config.in" 
    1313source "package/bridge/Config.in" 
    14 source "package/configfs/Config.in" 
     14#source "package/configfs/Config.in" 
    1515source "package/dnsmasq/Config.in" 
    1616source "package/iptables/Config.in" 
    1717source "package/mtd/Config.in" 
    1818source "package/nvram/Config.in" 
     19source "package/jffs2root/Config.in" 
    1920source "package/webif/Config.in" 
    2021endmenu 
     22 
    2123 
    2224menu "Shells" 
    …… 
    362364        help 
    363365          Predefine the URL where "ipkg" looks for packages 
    364           @TARGET@ works as placeholder for "<boradtype>-<kernel>" i.e. "brcm-2.4" 
     366          @TARGET@ works as placeholder for "<boardtype>-<kernel>" i.e. "brcm-2.4" 
    365367             so you can configure different URLs for different targets with a single string 
    366368 

  • trunk/freewrt/package/Config.shell

    r494 r588  
    2828config FWRT_PACKAGE_MKSH_AS_BINSH 
    2929        depends FWRT_PACKAGE_MKSH 
    30         select BUSYBOX_CONFIG_FEATURE_SH_IS_NONE 
    3130        bool "mksh" 
    3231        help 

  • trunk/freewrt/package/Makefile

    r527 r588  
    9494package-$(FWRT_PACKAGE_IRSSI) += irssi 
    9595package-$(FWRT_PACKAGE_JAMVM) += jamvm 
     96package-$(FWRT_PACKAGE_JFFS2ROOT) += jffs2root 
    9697package-$(FWRT_PACKAGE_JOE) += joe 
    9798package-$(FWRT_COMPILE_JPEG) += jpeg 
    …… 
    294295package-$(FWRT_PACKAGE_XSUPPLICANT) += xsupplicant 
    295296package-$(FWRT_PACKAGE_ZLIB) += zlib 
    296  
    297 DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl liblzo gmp fuse portmap libelf uclibc++ speex libpng libgd wireless-tools nvram linux-atm libamsel libao libart libdaemon libdb libdnet libevent libffi-sable libgcrypt libgdbm libgpg-error libid3tag libmad libnet libnids libogg libol libosip2 libpcap radiusclient-ng libtasn1 libupnp libusb libvorbis libvorbisidec libxml2 libxslt id3lib net-snmp 
    298 DEV_LIBS_COMPILE:=$(patsubst %,%-compile,$(DEV_LIBS)) 
    299 SDK_DEFAULT_PACKAGES:=busybox dnsmasq iptables wireless-tools dropbear bridge ppp 
    300 SDK_DEFAULT_COMPILE:=$(patsubst %,%-compile,$(SDK_DEFAULT_PACKAGES)) 
     297# kernel addon packages 
     298package-$(FWRT_PACKAGE_KMOD_BROADCOM_WL) += broadcom-wl 
     299package-$(FWRT_PACKAGE_KMOD_BROADCOM_DIAG) += broadcom-diag 
     300package-$(FWRT_PACKAGE_KMOD_MADWIFI) += madwifi 
     301package-$(FWRT_PACKAGE_KMOD_MINI_FO) += mini_fo 
     302package-$(FWRT_PACKAGE_KMOD_SPCA5XX) += spca5xx 
     303package-$(FWRT_COMPILE_KMOD_SWITCH) += switch 
     304package-$(FWRT_PACKAGE_KMOD_WLCOMPAT) += wlcompat 
     305 
    301306COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m)) 
    302307INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y)) 
    …… 
    304309all: compile 
    305310clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) 
    306 compile: $(COMPILE_PACKAGES) 
    307 install: base-files-install $(INSTALL_PACKAGES) 
     311compile: base-files-compile $(COMPILE_PACKAGES) base-files-arch-compile 
     312install: base-files-install $(INSTALL_PACKAGES) base-files-arch-install 
    308313 
    309314$(COMPILE_PACKAGES): base-files-compile 
    310315$(INSTALL_PACKAGES): base-files-install 
    311  
    312 sdk-compile: $(DEV_LIBS_COMPILE) $(SDK_DEFAULT_COMPILE) 
    313316 
    314317$(STAMP_DIR): 

  • trunk/freewrt/package/base-files/Makefile

    r441 r588  
    22 
    33include $(TOPDIR)/rules.mk 
     4include $(TOPDIR)/mk/targets.mk 
    45 
    56PKG_NAME:=              base-files 
    67PKG_RELEASE:=           10 
    78WRKSRC=                 ${WRKDIR}/base-files 
    8  
    9 BOARD:=$(shell LANG=C grep ^FWRT_LINUX_2 $(TOPDIR)/.config| \ 
    10         head -n 1 | sed -e "s/=y//" \ 
    11         -e "s/.*_//"| tr "[:upper:]" "[:lower:]") 
    12 KERNEL:=$(shell LANG=C grep ^FWRT_LINUX_2 $(TOPDIR)/.config| \ 
    13         head -n 1 | sed -e "s/=y//" \ 
    14         -e "s/FWRT_LINUX_//" -e "s/_BRCM//" -e "s/_/./"| tr "[:upper:]" "[:lower:]") 
    159 
    1610REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' ) 
    …… 
    2014 
    2115DISTFILES:= 
     16 
    2217include $(TOPDIR)/package/rules.mk 
    2318 
    …… 
    147142        $(IPKG_BUILD) $(IDIR_LIBGCC) $(PACKAGE_DIR) 
    148143 
     144install-dev: 
     145        mkdir -p $(STAGING_DIR)/usr/include 
     146        $(CP) ./include/[a-z]* $(STAGING_DIR)/usr/include/ 
     147 
    149148package-clean: 
    150149        rm -f $(PACKAGES) 
    151150         
    152151clean-targets: package-clean 
    153 prepare: 
     152prepare: install-dev 
    154153compile-targets: $(PACKAGES) 
    155154install-targets: compile 

  • trunk/freewrt/package/base-files/default/etc/init.d/S10boot

    r276 r588  
    2222done 
    2323 
    24 HOSTNAME=$(nvram get wan_hostname) 
     24HOSTNAME=$(cat /etc/hostname) 
    2525HOSTNAME=${HOSTNAME%%.*} 
    2626echo ${HOSTNAME:=FreeWRT} >/proc/sys/kernel/hostname 

  • trunk/freewrt/package/base-files/default/sbin/mount_root

    r375 r588  
    88        mount | grep jffs2 >&- 
    99        if [ $? = 0 ] ; then 
    10                 if [ $(cat /proc/mtd | wc -l) = 6 ]; then 
     10                if [ $(cat /proc/mtd | wc -l) = 7 ]; then 
    1111                        mtd erase data 
    1212                        jffs2root --move --reboot 
    …… 
    1717                . /bin/firstboot 
    1818                echo "switching to overlay filesystem" 
    19                 mount /dev/mtdblock/4 /jffs -t jffs2 
     19                mount /dev/mtdblock/5 /jffs -t jffs2 
    2020                fopivot /jffs /rom 
    2121        fi 

  • trunk/freewrt/package/bridge/Config.in

    r360 r588  
    88           
    99          http://bridge.sourceforge.net/ 
    10  

  • trunk/freewrt/package/depend.mk

    r531 r588  
    9090rrdtool1-compile: zlib-compile 
    9191rsync-compile: popt-compile 
     92sablevm-compile: zlib-compile 
    9293scanlogd-compile: libpcap-compile libnids-compile libnet-compile 
    9394scdp-compile: libnet-compile 

  • trunk/freewrt/package/dnsmasq/Config.in

    r360 r588  
    22        prompt "dnsmasq........................... Lightweight DNS and DHCP server" 
    33        tristate 
    4         default y 
     4        default n 
    55        help 
    66          A lightweight DNS and DHCP server.  It is intended to provide  

  • trunk/freewrt/package/fuse/Config.in

    r360 r588  
    77        prompt "libfuse........................... FUSE library" 
    88        tristate 
    9         default m if CONFIG_DEVEL 
     9        default n 
    1010        select FWRT_COMPILE_FUSE 
    11         select FWRT_PACKAGE_KMOD_FUSE 
    1211        select FWRT_PACKAGE_LIBPTHREAD 
    1312        help 
    …… 
    3433        prompt   "fuse-utils...................... FUSE utilities" 
    3534        tristate 
    36         default m if CONFIG_DEVEL 
     35        default n 
    3736        depends FWRT_PACKAGE_LIBFUSE 
    3837        select FWRT_PACKAGE_LIBPTHREAD 
    …… 
    5554          This package contains the fusermount userland utility. 
    5655 
     56config FWRT_PACKAGE_KMOD_FUSE 
     57        prompt   "kmod-fuse....................... FUSE kernel module" 
     58        tristate 
     59        default n 
     60        depends FWRT_PACKAGE_LIBFUSE 
     61        help 
     62          With FUSE it is possible to implement a fully functional  
     63          filesystem in a userspace program. 

  • trunk/freewrt/package/fuse/Makefile

    r303 r588  
    1 # $Id: Makefile 3527 2006-03-28 18:21:42Z wbx $ 
    2  
    31include $(TOPDIR)/rules.mk 
     2include $(TOPDIR)/mk/targets.mk 
    43 
    54PKG_NAME:=fuse 
    …… 
    1110PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1211 
    13  
    1412include $(TOPDIR)/package/rules.mk 
    1513 
    1614$(eval $(call PKG_template,LIBFUSE,libfuse,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    1715$(eval $(call PKG_template,FUSE_UTILS,fuse-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     16$(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(KERNEL_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) 
    1817 
    1918$(WRKBUILD)/.configured: 
    …… 
    5049                        --enable-static \ 
    5150                        --disable-rpath \ 
    52                         --disable-kernel-module \ 
    5351                        --enable-lib \ 
    5452                        --enable-util \ 
     53                        --enable-kernel-module \ 
    5554                        --disable-example \ 
    5655                        --disable-auto-modprobe \ 
    …… 
    6463        mkdir -p $(WRKINST) 
    6564        $(MAKE) -C $(WRKBUILD) \ 
     65                ARCH="$(ARCH)" \ 
     66                CROSS_COMPILE="$(TARGET_CROSS)" \ 
     67                PATH="$(TARGET_PATH)" \ 
    6668                DESTDIR="$(WRKINST)" \ 
    6769                all install 
    …… 
    7981        $(RSTRIP) $(IDIR_FUSE_UTILS) 
    8082        $(IPKG_BUILD) $(IDIR_FUSE_UTILS) $(PACKAGE_DIR) 
     83 
     84$(IPKG_KMOD_FUSE): 
     85        mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(KERNEL_VERSION) 
     86        $(CP) $(WRKINST)/lib/modules/$(KERNEL_VERSION)/kernel/fs/fuse/fuse.$(KERNEL_MOD_SUFFIX) \ 
     87                $(IDIR_KMOD_FUSE)/lib/modules/$(KERNEL_VERSION)/ 
     88        $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR) 
    8189 
    8290$(STAGING_DIR)/usr/lib/libfuse.so: $(WRKBUILD)/.built 

  • trunk/freewrt/package/iptables/Config.in

    r360 r588  
    99        prompt "iptables.......................... IPv4 firewall administration tool" 
    1010        tristate 
    11         default y 
     11        default n 
    1212        select FWRT_COMPILE_IPTABLES 
    1313        help 
    …… 
    1919        prompt   "iptables-extra.................. Extra Iptables extensions for IPv4 firewalling (meta-package)" 
    2020        tristate 
    21         default m if CONFIG_DEVEL 
     21        default n 
    2222        depends FWRT_PACKAGE_IPTABLES 
    2323        select FWRT_PACKAGE_KMOD_IPTABLES_EXTRA 
    …… 
    3636        prompt   "iptables-mod-conntrack.......... Iptables extensions for connection tracking" 
    3737        tristate 
    38         default m if CONFIG_DEVEL 
     38        default n 
    3939        depends FWRT_PACKAGE_IPTABLES 
    4040        select FWRT_PACKAGE_KMOD_IPT_CONNTRACK 
    …… 
    5050        prompt   "iptables-mod-filter............. Iptables extension for packet content inspection" 
    5151        tristate 
    52         default m if CONFIG_DEVEL 
     52        default n 
    5353        depends FWRT_PACKAGE_IPTABLES 
    5454        select FWRT_PACKAGE_KMOD_IPT_FILTER 
    …… 
    6363        prompt "iptables-mod-imq................ Iptables extensions for Intermediate Queuing Device QoS-support" 
    6464        tristate 
    65         default m if CONFIG_DEVEL 
     65        default n 
    6666        depends FWRT_PACKAGE_IPTABLES 
    6767        select FWRT_PACKAGE_KMOD_IMQ 
    …… 
    7575        prompt   "iptables-mod-ipopt.............. Iptables extensions for matching/changing IP packet options" 
    7676        tristate 
    77         default m if CONFIG_DEVEL 
     77        default n 
    7878        depends FWRT_PACKAGE_IPTABLES 
    7979        select FWRT_PACKAGE_KMOD_IPT_IPOPT 
    …… 
    9494        prompt   "iptables-mod-ipsec.............. Iptables extensions for matching special IPsec packets" 
    9595        tristate 
    96         default m if CONFIG_DEVEL 
     96        default n 
    9797        depends FWRT_PACKAGE_IPTABLES 
    9898        select FWRT_PACKAGE_KMOD_IPT_IPSEC 
    …… 
    107107        prompt   "iptables-mod-nat................ Iptables extensions for different NAT targets" 
    108108        tristate 
    109         default m if CONFIG_DEVEL 
     109        default n 
    110110        depends FWRT_PACKAGE_IPTABLES 
    111111        select FWRT_PACKAGE_KMOD_IPT_NAT 
    …… 
    119119        prompt   "iptables-mod-ulog............... Iptables extensions for user-space packet logging" 
    120120        tristate 
    121         default m if CONFIG_DEVEL 
     121        default n 
    122122        depends FWRT_PACKAGE_IPTABLES 
    123123        select FWRT_PACKAGE_KMOD_IPT_ULOG 
    …… 
    131131        prompt   "iptables-mod-extra.............. Other extra Iptables extensions" 
    132132        tristate 
    133         default m if CONFIG_DEVEL 
     133        default n 
    134134        depends FWRT_PACKAGE_IPTABLES 
    135135        select FWRT_PACKAGE_KMOD_IPT_EXTRA 
    …… 
    147147        prompt   "iptables-utils.................. Save and restore utilities" 
    148148        tristate 
    149         default m if CONFIG_DEVEL 
     149        default n 
    150150        depends FWRT_PACKAGE_IPTABLES 
    151151        help 
    …… 
    157157        prompt "ip6tables......................... IPv6 firewall administration tool" 
    158158        tristate 
    159         default m if CONFIG_DEVEL 
     159        default n 
    160160        select FWRT_COMPILE_IPTABLES 
    161161        select FWRT_PACKAGE_KMOD_IPV6 

  • trunk/freewrt/package/mtd/Config.in

    r360 r588  
    22        prompt "mtd............................... Update utility for trx firmware images" 
    33        tristate 
    4         default y 
     4        default n 
    55        help 
    66          Update utility for trx firmware images. 

  • trunk/freewrt/package/openswan/Config.in

    r360 r588  
    22        prompt "openswan.......................... VPN solution using IPsec" 
    33        tristate 
    4         default m if CONFIG_DEVEL 
     4        default n 
    55        select FWRT_PACKAGE_IP 
    66        select FWRT_PACKAGE_LIBGMP 
    7         select FWRT_PACKAGE_KMOD_OPENSWAN 
    87        help 
    98          Openswan is an implementation of IPsec for Linux. 
    109           
    1110          http://www.openswan.org/ 
    12  

  • trunk/freewrt/package/openswan/Makefile

    r303 r588  
    1 # $Id: Makefile 3638 2006-04-13 18:28:55Z nbd $ 
    2  
    31include $(TOPDIR)/rules.mk 
     2include $(TOPDIR)/mk/targets.mk 
    43 
    54PKG_NAME:=openswan 
    …… 
    2423                $(TARGET_CONFIGURE_OPTS) \ 
    2524                KERNELSRC="$(LINUX_DIR)" \ 
    26                 ARCH="mips" \ 
     25                ARCH="$(ARCH)" \ 
    2726                USERCOMPILE="$(FLAGS)" \ 
    2827                EXTRA_INCLUDE="-I$(STAGING_DIR)/usr/include" \ 
    …… 
    3130                INC_USRLOCAL="/usr" \ 
    3231                programs 
     32        $(MAKE) -C $(WRKBUILD) \ 
     33                $(TARGET_CONFIGURE_OPTS) \ 
     34                LINUX_RELEASE="$(KERNEL_RELEASE)" \ 
     35                KERNELSRC="$(LINUX_DIR)" \ 
     36                ARCH="$(ARCH)" \ 
     37                CROSS_COMPILE="$(TARGET_CROSS)" \ 
     38                USERCOMPILE="$(FLAGS)" \ 
     39                AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \ 
     40                module 
    3341        touch $@ 
    3442 
    3543$(IPKG_OPENSWAN): 
     44        mkdir -p $(PACKAGE_DIR) 
    3645        $(MAKE) -C $(WRKBUILD) \ 
    3746                $(TARGET_CONFIGURE_OPTS) \ 
    3847                DESTDIR="$(IDIR_OPENSWAN)" \ 
    3948                KERNELSRC="$(LINUX_DIR)" \ 
    40                 ARCH="mips" \ 
     49                ARCH="$(ARCH)" \ 
    4150                USERCOMPILE="$(FLAGS)" \ 
    4251                IPSECDIR="/usr/lib/ipsec" \ 
    …… 
    5059        rm -rf $(IDIR_OPENSWAN)/etc/rc.d/rc*.d 
    5160        mkdir -p $(IDIR_OPENSWAN)/etc/init.d 
    52         ln -sf ../rc.d/init.d/ipsec $(IDIR_OPENSWAN)/etc/init.d/S60ipsec 
     61        $(CP) $(IDIR_OPENSWAN)/etc/rc.d/init.d/ipsec \ 
     62                $(IDIR_OPENSWAN)/etc/init.d/S60ipsec 
     63        rm $(IDIR_OPENSWAN)/etc/rc.d/init.d/ipsec 
    5364        find $(WRKBUILD) -name \*.old | xargs rm -rf 
    54         mkdir -p $(PACKAGE_DIR) 
     65        mkdir -p $(IDIR_OPENSWAN)/lib/modules/$(KERNEL_VERSION) 
     66        $(CP) $(WRKBUILD)/modobj*/ipsec.$(KERNEL_MOD_SUFFIX) \ 
     67                $(IDIR_OPENSWAN)/lib/modules/$(KERNEL_VERSION)/ 
    5568        $(IPKG_BUILD) $(IDIR_OPENSWAN) $(PACKAGE_DIR) 
     69 

  • trunk/freewrt/package/openswan/ipkg/openswan.control

    r1 r588  
    22Section: base 
    33Priority: optional 
    4 Depends: kmod-openswan, libgmp, ip 
     4Depends: libgmp, ip 
    55Description: Openswan IPSec software 

  • trunk/freewrt/package/shfs/Config.in

    r360 r588  
    33        default n 
    44        depends FWRT_PACKAGE_SHFS_UTILS 
     5        depends FWRT_PACKAGE_KMOD_SHFS 
    56 
    67config FWRT_PACKAGE_SHFS_UTILS 
    …… 
    89        tristate 
    910        select FWRT_COMPILE_SHFS 
    10         select FWRT_PACKAGE_KMOD_SHFS 
    11         default m if CONFIG_DEVEL 
     11        default n 
    1212        help 
    1313          ShFS is a simple and easy to use Linux kernel module which  
    …… 
    3131          This package contains the shfs mount/umount utilities. 
    3232 
     33config FWRT_PACKAGE_KMOD_SHFS 
     34        prompt "kmod-shfs.......................... ShFS mount/umount utilities" 
     35        tristate 
     36        select FWRT_COMPILE_SHFS 
     37        default n 
     38        help 
     39          Kernel modules for SHFS. 

  • trunk/freewrt/package/shfs/Makefile

    r303 r588  
    1 # $Id: Makefile 3112 2006-02-01 23:53:19Z mbm $ 
    2  
    31include $(TOPDIR)/rules.mk 
     2include $(TOPDIR)/mk/targets.mk 
    43 
    54PKG_NAME:=shfs 
    …… 
    1514 
    1615$(eval $(call PKG_template,SHFS_UTILS,shfs-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     16$(eval $(call PKG_template,KMOD_SHFS,kmod-shfs,$(KERNEL_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) 
    1717 
    1818$(WRKBUILD)/.configured: 
    …… 
    2929                ROOT="$(WRKINST)" \ 
    3030                utils utils-install 
     31        $(MAKE) -C $(WRKBUILD) \ 
     32                ARCH="$(ARCH)" \ 
     33                CROSS_COMPILE="$(TARGET_CROSS)" \ 
     34                PATH="$(TARGET_PATH)" \ 
     35                OFLAGS="$(TARGET_CFLAGS)" \ 
     36                CC="$(TARGET_CC)" \ 
     37                LINKER="$(TARGET_CC)" \ 
     38                KERNEL="$(KERNEL_VERSION)" \ 
     39                KERNEL_SOURCES="$(LINUX_DIR)" \ 
     40                ROOT="$(WRKINST)" \ 
     41                module module-install 
    3142        touch $@ 
    3243 
    …… 
    3849        $(IPKG_BUILD) $(IDIR_SHFS_UTILS) $(PACKAGE_DIR) 
    3950 
     51$(IPKG_KMOD_SHFS): 
     52        install -m0755 -d $(IDIR_KMOD_SHFS)/lib/modules/$(KERNEL_VERSION) 
     53        $(CP) $(WRKINST)/lib/modules/$(KERNEL_VERSION)/kernel/fs/shfs/shfs.$(KERNEL_MOD_SUFFIX) \ 
     54                $(IDIR_KMOD_SHFS)/lib/modules/$(KERNEL_VERSION)/ 
     55        $(IPKG_BUILD) $(IDIR_KMOD_SHFS) $(PACKAGE_DIR) 

  • trunk/freewrt/package/wificonf/Config.in

    r360 r588  
    22        prompt "wificonf.......................... replacement utility for wlconf" 
    33        tristate 
    4         default y 
     4        default n 
    55        depends FWRT_PACKAGE_NVRAM 
    66        help 

  • trunk/freewrt/package/wireless-tools/Config.in

    r360 r588  
    22        prompt "wireless-tools.................... Tools for manipulating Linux Wireless Extensions" 
    33        tristate 
    4         default y 
     4        default n 
    55        help 
    66          Tools for configuring Wireless Adapters implementing the "Wireless Extension" 

  • trunk/freewrt/rules.mk

    r472 r588  
    5555#"))"))"))"))")) # for vim's broken syntax highlighting :) 
    5656 
    57 include $(TOPDIR)/vars.mk 
     57include $(TOPDIR)/mk/vars.mk 
    5858 
    5959ifeq (${OStype},Linux) 

  • trunk/freewrt/scripts/flash.sh

    r470 r588  
    44# 
    55# Copyright (C) 2004 by Oleg I. Vdovikin <oleg@cs.msu.su> 
    6 # Copyright (C) 2005 by Waldemar Brodkorb <wbx@openwrt.org> 
     6# Copyright (C) 2006 by Waldemar Brodkorb <wbx@freewrt.org> 
    77# 
    88# This program is free software; you can redistribute it and/or modify 
    …… 
    2222 
    2323if [ -z "$1" ] || [ ! -f $1 ] || [ -z $2 ]; then 
    24     echo Usage: $0 firmware vendor 
     24    echo Usage: $0 firmware model 
    2525cat << EOF 
     26Following models are supported: 
     27  asus_wl500g   - Asus WL500g 
     28  asus_wl500gd  - Asus WL500g Deluxe 
     29  asus_wl500gp  - Asus WL500g Premium 
     30  linksys       - All Linksys models 
     31 
    2632IMPORTANT: 
    27 Notes for Linksys / Asus WL500gx router:  
     33Notes for Linksys routers:  
    2834   be sure you have set boot_wait to yes. Power on your router 
    2935   after executing this script. 
    3036  
    31 Notes for Asus WL500g router: 
     37Notes for Asus routers: 
    3238   be sure POWER led is flashing (If this is not the case 
    3339   poweroff the device, push the reset button & power on 
    …… 
    3844   192.168.1.0/24 address range (and not the 192.168.1.1) 
    3945 
    40 Notes for Toshiba router: 
    41    boot_wait is enabled by default on these units. 
    42  
    43 1) connect your pc to any of the four LAN ports 
    44 2) be sure your link is up and has an address in the 
    45    192.168.10.1/24 address range (and not the 192.168.10.1) 
    46 3) run this script (unit will only accept .trx images) 
    47 4) Turn unit power on. 
    48  
    4946EOF 
    5047    exit 0 
    5148fi 
    52 if [ "$2" == "asus" ]; then 
     49if [ "$2" == "asus_wl500g" ]; then 
    5350echo Confirming IP address setting... 
    5451echo -en "get ASUSSPACELINK\x01\x01\xa8\xc0 /dev/null\nquit\n" | tftp 192.168.1.1 
    …… 
    5653echo -en "binary\nput $1 ASUSSPACELINK\nquit\n" | tftp 192.168.1.1 
    5754echo Please wait until leds stops flashing.  
    58 elif [ "$2" == "linksys" ]; then 
     55elif [ "$2" == "asus_wl500gd" -o "$2" == "asus_wl500gp" ]; then 
    5956echo Flashing 192.168.1.1 using $1... 
    6057echo -en "rexmt 1\ntrace\nbinary\nput $1\nquit\n" | tftp 192.168.1.1 
    61 echo Please wait until power led stops flashing. Do not poweroff! Then you can login via telnet 192.168.1.1. 
    62 elif [ "$2" == "toshiba" ]; then 
    63 echo Flashing 192.168.10.1 using $1... 
    64 echo -en "rexmt 1\ntrace\nbinary\nput $1\nquit\n" | tftp 192.168.10.1&nbs