Merge oe-devel@oe-devel.bkbits.net:openembedded

into hyperion.kergoth.com:/home/kergoth/code/openembedded

2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.

BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA

8 files changed, 0 insertions, 258 deletions

diff --git a/unik-olsrd/files/lib.diff b/unik-olsrd/files/lib.diff
deleted file mode 100644
index f3935cc53d..0000000000
--- a/unik-olsrd/files/lib.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nurb olsrd-0.4.7/Makefile olsrd-0.4.7.ver/Makefile
---- olsrd-0.4.7/Makefile	2004-09-07 18:10:24.000000000 +0200
-+++ olsrd-0.4.7.ver/Makefile	2004-11-05 13:12:34.253350872 +0100
-@@ -57,7 +57,7 @@
- 
- libs: 
- 	for i in lib/*; do \
--		$(MAKE) -C $$i; \
-+		$(MAKE) LDFLAGS+=-Wl,--version-script=../../version.txt -C $$i; \
- 	done; 
- 
- clean_libs: 
-diff -Nurb olsrd-0.4.7/version.txt olsrd-0.4.7.ver/version.txt
---- olsrd-0.4.7/version.txt	1970-01-01 01:00:00.000000000 +0100
-+++ olsrd-0.4.7.ver/version.txt	2004-11-05 13:10:24.731041256 +0100
-@@ -0,0 +1,7 @@
-+VERS_1.0 {
-+   global:
-+        plugin_interface_version;
-+        plugin_io;
-+        register_olsr_data;
-+   local: *;
-+};
diff --git a/unik-olsrd/files/olsrd.conf b/unik-olsrd/files/olsrd.conf
deleted file mode 100644
index e69de29bb2..0000000000
--- a/unik-olsrd/files/olsrd.conf
+++ /dev/null
diff --git a/unik-olsrd/files/unik-olsrd b/unik-olsrd/files/unik-olsrd
deleted file mode 100644
index 8b1ffa6036..0000000000
--- a/unik-olsrd/files/unik-olsrd
+++ /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=unik-olsrd
-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/unik-olsrd/unik-olsrd-0.4.5/unik-olsrd-0.4.5_Makefiles.diff b/unik-olsrd/unik-olsrd-0.4.5/unik-olsrd-0.4.5_Makefiles.diff
deleted file mode 100644
index 19e3a41bc1..0000000000
--- a/unik-olsrd/unik-olsrd-0.4.5/unik-olsrd-0.4.5_Makefiles.diff
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -Nurb unik-olsrd-0.4.5/Makefile unik-olsrd-0.4.5.mod/Makefile
---- unik-olsrd-0.4.5/Makefile	2004-06-29 12:17:40.000000000 +0200
-+++ unik-olsrd-0.4.5.mod/Makefile	2004-08-03 14:44:45.935335232 +0200
-@@ -5,7 +5,7 @@
- INSTALL_PREFIX ?=
- 
- 
--# Keep OS spesific files last
-+# Keep OS specific files last
- 
- SRCS=	src/interface.c src/parser.c src/build_msg.c \
- 	src/scheduler.c src/main.c src/two_hop_neighbor_table.c \
-@@ -48,18 +48,34 @@
- 	src/linux/net.h src/kernel_routes.h \
- 	src/linux/link_layer.h
- 
--all:	olsrd
-+all:	olsrd libs
- 
- olsrd:	$(OBJS)
- 	$(CC) $(LIBS) -o bin/$@ $(OBJS)
- 
--clean:
-+libs: 
-+	for i in lib/*; do \
-+		$(MAKE) -C $$i; \
-+	done; 
-+
-+clean: clean_libs
- 	rm -f $(OBJS)
-+	rm -f bin/olsrd
-+	
-+clean_libs: 
-+	for i in lib/*; do \
-+		$(MAKE) -C $$i clean; \
-+	done; 
- 
- install_bin:
- 	install -D -m 755 bin/olsrd $(INSTALL_PREFIX)/usr/sbin/olsrd
- 
--install: install_bin
-+install_libs:
-+	for i in lib/*; do \
-+		$(MAKE) -C $$i LIBDIR=$(INSTALL_PREFIX)/usr/lib install; \
-+	done; 	
-+ 
-+install: install_bin install_libs
- 	@echo olsrd uses the configfile $(INSTALL_PREFIX)/etc/olsr.conf
- 	@echo a default configfile. A sample configfile
- 	@echo can be installed
-diff -Nurb unik-olsrd-0.4.5/lib/dot_draw/Makefile unik-olsrd-0.4.5.mod/lib/dot_draw/Makefile
---- unik-olsrd-0.4.5/lib/dot_draw/Makefile	2004-06-29 12:17:02.000000000 +0200
-+++ unik-olsrd-0.4.5.mod/lib/dot_draw/Makefile	2004-08-03 14:48:22.986338464 +0200
-@@ -5,12 +5,12 @@
- 
- #Alter this file to fit your needs
- 
--CC=gcc
--NAME=olsrd_dot_draw.so.0.1
--LIBDIR=/usr/lib
-+CC ?= gcc
-+NAME = olsrd_dot_draw.so.0.1
-+LIBDIR ?= $(INSTALL_PREFIX)/usr/lib
- # -fPIC creates position independent code
--CFLAGS=-Wall -fPIC -g # Uncomment -g for debugging
--LIBS=-lc -lm
-+MYFLAGS ?= -Wall -fPIC -g # Uncomment -g for debugging
-+LIBS = -lc -lm
- 
- #Sourcefiles
- #add yours here
-@@ -32,13 +32,13 @@
- 
- 
- plugin: $(OBJS)
--	$(CC) -g -shared -Wl,-soname,$(NAME) \
-+	$(CC) $(LDFLAGS) $(MYFLAGS) -g -shared -Wl,-soname,$(NAME) \
- 	-o $(NAME) $(OBJS) $(LIBS)
- 
- 
- install:
--	install -m 755 $(NAME) $(LIBDIR)/$(NAME)
-+	install -D -m 755 $(NAME) $(LIBDIR)/$(NAME)
- 	/sbin/ldconfig -n $(LIBDIR)
- 
- clean:
--	rm -f $(OBJS)
-+	rm -f $(OBJS) $(NAME)
-diff -Nurb unik-olsrd-0.4.5/lib/dyn_gw/Makefile unik-olsrd-0.4.5.mod/lib/dyn_gw/Makefile
---- unik-olsrd-0.4.5/lib/dyn_gw/Makefile	2004-06-29 12:17:02.000000000 +0200
-+++ unik-olsrd-0.4.5.mod/lib/dyn_gw/Makefile	2004-08-03 14:48:11.108144224 +0200
-@@ -5,12 +5,12 @@
- 
- #Alter this file to fit your needs
- 
--CC=gcc
--NAME=olsrd_dyn_gw.so.0.1
--LIBDIR=/usr/lib
-+CC ?= gcc
-+NAME = olsrd_dyn_gw.so.0.1
-+LIBDIR ?= $(INSTALL_PREFIX)/usr/lib
- # -fPIC creates position independent code
--CFLAGS=-Wall -fPIC -g # Uncomment -g for debugging
--LIBS=-lc -lm
-+MYFLAGS ?= -Wall -fPIC -g # Uncomment -g for debugging
-+LIBS = -lc -lm
- 
- #Sourcefiles
- #add yours here
-@@ -32,13 +32,13 @@
- 
- 
- plugin: $(OBJS)
--	$(CC) -g -shared -Wl,-soname,$(NAME) \
-+	$(CC) $(LDFLAGS) $(MYFLAGS) -g -shared -Wl,-soname,$(NAME) \
- 	-o $(NAME) $(OBJS) $(LIBS)
- 
- 
- install:
--	install -m 755 $(NAME) $(LIBDIR)/$(NAME)
-+	install -D -m 755 $(NAME) $(LIBDIR)/$(NAME)
- 	/sbin/ldconfig -n $(LIBDIR)
- 
- clean:
--	rm -f $(OBJS)
-+	rm -f $(OBJS) $(NAME)
-diff -Nurb unik-olsrd-0.4.5/lib/powerinfo/Makefile unik-olsrd-0.4.5.mod/lib/powerinfo/Makefile
---- unik-olsrd-0.4.5/lib/powerinfo/Makefile	2004-06-29 12:17:02.000000000 +0200
-+++ unik-olsrd-0.4.5.mod/lib/powerinfo/Makefile	2004-08-03 15:00:23.850750416 +0200
-@@ -5,12 +5,12 @@
- 
- #Alter this file to fit your needs
- 
--CC=gcc
--NAME=olsrd_power.so.0.1
--LIBDIR=/usr/lib
-+CC ?= gcc
-+NAME = olsrd_power.so.0.1
-+LIBDIR ?= $(INSTALL_PREFIX)/usr/lib
- # -fPIC creates position independent code
--CFLAGS=-Wall -fPIC -g # Uncomment -g for debugging
--LIBS=-lc -lm
-+MYFLAGS ?= -Wall -fPIC -g # Uncomment -g for debugging
-+LIBS = -lc -lm
- 
- #Sourcefiles
- #add yours here
-@@ -32,13 +32,13 @@
- 
- 
- plugin: $(OBJS)
--	$(CC) -g -shared -Wl,-soname,$(NAME) \
-+	$(CC) $(LDFLAGS) $(MYFLAGS) -g -shared -Wl,-soname,$(NAME) \
- 	-o $(NAME) $(OBJS) $(LIBS)
- 
- 
- install:
--	install -m 755 $(NAME) $(LIBDIR)/$(NAME)
-+	install -D -m 755 $(NAME) $(LIBDIR)/$(NAME)
- 	/sbin/ldconfig -n $(LIBDIR)
- 
- clean:
--	rm -f $(OBJS)
-+	rm -f $(OBJS) $(NAME)
-Files unik-olsrd-0.4.5/lib/powerinfo/uolsrd_power.so.0.1 and unik-olsrd-0.4.5.mod/lib/powerinfo/uolsrd_power.so.0.1 differ
-diff -Nurb unik-olsrd-0.4.5/lib/secure/Makefile unik-olsrd-0.4.5.mod/lib/secure/Makefile
---- unik-olsrd-0.4.5/lib/secure/Makefile	2004-06-29 12:17:02.000000000 +0200
-+++ unik-olsrd-0.4.5.mod/lib/secure/Makefile	2004-08-03 14:47:49.992354312 +0200
-@@ -6,12 +6,11 @@
- #Alter this file to fit your needs
- 
- CC ?= gcc
--NAME ?= olsrd_secure.so.0.2
--INSTALL_PREFIX ?=
-+NAME = olsrd_secure.so.0.2
- LIBDIR ?= $(INSTALL_PREFIX)/usr/lib
- # -fPIC creates position independent code
--CFLAGS ?= -Wall -fPIC -g #-DDEBUG# Uncomment -g for debugging
--LIBS ?= -lc -lssl -lcrypto -lm
-+MYFLAGS = -Wall -fPIC -g #-DDEBUG# Uncomment -g for debugging
-+LIBS = -lc -lssl -lcrypto -lm
- 
- #Sourcefiles
- #add yours here
-@@ -33,7 +32,7 @@
- 
- 
- plugin: $(OBJS)
--	$(CC) -g -shared -Wl,-soname,$(NAME) \
-+	$(CC) $(LDFLAGS) $(MYFLAGS) -g -shared -Wl,-soname,$(NAME) \
- 	-o $(NAME) $(OBJS) $(LIBS)
- 
- 
-@@ -42,4 +41,4 @@
- 	/sbin/ldconfig -n $(LIBDIR)
- 
- clean:
--	rm -f $(OBJS)
-+	rm -f $(OBJS) $(NAME)
diff --git a/unik-olsrd/unik-olsrd_0.4.5.bb b/unik-olsrd/unik-olsrd_0.4.5.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/unik-olsrd/unik-olsrd_0.4.5.bb
+++ /dev/null
diff --git a/unik-olsrd/unik-olsrd_0.4.6.bb b/unik-olsrd/unik-olsrd_0.4.6.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/unik-olsrd/unik-olsrd_0.4.6.bb
+++ /dev/null
diff --git a/unik-olsrd/unik-olsrd_0.4.7.bb b/unik-olsrd/unik-olsrd_0.4.7.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/unik-olsrd/unik-olsrd_0.4.7.bb
+++ /dev/null
diff --git a/unik-olsrd/unik-olsrd_cvs.bb b/unik-olsrd/unik-olsrd_cvs.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/unik-olsrd/unik-olsrd_cvs.bb
+++ /dev/null