In the olsrd you can now run when IpVersion is 6and4 the txtinfo plugin in both
instances (IPv6 and IPv4) on the same port. Other services like the httpinfo
plugin hopefully follow in the next versions of the olsrd. It can't run on an
IPv6 socket for now.
Stats of the IPv6 olsrd:
wget -q -O - http://[::1]:2006/
Stats of the IPv4 olsrd:
wget -q -O - http://127.0.0.1:2006/
The dir300-flash patch updates the tool to version 0.9.8. Sven-Ola's tftpd
don't like symlinks. This version fixes his problem.
Signed-off-by: Alina Friedrichsen <[EMAIL PROTECTED]>
Index: net/olsrd/files/olsrd.init
===================================================================
--- net/olsrd/files/olsrd.init (Revision 13199)
+++ net/olsrd/files/olsrd.init (Arbeitskopie)
@@ -13,38 +13,38 @@
'
validate_varname() {
- local varname=$1
+ local varname="$1"
[ -z "$varname" -o "$varname" != "${varname%%[!A-Za-z0-9_]*}" ] &&
return 1
return 0
}
validate_ifname() {
- local ifname=$1
+ local ifname="$1"
[ -z "$ifname" -o "$ifname" != "${ifname%%[!A-Za-z0-9.:_-]*}" ] &&
return 1
return 0
}
validate_olsrd_option() {
- local str=$1
+ local str="$1"
[ -z "$str" -o "$str" != "${str%%[! 0-9A-Za-z./:_-]*}" ] && return 1
return 0
}
get_ifname() {
IFNAME=
- local interface=$1
+ local interface="$1"
validate_varname "$interface" || return 1
local ifname
config_get ifname "$interface" ifname
validate_ifname "$ifname" || return 1
- IFNAME=$ifname
+ IFNAME="$ifname"
return 0
}
system_config() {
- local cfg=$1
+ local cfg="$1"
local cfgt
local hostname
local latlon
@@ -53,8 +53,8 @@
if [ "$cfgt" = "system" ]; then
config_get hostname "$cfg" hostname
- hostname=${hostname:-OpenWrt}
- SYSTEM_HOSTNAME=$hostname
+ hostname="${hostname:-OpenWrt}"
+ SYSTEM_HOSTNAME="$hostname"
fi
if [ -z "$SYSTEM_LAT" -o -z "$SYSTEM_LON" ]; then
@@ -62,13 +62,20 @@
IFS=" ${T}${N},"
set -- $latlon
unset IFS
- SYSTEM_LAT=$1
- SYSTEM_LON=$2
+ SYSTEM_LAT="$1"
+ SYSTEM_LON="$2"
fi
+
+ if [ -z "$SYSTEM_LAT" -o -z "$SYSTEM_LON" ]; then
+ config_get latlon "$cfg" latitude
+ SYSTEM_LAT="$latlon"
+ config_get latlon "$cfg" longitude
+ SYSTEM_LON="$latlon"
+ fi
}
olsrd_find_config_file() {
- local cfg=$1
+ local cfg="$1"
validate_varname "$cfg" || return 0
config_get_bool ignore "$cfg" ignore 0
@@ -79,11 +86,11 @@
}
warning_invalid_value() {
- local package=$1
+ local package="$1"
validate_varname "$package" || package=
- local config=$2
+ local config="$2"
validate_varname "$config" || config=
- local option=$3
+ local option="$3"
validate_varname "$option" || option=
echo -n "Warning: Invalid value" 1>&2
@@ -98,13 +105,13 @@
}
olsrd_write_option() {
- local param=$1
- local cfg=$2
+ local param="$1"
+ local cfg="$2"
validate_varname "$cfg" || return 1
- local option=$3
+ local option="$3"
validate_varname "$option" || return 1
- local value=$4
- local option_type=$5
+ local value="$4"
+ local option_type="$5"
if [ "$option_type" = bool ]; then
case "$value" in
@@ -120,7 +127,7 @@
fi
if [ "$value" != "${value%%[G-Zg-z_-]*}" ]; then
- if [ "$value" != "yes" -a "$value" != "no" ]; then
+ if [ "$option" != "Ip6AddrType" -a "$value" != "yes" -a
"$value" != "no" ]; then
value="\"$value\""
fi
fi
@@ -131,13 +138,13 @@
}
olsrd_write_plparam() {
- local param=$1
- local cfg=$2
+ local param="$1"
+ local cfg="$2"
validate_varname "$cfg" || return 1
- local option=$3
+ local option="$3"
validate_varname "$option" || return 1
- local value=$4
- local option_type=$5
+ local value="$4"
+ local option_type="$5"
local _option
if [ "$option_type" = bool ]; then
@@ -160,7 +167,7 @@
_option="$option"
if [ "$option" = 'hosts' ]; then
set -- $value
- option=$1
+ option="$1"
shift
value="$*"
fi
@@ -172,13 +179,13 @@
config_update_schema() {
unset IFS
- local schema_varname=$1
+ local schema_varname="$1"
validate_varname "$schema_varname" || return 1
- local command=$2
+ local command="$2"
validate_varname "$command" || return 1
- local option=$3
+ local option="$3"
validate_varname "$option" || return 1
- local value=$4
+ local value="$4"
local schema
local cur_option
@@ -213,12 +220,12 @@
config_write_options() {
unset IFS
- local schema=$1
- local cfg=$2
+ local schema="$1"
+ local cfg="$2"
validate_varname "$cfg" || return 1
- local write_func=$3
+ local write_func="$3"
[ -z "$write_func" ] && output_func=echo
- local write_param=$4
+ local write_param="$4"
local schema_entry
local option
local option_length
@@ -232,14 +239,14 @@
local position
for schema_entry in $schema; do
- default=${schema_entry#*[=]}
+ default="${schema_entry#*[=]}"
[ "$default" = "$schema_entry" ] && default=
- option=${schema_entry%%[=]*}
+ option="${schema_entry%%[=]*}"
IFS=':'
set -- $option
unset IFS
- option=$1
- option_type=$2
+ option="$1"
+ option_type="$2"
validate_varname "$option" || continue
[ -z "$option_type" ] || validate_varname "$option_type" ||
continue
[ "$option_type" = internal ] && continue
@@ -295,15 +302,22 @@
}
olsrd_write_olsrd() {
- local cfg=$1
+ local cfg="$1"
validate_varname "$cfg" || return 0
local ignore
+ local ipversion
config_get_bool ignore "$cfg" ignore 0
[ "$ignore" -ne 0 ] && return 0
[ "$OLSRD_COUNT" -gt 0 ] && return 0
+ config_get ipversion "$cfg" IpVersion
+ if [ "$ipversion" = "6and4" ]; then
+ OLSRD_IPVERSION_6AND4=1
+ config_set "$cfg" IpVersion '6'
+ fi
+
config_write_options "$OLSRD_OLSRD_SCHEMA" "$cfg" olsrd_write_option
echo
OLSRD_COUNT=$((OLSRD_COUNT + 1))
@@ -312,7 +326,7 @@
}
olsrd_write_ipcconnect() {
- local cfg=$1
+ local cfg="$1"
validate_varname "$cfg" || return 0
local ignore
@@ -330,7 +344,7 @@
}
olsrd_write_hna4() {
- local cfg=$1
+ local cfg="$1"
validate_varname "$cfg" || return 0
local ignore
@@ -357,7 +371,7 @@
}
olsrd_write_hna6() {
- local cfg=$1
+ local cfg="$1"
validate_varname "$cfg" || return 0
local ignore
@@ -384,7 +398,7 @@
}
olsrd_write_loadplugin() {
- local cfg=$1
+ local cfg="$1"
validate_varname "$cfg" || return 0
local ignore
local name
@@ -441,7 +455,7 @@
}
olsrd_write_interface() {
- local cfg=$1
+ local cfg="$1"
validate_varname "$cfg" || return 0
local ignore
local interfaces
@@ -497,6 +511,7 @@
}
olsrd_write_config() {
+ OLSRD_IPVERSION_6AND4=0
OLSRD_COUNT=0
config_foreach olsrd_write_olsrd olsrd
IPCCONNECT_COUNT=0
@@ -548,7 +563,20 @@
[ -z "$OLSRD_CONFIG_FILE" ] && return 1
+ local bindv6only='0'
+ if [ "$OLSRD_IPVERSION_6AND4" -ne 0 ]; then
+ bindv6only="$(cat /proc/sys/net/ipv6/bindv6only)"
+ echo 1 > /proc/sys/net/ipv6/bindv6only
+ fi
+
olsrd -f "$OLSRD_CONFIG_FILE" -nofork < /dev/null > /dev/null &
+
+ if [ "$OLSRD_IPVERSION_6AND4" -ne 0 ]; then
+ sed -e 's/^IpVersion[ ][ ]*6$/IpVersion 4/' <
"$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv4
+ olsrd -f /var/etc/olsrd.conf.ipv4 -nofork < /dev/null >
/dev/null &
+ sleep 3
+ echo "$bindv6only" > /proc/sys/net/ipv6/bindv6only
+ fi
}
stop() {
Index: net/olsrd/Makefile
===================================================================
--- net/olsrd/Makefile (Revision 13199)
+++ net/olsrd/Makefile (Arbeitskopie)
@@ -26,7 +26,6 @@
CATEGORY:=Network
TITLE:=OLSR (Optimized Link State Routing) daemon
URL:=http://www.olsr.org/
- MENU:=1
endef
define Package/olsrd
@@ -36,9 +35,15 @@
endef
define Package/olsrd/conffiles
-/etc/olsrd.conf
+/etc/config/olsrd
endef
+define Package/olsrd-mod-arprefresh
+ $(call Package/olsrd/template)
+ DEPENDS:=olsrd
+ TITLE:=Kernel ARP cache refresh plugin
+endef
+
define Package/olsrd-mod-dot-draw
$(call Package/olsrd/template)
DEPENDS:=olsrd
@@ -60,7 +65,7 @@
define Package/olsrd-mod-dyn-gw-plain
$(call Package/olsrd/template)
DEPENDS:=olsrd
- TITLE:=Simplified and more efficient dynamic internet gateway plugin by
Sven-Ola Tuecke
+ TITLE:=Dynamic internet gateway plain plugin
endef
define Package/olsrd-mod-httpinfo
@@ -109,20 +114,24 @@
MANDIR="$(PKG_INSTALL_DIR)/usr/share/man" \
STRIP="true" \
INSTALL_LIB="true" \
- SUBDIRS="bmf dot_draw dyn_gw dyn_gw_plain httpinfo nameservice
secure txtinfo" \
+ SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo
nameservice secure txtinfo" \
all libs install install_libs
endef
define Package/olsrd/install
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DATA) ./files/olsrd.config $(1)/etc/config/olsrd
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/cfgparser/olsrd.conf.example
$(1)/etc/olsrd.conf
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/olsrd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/olsrd.init $(1)/etc/init.d/olsrd
endef
+define Package/olsrd-mod-arprefresh/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/arprefresh/olsrd_arprefresh.so.*
$(1)/usr/lib/
+endef
+
define Package/olsrd-mod-dot-draw/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/dot_draw/olsrd_dot_draw.so.*
$(1)/usr/lib/
@@ -166,6 +175,7 @@
endef
$(eval $(call BuildPackage,olsrd))
+$(eval $(call BuildPackage,olsrd-mod-arprefresh))
$(eval $(call BuildPackage,olsrd-mod-dot-draw))
$(eval $(call BuildPackage,olsrd-mod-bmf))
$(eval $(call BuildPackage,olsrd-mod-dyn-gw))
Index: utils/dir300-flash/Makefile
===================================================================
--- utils/dir300-flash/Makefile (Revision 0)
+++ utils/dir300-flash/Makefile (Revision 0)
@@ -0,0 +1,62 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dir300-flash
+PKG_VERSION:=0.9.8
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://x-alina.freifunk-potsdam.de/downloads/dir300-flash
+PKG_MD5SUM:=5e3610d33f934744e12699f2c281b6ad
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/dir300-flash
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=Flashes a custom firmware on the DIR-300 wireless router
+ URL:=http://x-alina.freifunk-potsdam.de/
+endef
+
+define Download/ap61.ram
+
URL:=http://www.dd-wrt.com/dd-wrtv2/downloads/v24/Atheros%20WiSoc/Airlink%20101%20AR430W
+ FILE:=ap61.ram
+ MD5SUM:=4aaec2bff1edffe8c49003ed9363ad8b
+endef
+
+define Download/ap61.rom
+
URL:=http://www.dd-wrt.com/dd-wrtv2/downloads/v24/Atheros%20WiSoc/Airlink%20101%20AR430W
+ FILE:=ap61.rom
+ MD5SUM:=eb7817d202c297ae5dc6b6b897632601
+endef
+
+define Download/dir300redboot.zip
+ URL:=http://www.shadowandy.net/wp/wp-content/uploads
+ FILE:=dir300redboot.zip
+ MD5SUM:=5fdb24432aa200b508026215d821e126
+endef
+
+define Build/Compile
+ unzip -n '$(DL_DIR)/dir300redboot.zip' -d '$(PKG_BUILD_DIR)'
+endef
+
+define Package/dir300-flash/install
+ $(INSTALL_DIR) -- '$(1)/usr/sbin'
+ $(INSTALL_BIN) -- '$(PKG_BUILD_DIR)/dir300-flash.sh'
'$(1)/usr/sbin/dir300-flash'
+ $(INSTALL_DIR) -- '$(1)/usr/share/dir300-flash'
+ $(INSTALL_DATA) -- '$(DL_DIR)/ap61.ram' '$(1)/usr/share/dir300-flash'
+ $(INSTALL_DATA) -- '$(DL_DIR)/ap61.rom' '$(1)/usr/share/dir300-flash'
+ $(INSTALL_DATA) -- '$(PKG_BUILD_DIR)/dir300redboot.rom'
'$(1)/usr/share/dir300-flash'
+endef
+
+$(eval $(call BuildPackage,dir300-flash))
+$(eval $(call Download,ap61.ram))
+$(eval $(call Download,ap61.rom))
+$(eval $(call Download,dir300redboot.zip))
--
Psssst! Schon vom neuen GMX MultiMessenger gehört? Der kann`s mit allen:
http://www.gmx.net/de/go/multimessenger
Index: net/olsrd/files/olsrd.init
===================================================================
--- net/olsrd/files/olsrd.init (Revision 13199)
+++ net/olsrd/files/olsrd.init (Arbeitskopie)
@@ -13,38 +13,38 @@
'
validate_varname() {
- local varname=$1
+ local varname="$1"
[ -z "$varname" -o "$varname" != "${varname%%[!A-Za-z0-9_]*}" ] && return 1
return 0
}
validate_ifname() {
- local ifname=$1
+ local ifname="$1"
[ -z "$ifname" -o "$ifname" != "${ifname%%[!A-Za-z0-9.:_-]*}" ] && return 1
return 0
}
validate_olsrd_option() {
- local str=$1
+ local str="$1"
[ -z "$str" -o "$str" != "${str%%[! 0-9A-Za-z./:_-]*}" ] && return 1
return 0
}
get_ifname() {
IFNAME=
- local interface=$1
+ local interface="$1"
validate_varname "$interface" || return 1
local ifname
config_get ifname "$interface" ifname
validate_ifname "$ifname" || return 1
- IFNAME=$ifname
+ IFNAME="$ifname"
return 0
}
system_config() {
- local cfg=$1
+ local cfg="$1"
local cfgt
local hostname
local latlon
@@ -53,8 +53,8 @@
if [ "$cfgt" = "system" ]; then
config_get hostname "$cfg" hostname
- hostname=${hostname:-OpenWrt}
- SYSTEM_HOSTNAME=$hostname
+ hostname="${hostname:-OpenWrt}"
+ SYSTEM_HOSTNAME="$hostname"
fi
if [ -z "$SYSTEM_LAT" -o -z "$SYSTEM_LON" ]; then
@@ -62,13 +62,20 @@
IFS=" ${T}${N},"
set -- $latlon
unset IFS
- SYSTEM_LAT=$1
- SYSTEM_LON=$2
+ SYSTEM_LAT="$1"
+ SYSTEM_LON="$2"
fi
+
+ if [ -z "$SYSTEM_LAT" -o -z "$SYSTEM_LON" ]; then
+ config_get latlon "$cfg" latitude
+ SYSTEM_LAT="$latlon"
+ config_get latlon "$cfg" longitude
+ SYSTEM_LON="$latlon"
+ fi
}
olsrd_find_config_file() {
- local cfg=$1
+ local cfg="$1"
validate_varname "$cfg" || return 0
config_get_bool ignore "$cfg" ignore 0
@@ -79,11 +86,11 @@
}
warning_invalid_value() {
- local package=$1
+ local package="$1"
validate_varname "$package" || package=
- local config=$2
+ local config="$2"
validate_varname "$config" || config=
- local option=$3
+ local option="$3"
validate_varname "$option" || option=
echo -n "Warning: Invalid value" 1>&2
@@ -98,13 +105,13 @@
}
olsrd_write_option() {
- local param=$1
- local cfg=$2
+ local param="$1"
+ local cfg="$2"
validate_varname "$cfg" || return 1
- local option=$3
+ local option="$3"
validate_varname "$option" || return 1
- local value=$4
- local option_type=$5
+ local value="$4"
+ local option_type="$5"
if [ "$option_type" = bool ]; then
case "$value" in
@@ -120,7 +127,7 @@
fi
if [ "$value" != "${value%%[G-Zg-z_-]*}" ]; then
- if [ "$value" != "yes" -a "$value" != "no" ]; then
+ if [ "$option" != "Ip6AddrType" -a "$value" != "yes" -a "$value" != "no" ]; then
value="\"$value\""
fi
fi
@@ -131,13 +138,13 @@
}
olsrd_write_plparam() {
- local param=$1
- local cfg=$2
+ local param="$1"
+ local cfg="$2"
validate_varname "$cfg" || return 1
- local option=$3
+ local option="$3"
validate_varname "$option" || return 1
- local value=$4
- local option_type=$5
+ local value="$4"
+ local option_type="$5"
local _option
if [ "$option_type" = bool ]; then
@@ -160,7 +167,7 @@
_option="$option"
if [ "$option" = 'hosts' ]; then
set -- $value
- option=$1
+ option="$1"
shift
value="$*"
fi
@@ -172,13 +179,13 @@
config_update_schema() {
unset IFS
- local schema_varname=$1
+ local schema_varname="$1"
validate_varname "$schema_varname" || return 1
- local command=$2
+ local command="$2"
validate_varname "$command" || return 1
- local option=$3
+ local option="$3"
validate_varname "$option" || return 1
- local value=$4
+ local value="$4"
local schema
local cur_option
@@ -213,12 +220,12 @@
config_write_options() {
unset IFS
- local schema=$1
- local cfg=$2
+ local schema="$1"
+ local cfg="$2"
validate_varname "$cfg" || return 1
- local write_func=$3
+ local write_func="$3"
[ -z "$write_func" ] && output_func=echo
- local write_param=$4
+ local write_param="$4"
local schema_entry
local option
local option_length
@@ -232,14 +239,14 @@
local position
for schema_entry in $schema; do
- default=${schema_entry#*[=]}
+ default="${schema_entry#*[=]}"
[ "$default" = "$schema_entry" ] && default=
- option=${schema_entry%%[=]*}
+ option="${schema_entry%%[=]*}"
IFS=':'
set -- $option
unset IFS
- option=$1
- option_type=$2
+ option="$1"
+ option_type="$2"
validate_varname "$option" || continue
[ -z "$option_type" ] || validate_varname "$option_type" || continue
[ "$option_type" = internal ] && continue
@@ -295,15 +302,22 @@
}
olsrd_write_olsrd() {
- local cfg=$1
+ local cfg="$1"
validate_varname "$cfg" || return 0
local ignore
+ local ipversion
config_get_bool ignore "$cfg" ignore 0
[ "$ignore" -ne 0 ] && return 0
[ "$OLSRD_COUNT" -gt 0 ] && return 0
+ config_get ipversion "$cfg" IpVersion
+ if [ "$ipversion" = "6and4" ]; then
+ OLSRD_IPVERSION_6AND4=1
+ config_set "$cfg" IpVersion '6'
+ fi
+
config_write_options "$OLSRD_OLSRD_SCHEMA" "$cfg" olsrd_write_option
echo
OLSRD_COUNT=$((OLSRD_COUNT + 1))
@@ -312,7 +326,7 @@
}
olsrd_write_ipcconnect() {
- local cfg=$1
+ local cfg="$1"
validate_varname "$cfg" || return 0
local ignore
@@ -330,7 +344,7 @@
}
olsrd_write_hna4() {
- local cfg=$1
+ local cfg="$1"
validate_varname "$cfg" || return 0
local ignore
@@ -357,7 +371,7 @@
}
olsrd_write_hna6() {
- local cfg=$1
+ local cfg="$1"
validate_varname "$cfg" || return 0
local ignore
@@ -384,7 +398,7 @@
}
olsrd_write_loadplugin() {
- local cfg=$1
+ local cfg="$1"
validate_varname "$cfg" || return 0
local ignore
local name
@@ -441,7 +455,7 @@
}
olsrd_write_interface() {
- local cfg=$1
+ local cfg="$1"
validate_varname "$cfg" || return 0
local ignore
local interfaces
@@ -497,6 +511,7 @@
}
olsrd_write_config() {
+ OLSRD_IPVERSION_6AND4=0
OLSRD_COUNT=0
config_foreach olsrd_write_olsrd olsrd
IPCCONNECT_COUNT=0
@@ -548,7 +563,20 @@
[ -z "$OLSRD_CONFIG_FILE" ] && return 1
+ local bindv6only='0'
+ if [ "$OLSRD_IPVERSION_6AND4" -ne 0 ]; then
+ bindv6only="$(cat /proc/sys/net/ipv6/bindv6only)"
+ echo 1 > /proc/sys/net/ipv6/bindv6only
+ fi
+
olsrd -f "$OLSRD_CONFIG_FILE" -nofork < /dev/null > /dev/null &
+
+ if [ "$OLSRD_IPVERSION_6AND4" -ne 0 ]; then
+ sed -e 's/^IpVersion[ ][ ]*6$/IpVersion 4/' < "$OLSRD_CONFIG_FILE" > /var/etc/olsrd.conf.ipv4
+ olsrd -f /var/etc/olsrd.conf.ipv4 -nofork < /dev/null > /dev/null &
+ sleep 3
+ echo "$bindv6only" > /proc/sys/net/ipv6/bindv6only
+ fi
}
stop() {
Index: net/olsrd/Makefile
===================================================================
--- net/olsrd/Makefile (Revision 13199)
+++ net/olsrd/Makefile (Arbeitskopie)
@@ -26,7 +26,6 @@
CATEGORY:=Network
TITLE:=OLSR (Optimized Link State Routing) daemon
URL:=http://www.olsr.org/
- MENU:=1
endef
define Package/olsrd
@@ -36,9 +35,15 @@
endef
define Package/olsrd/conffiles
-/etc/olsrd.conf
+/etc/config/olsrd
endef
+define Package/olsrd-mod-arprefresh
+ $(call Package/olsrd/template)
+ DEPENDS:=olsrd
+ TITLE:=Kernel ARP cache refresh plugin
+endef
+
define Package/olsrd-mod-dot-draw
$(call Package/olsrd/template)
DEPENDS:=olsrd
@@ -60,7 +65,7 @@
define Package/olsrd-mod-dyn-gw-plain
$(call Package/olsrd/template)
DEPENDS:=olsrd
- TITLE:=Simplified and more efficient dynamic internet gateway plugin by Sven-Ola Tuecke
+ TITLE:=Dynamic internet gateway plain plugin
endef
define Package/olsrd-mod-httpinfo
@@ -109,20 +114,24 @@
MANDIR="$(PKG_INSTALL_DIR)/usr/share/man" \
STRIP="true" \
INSTALL_LIB="true" \
- SUBDIRS="bmf dot_draw dyn_gw dyn_gw_plain httpinfo nameservice secure txtinfo" \
+ SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo nameservice secure txtinfo" \
all libs install install_libs
endef
define Package/olsrd/install
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DATA) ./files/olsrd.config $(1)/etc/config/olsrd
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/cfgparser/olsrd.conf.example $(1)/etc/olsrd.conf
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/olsrd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/olsrd.init $(1)/etc/init.d/olsrd
endef
+define Package/olsrd-mod-arprefresh/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/arprefresh/olsrd_arprefresh.so.* $(1)/usr/lib/
+endef
+
define Package/olsrd-mod-dot-draw/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/dot_draw/olsrd_dot_draw.so.* $(1)/usr/lib/
@@ -166,6 +175,7 @@
endef
$(eval $(call BuildPackage,olsrd))
+$(eval $(call BuildPackage,olsrd-mod-arprefresh))
$(eval $(call BuildPackage,olsrd-mod-dot-draw))
$(eval $(call BuildPackage,olsrd-mod-bmf))
$(eval $(call BuildPackage,olsrd-mod-dyn-gw))
Index: utils/dir300-flash/Makefile
===================================================================
--- utils/dir300-flash/Makefile (Revision 0)
+++ utils/dir300-flash/Makefile (Revision 0)
@@ -0,0 +1,62 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dir300-flash
+PKG_VERSION:=0.9.8
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://x-alina.freifunk-potsdam.de/downloads/dir300-flash
+PKG_MD5SUM:=5e3610d33f934744e12699f2c281b6ad
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/dir300-flash
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=Flashes a custom firmware on the DIR-300 wireless router
+ URL:=http://x-alina.freifunk-potsdam.de/
+endef
+
+define Download/ap61.ram
+ URL:=http://www.dd-wrt.com/dd-wrtv2/downloads/v24/Atheros%20WiSoc/Airlink%20101%20AR430W
+ FILE:=ap61.ram
+ MD5SUM:=4aaec2bff1edffe8c49003ed9363ad8b
+endef
+
+define Download/ap61.rom
+ URL:=http://www.dd-wrt.com/dd-wrtv2/downloads/v24/Atheros%20WiSoc/Airlink%20101%20AR430W
+ FILE:=ap61.rom
+ MD5SUM:=eb7817d202c297ae5dc6b6b897632601
+endef
+
+define Download/dir300redboot.zip
+ URL:=http://www.shadowandy.net/wp/wp-content/uploads
+ FILE:=dir300redboot.zip
+ MD5SUM:=5fdb24432aa200b508026215d821e126
+endef
+
+define Build/Compile
+ unzip -n '$(DL_DIR)/dir300redboot.zip' -d '$(PKG_BUILD_DIR)'
+endef
+
+define Package/dir300-flash/install
+ $(INSTALL_DIR) -- '$(1)/usr/sbin'
+ $(INSTALL_BIN) -- '$(PKG_BUILD_DIR)/dir300-flash.sh' '$(1)/usr/sbin/dir300-flash'
+ $(INSTALL_DIR) -- '$(1)/usr/share/dir300-flash'
+ $(INSTALL_DATA) -- '$(DL_DIR)/ap61.ram' '$(1)/usr/share/dir300-flash'
+ $(INSTALL_DATA) -- '$(DL_DIR)/ap61.rom' '$(1)/usr/share/dir300-flash'
+ $(INSTALL_DATA) -- '$(PKG_BUILD_DIR)/dir300redboot.rom' '$(1)/usr/share/dir300-flash'
+endef
+
+$(eval $(call BuildPackage,dir300-flash))
+$(eval $(call Download,ap61.ram))
+$(eval $(call Download,ap61.rom))
+$(eval $(call Download,dir300redboot.zip))
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
