qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 01:27:30 +02:00
Code

fixes files from [3112]

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3114 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mbm 2006-02-02 10:07:28 +00:00
parent c0d50e3077
commit cad490a0db
11 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/Config.in
View File

@ -130,6 +130,7 @@ source "package/slurm/Config.in"
source "package/snort/Config.in" source "package/snort/Config.in"
source "package/snort-wireless/Config.in" source "package/snort-wireless/Config.in"
source "package/socat/Config.in" source "package/socat/Config.in"
source "package/ssltunnel/Config.in"
source "package/ssmtp/Config.in" source "package/ssmtp/Config.in"
source "package/srelay/Config.in" source "package/srelay/Config.in"
source "package/tmsnc/Config.in" source "package/tmsnc/Config.in"
@ -179,6 +180,7 @@ source "package/libamsel/Config.in"
source "package/libao/Config.in" source "package/libao/Config.in"
source "package/libart/Config.in" source "package/libart/Config.in"
source "package/libcli/Config.in" source "package/libcli/Config.in"
source "package/clinkc/Config.in"
source "package/curl/Config.in" # libcurl source "package/curl/Config.in" # libcurl
source "package/libdaemon/Config.in" source "package/libdaemon/Config.in"
source "package/libdb/Config.in" source "package/libdb/Config.in"
@ -254,7 +256,6 @@ source "package/setserial/Config.in"
comment "Utilities" comment "Utilities"
source "package/bc/Config.in" source "package/bc/Config.in"
source "package/gdbserver/Config.in" source "package/gdbserver/Config.in"
source "package/madwifi-tools/Config.in"
source "package/pcmcia-cs/Config.in" # pcmcia-utils source "package/pcmcia-cs/Config.in" # pcmcia-utils
source "package/usbutils/Config.in" # lsusb source "package/usbutils/Config.in" # lsusb
source "package/pciutils/Config.in" source "package/pciutils/Config.in"

5
package/Makefile
View File

@ -21,6 +21,7 @@ package-$(BR2_PACKAGE_BWM) += bwm
package-$(BR2_PACKAGE_CGILIB) += cgilib package-$(BR2_PACKAGE_CGILIB) += cgilib
package-$(BR2_PACKAGE_CHILLISPOT) += chillispot package-$(BR2_PACKAGE_CHILLISPOT) += chillispot
package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount
package-$(BR2_PACKAGE_CLINKC) += clinkc
package-$(BR2_PACKAGE_COLLECTD) += collectd package-$(BR2_PACKAGE_COLLECTD) += collectd
package-$(BR2_PACKAGE_CUPS) += cups package-$(BR2_PACKAGE_CUPS) += cups
package-$(BR2_COMPILE_CURL) += curl package-$(BR2_COMPILE_CURL) += curl
@ -209,6 +210,7 @@ package-$(BR2_COMPILE_SPEEX) += speex
package-$(BR2_COMPILE_SQLITE) += sqlite package-$(BR2_COMPILE_SQLITE) += sqlite
package-$(BR2_COMPILE_SQLITE2) += sqlite2 package-$(BR2_COMPILE_SQLITE2) += sqlite2
package-$(BR2_PACKAGE_SSMTP) += ssmtp package-$(BR2_PACKAGE_SSMTP) += ssmtp
package-$(BR2_PACKAGE_SSLTUNNEL) += ssltunnel
package-$(BR2_PACKAGE_SRELAY) += srelay package-$(BR2_PACKAGE_SRELAY) += srelay
package-$(BR2_PACKAGE_STRACE) += strace package-$(BR2_PACKAGE_STRACE) += strace
package-$(BR2_PACKAGE_TCPDUMP) += tcpdump package-$(BR2_PACKAGE_TCPDUMP) += tcpdump
@ -269,6 +271,7 @@ arpwatch-compile: libpcap-compile
atftp-compile: readline-compile atftp-compile: readline-compile
avahi-compile: libdaemon-compile expat-compile libgdbm-compile avahi-compile: libdaemon-compile expat-compile libgdbm-compile
bind-compile: openssl-compile bind-compile: openssl-compile
clinkc-compile: expat-compile
curl-compile: openssl-compile zlib-compile curl-compile: openssl-compile zlib-compile
cyrus-sasl-compile: openssl-compile cyrus-sasl-compile: openssl-compile
deco-compile: ncurses-compile deco-compile: ncurses-compile
@ -305,6 +308,7 @@ lighttpd-compile: openssl-compile pcre-compile
madplay-compile: libid3tag-compile libmad-compile madplay-compile: libid3tag-compile libmad-compile
miax-compile: bluez-libs-compile miax-compile: bluez-libs-compile
miredo-compile: uclibc++-compile miredo-compile: uclibc++-compile
monit-compile: openssl-compile
mt-daapd-compile: howl-compile libgdbm-compile libid3tag-compile mt-daapd-compile: howl-compile libgdbm-compile libid3tag-compile
mtr-compile: ncurses-compile mtr-compile: ncurses-compile
mysql-compile: ncurses-compile zlib-compile readline-compile mysql-compile: ncurses-compile zlib-compile readline-compile
@ -345,6 +349,7 @@ sipsak-compile: openssl-compile
socat-compile: openssl-compile socat-compile: openssl-compile
sqlite-compile: ncurses-compile readline-compile sqlite-compile: ncurses-compile readline-compile
sqlite2-compile: ncurses-compile readline-compile sqlite2-compile: ncurses-compile readline-compile
ssltunnel-compile: openssl-compile ppp-compile
tcpdump-compile: libpcap-compile tcpdump-compile: libpcap-compile
tinc-compile: zlib-compile openssl-compile liblzo-compile tinc-compile: zlib-compile openssl-compile liblzo-compile
tor-compile: libevent-compile openssl-compile zlib-compile tor-compile: libevent-compile openssl-compile zlib-compile

