Last part of OLSR cleanup

olsrd:
 * rename directory containing patches, ... to 'files'
 * rename base directory for olsrd 'olsrd'

5 files changed, 0 insertions, 279 deletions

diff --git a/packages/olsr/olsrd/.mtn2git_empty b/packages/olsr/olsrd/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/olsr/olsrd/.mtn2git_empty
+++ /dev/null
diff --git a/packages/olsr/olsrd/init b/packages/olsr/olsrd/init
deleted file mode 100644
index 46b2aaabd2..0000000000
--- a/packages/olsr/olsrd/init
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/olsrd
-NAME="olsr.org"
-DESC="OLSR routing protocol daemon"
-
-test -x $DAEMON || exit 0
-
-set -e
-
-case "$1" in
-  start)
-	echo "Starting $DESC: $NAME"
-	start-stop-daemon -S -x $DAEMON -- -d 0;
-	echo "done."
-	;;
-  stop)
-	echo "Stopping $DESC: $NAME "
-	start-stop-daemon -K -x $DAEMON
-	echo "done."
-	;;
-  restart|force-reload)
-	echo "restarting $DESC: $NAME "
-	$0 stop
-	sleep 5
-	$0 start
-	exit;
-	;;
-  *)
-	echo "Usage: /etc/init.d/$NAME {start|stop|restart}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/packages/olsr/olsrd/olsrd-0.5.5-unbreak-makefile.patch b/packages/olsr/olsrd/olsrd-0.5.5-unbreak-makefile.patch
deleted file mode 100644
index c08a49524c..0000000000
--- a/packages/olsr/olsrd/olsrd-0.5.5-unbreak-makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: olsrd-a5b9cf969979/Makefile
-===================================================================
---- olsrd-a5b9cf969979.orig/Makefile	2008-02-06 19:32:49.000000000 +0100
-+++ olsrd-a5b9cf969979/Makefile	2008-06-23 15:33:35.000000000 +0200
-@@ -95,9 +95,8 @@
- install: install_olsrd
- 
- install_bin:
--		mkdir -p $(SBINDIR)
--		install -m 755 $(EXENAME) $(SBINDIR)
--		$(STRIP) $(SBINDIR)/$(EXENAME)
-+		mkdir -p $(INSTALL_PREFIX)$(SBINDIR)
-+		install -m 755 $(EXENAME) $(INSTALL_PREFIX)$(SBINDIR)
- 
- install_olsrd:	install_bin
- 		@echo ========= C O N F I G U R A T I O N - F I L E ============
-@@ -109,16 +108,15 @@
- 		@echo per default.
- 		@echo can be found at files/olsrd.conf.default.lq
- 		@echo ==========================================================
--		mkdir -p $(ETCDIR)
--		-cp -i files/olsrd.conf.default.lq $(CFGFILE)
-+		mkdir -p $(INSTALL_PREFIX)$(ETCDIR)
- 		@echo -------------------------------------------
- 		@echo Edit $(CFGFILE) before running olsrd!!
- 		@echo -------------------------------------------
- 		@echo Installing manpages $(EXENAME)\(8\) and $(CFGNAME)\(5\)
--		mkdir -p $(MANDIR)/man8/
--		cp files/olsrd.8.gz $(MANDIR)/man8/$(EXENAME).8.gz
--		mkdir -p $(MANDIR)/man5/
--		cp files/olsrd.conf.5.gz $(MANDIR)/man5/$(CFGNAME).5.gz
-+		mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man8/
-+		cp files/olsrd.8.gz $(INSTALL_PREFIX)$(MANDIR)/man8/$(EXENAME).8.gz
-+		mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man5/
-+		cp files/olsrd.conf.5.gz $(INSTALL_PREFIX)$(MANDIR)/man5/$(CFGNAME).5.gz
- 
- tags:
- 		$(TAGCMD) -o $(TAGFILE) $(TAG_SRCS)
-@@ -140,7 +138,7 @@
- 		$(MAKECMD) -C lib LIBDIR=$(LIBDIR) clean
- 
- libs_install install_libs:
--		$(MAKECMD) -C lib LIBDIR=$(LIBDIR) install
-+		$(MAKECMD) -C lib LIBDIR=$(INSTALL_PREFIX)$(LIBDIR) install
- 
- httpinfo:
- 		$(MAKECMD) -C lib/httpinfo clean
diff --git a/packages/olsr/olsrd/olsrd.conf b/packages/olsr/olsrd/olsrd.conf
deleted file mode 100644
index dbd0472803..0000000000
--- a/packages/olsr/olsrd/olsrd.conf
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-# olsr.org configuration file
-#
-
-#
-# Periodically print the internal state, including information on
-# route calculation
-#
-
-DebugLevel		2
-
-#
-# Clear the screen each time the internal state changes
-#
-
-ClearScreen		yes
-
-#
-# IP version to use
-#
-
-IpVersion		4
-
-#
-# IPv4 HNAs - syntax: netaddr netmask
-#
-
-Hna4
-{
-#	0.0.0.0 0.0.0.0
-}
-
-#
-# Do not use hysteresis
-#
-
-UseHysteresis		no
-
-#
-# If using hysteresis, use "smooth" parameters
-#
-
-HystScaling		0.10
-HystThrHigh		0.80
-HystThrLow		0.30
-
-#
-# Which neighbours should be advertised via TC messages?
-#
-# 0 - only advertise our MPR selectors
-# 1 - advertise our MPR selectors and our MPRs
-# 2 - advertise all neighbors
-#
-
-TcRedundancy		2
-
-#
-# Specifies by how many MPRs each two-hop neighbour should be covered
-#
-
-MprCoverage		9
-
-#
-# Enable the link quality extensions?
-#
-# 0 - no
-# 1 - yes, use link quality for MPR selection
-# 2 - yes, use link quality for MPR selection and routing
-#
-
-LinkQualityLevel	2
-
-#
-# Windows size for packet loss calculation
-#
-
-LinkQualityWinSize	20
-
-#
-# Load the dot draw plugin
-#
-
-LoadPlugin "olsrd_httpinfo.so.0.1"
-{
-	PlParam "Port" "8080"
-	PlParam "Net" "192.168.0.0 255.255.255.0"
-}
-
-#LoadPlugin "olsrd_dot_draw.so.0.3"
-#{
-	# accept connection from IP:
-	# default 127.0.0.1 (localhost)	
-	#PlParam     "accept" "192.168.0.5"
-#}
-
-#
-# Interfaces - 
-# change to the name of your WLAN interface
-#
-
-Interface "eth0" "wlan0" "wlan1" "ath0" "ath1"
-{
-
-	#
-	# HELLO interval in seconds (float)
-	#
-
-	HelloInterval		2.0
-
-	#
-	# HELLO validity time
-	#
-
-	HelloValidityTime	40.0
-
-	#
-	# TC interval in seconds (float)
-	#
-
-	TcInterval		3.0
-
-	#
-	# TC validity time
-	#
-
-	TcValidityTime		15.0
-
-	#
-	# MID interval in seconds (float)
-	#
-
-	MidInterval		5.0
-
-	#
-	# MID validity time
-	#
-
-	MidValidityTime		15.0
-
-	#
-	# HNA interval in seconds (float)
-	#
-
-	HnaInterval		5.0
-
-	#
-	# HNA validity time
-	#
-
-	HnaValidityTime 	15.0
-}
diff --git a/packages/olsr/olsrd/unbreak-makefile.patch b/packages/olsr/olsrd/unbreak-makefile.patch
deleted file mode 100644
index cdf31df414..0000000000
--- a/packages/olsr/olsrd/unbreak-makefile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- /tmp/Makefile	2007-08-26 13:59:42.264688053 +0200
-+++ olsrd-0.5.3/Makefile	2007-08-26 14:02:46.059161904 +0200
-@@ -89,9 +89,8 @@
- install: install_olsrd
- 
- install_bin:
--		mkdir -p $(SBINDIR)
--		install -m 755 $(EXENAME) $(SBINDIR)
--		$(STRIP) $(SBINDIR)/$(EXENAME)
-+		mkdir -p $(INSTALL_PREFIX)$(SBINDIR)
-+		install -m 755 $(EXENAME) $(INSTALL_PREFIX)$(SBINDIR)
- 
- install_olsrd:	install_bin
- 		@echo ========= C O N F I G U R A T I O N - F I L E ============
-@@ -100,16 +99,16 @@
- 		@echo configfile can be installed. Note that a LQ-based configfile
- 		@echo can be found at files/olsrd.conf.default.lq
- 		@echo ==========================================================
--		mkdir -p $(ETCDIR)
-+		mkdir -p $(INSTALL_PREFIX)$(ETCDIR)
- 		-cp -i files/olsrd.conf.default.rfc $(CFGFILE)
- 		@echo -------------------------------------------
- 		@echo Edit $(CFGFILE) before running olsrd!!
- 		@echo -------------------------------------------
- 		@echo Installing manpages olsrd\(8\) and olsrd.conf\(5\)
--		mkdir -p $(MANDIR)/man8/
--		cp files/olsrd.8.gz $(MANDIR)/man8/olsrd.8.gz
--		mkdir -p $(MANDIR)/man5/
--		cp files/olsrd.conf.5.gz $(MANDIR)/man5/olsrd.conf.5.gz
-+		mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man8/
-+		cp files/olsrd.8.gz $(INSTALL_PREFIX)$(MANDIR)/man8/olsrd.8.gz
-+		mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man5/
-+		cp files/olsrd.conf.5.gz $(INSTALL_PREFIX)$(MANDIR)/man5/olsrd.conf.5.gz
- 
- tags:
- 		$(TAGCMD) -o $(TAGFILE) $(TAG_SRCS)
-@@ -131,7 +130,7 @@
- 		$(MAKECMD) -C lib LIBDIR=$(LIBDIR) clean
- 
- libs_install install_libs:
--		$(MAKECMD) -C lib LIBDIR=$(LIBDIR) install
-+		$(MAKECMD) -C lib LIBDIR=$(INSTALL_PREFIX)$(LIBDIR) install
- 
- httpinfo:
- 		$(MAKECMD) -C lib/httpinfo clean