1
package/atftp/Config.in
View File

@ -4,6 +4,7 @@ config BR2_COMPILE_ATFTP
tristate tristate
default n default n
depends BR2_PACKAGE_ATFTP || BR2_PACKAGE_ATFTPD depends BR2_PACKAGE_ATFTP || BR2_PACKAGE_ATFTPD
select BR2_PACKAGE_LIBREADLINE
config BR2_PACKAGE_ATFTP config BR2_PACKAGE_ATFTP
prompt "atftp............................. TFTP client" prompt "atftp............................. TFTP client"

1
package/atftp/ipkg/atftp.control
View File

@ -2,3 +2,4 @@ Package: atftp
Priority: optional Priority: optional
Section: net Section: net
Description: tftp client Description: tftp client
Depends: libreadline

1
package/atftp/ipkg/atftpd.control
View File

@ -2,3 +2,4 @@ Package: atftpd
Priority: optional Priority: optional
Section: net Section: net
Description: tftp server Description: tftp server
Depends: libreadline

8
package/base-files/default/etc/init.d/S45firewall
View File

@ -81,11 +81,9 @@ iptables -t nat -N postrouting_rule
iptables -A FORWARD -j forwarding_rule iptables -A FORWARD -j forwarding_rule
# allow # allow
# if there is bridge splitting this workaround works too iptables -A FORWARD -i br0 -o br0 -j ACCEPT
for iface in $LAN; do [ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT
iptables -A FORWARD -i $iface -o $iface -j ACCEPT
[ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT
done
# reject (what to do with anything not allowed earlier) # reject (what to do with anything not allowed earlier)
# uses the default -P DROP # uses the default -P DROP

2
package/base-files/default/sbin/mount_root
View File

@ -30,7 +30,7 @@ if [ "$1" != "failsafe" ]; then
pivot_root /jffs /jffs/rom pivot_root /jffs /jffs/rom
mount none /proc -t proc mount none /proc -t proc
mount none /dev -t devfs mount none /dev -t devfs
umount /rom/proc rom/dev >&- umount /rom/proc /rom/dev >&-
fi fi
fi fi
fi fi

4
package/dnsmasq/Makefile
View File

@ -3,9 +3,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq PKG_NAME:=dnsmasq
PKG_VERSION:=2.25 PKG_VERSION:=2.26
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:=a5a387aed551acf91990567a5e8e4fa4 PKG_MD5SUM:=ae04abb5db4a8cc43c24f432f0c44d5c
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

12
package/rrdcollect/files/rrdcollect.conf
View File

@ -19,15 +19,15 @@ exec:///bin/df
# LAN: vlan0, WAN: vlan1, WIFI: eth1 # LAN: vlan0, WAN: vlan1, WIFI: eth1
file:///proc/net/dev file:///proc/net/dev
"vlan0: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo " vlan0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo
"vlan1: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo " vlan1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo
"eth1: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo " eth1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo
#"tun0: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:tbi,tpi,tbo,tpo #" tun0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:tbi,tpi,tbo,tpo
file:///proc/slabinfo file:///proc/slabinfo
"ip_conntrack %d %*d %*d %*d %*d %*d" SYS.rrd:con "ip_conntrack %d %*d %*d %*d %*d %*d" SYS.rrd:con
"arp_cache %d %*d %*d %*d %*d %*d" SYS.rrd:arp "arp_cache %d %*d %*d %*d %*d %*d" SYS.rrd:arp
file:///proc/interrupts file:///proc/interrupts
"4: %d MIPS eth1" SYS.rrd:irw " 4: %d MIPS eth1" SYS.rrd:irw
"5: %d MIPS eth0" SYS.rrd:ire " 5: %d MIPS eth0" SYS.rrd:ire

6
package/wireless-tools/Makefile
View File

@ -24,18 +24,18 @@ $(PKG_BUILD_DIR)/.configured:
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \ CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \
all iwmulticall libiw.so.28 iwmulticall
mkdir -p $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
PREFIX="$(PKG_INSTALL_DIR)" \ PREFIX="$(PKG_INSTALL_DIR)" \
INSTALL_DIR="$(PKG_INSTALL_DIR)/usr/sbin" \ INSTALL_DIR="$(PKG_INSTALL_DIR)/usr/sbin" \
INSTALL_LIB="$(PKG_INSTALL_DIR)/usr/lib" \ INSTALL_LIB="$(PKG_INSTALL_DIR)/usr/lib" \
install install-iwmulticall install-iwmulticall
touch $@ touch $@
$(IPKG_WIRELESS_TOOLS): $(IPKG_WIRELESS_TOOLS):
mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/lib mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/
mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/sbin mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/
$(RSTRIP) $(IDIR_WIRELESS_TOOLS) $(RSTRIP) $(IDIR_WIRELESS_TOOLS)

10
target/linux/image/brcm/Makefile
View File

@ -78,6 +78,14 @@ FSNAME:=$(patsubst jffs2-%,jffs2,$(FS))
# #
# install: $(BIN_DIR)/openwrt-wap54g-$(KERNEL)-$(FSNAME).trx # install: $(BIN_DIR)/openwrt-wap54g-$(KERNEL)-$(FSNAME).trx
# endif # endif
ifneq ($(FS),jffs2-8MB)
$(BIN_DIR)/openwrt-wrt54g3g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx
$(STAGING_DIR)/bin/addpattern -4 -p W54F -v v1.99.5 -i $< -o $@ -g
$(BIN_DIR)/openwrt-wrt54g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx
$(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g
$(BIN_DIR)/openwrt-wrt54gs_v4-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx $(BIN_DIR)/openwrt-wrt54gs_v4-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx
$(STAGING_DIR)/bin/addpattern -4 -p W54s -v v1.05.2 -i $< -o $@ -g $(STAGING_DIR)/bin/addpattern -4 -p W54s -v v1.05.2 -i $< -o $@ -g
@ -112,7 +120,7 @@ endif
install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx
install-ib: install-ib:
mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
$(CP) -fpR $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin $(CP) $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin
mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
$(CP) $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/ $(CP) $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/
$(CP) $(BUILD_DIR)/loader.elf $(IB_DIR)/build_$(ARCH)/ $(CP) $(BUILD_DIR)/loader.elf $(IB_DIR)/build_$(ARCH)/