12 files changed, 4 insertions, 41 deletions
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index 16f64be13e..8f0461395f 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -30,7 +30,7 @@ PREFERRED_VERSION_binutils-cross = "2.14.90.0.7"
 PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7"
 PREFERRED_VERSION_binutils = "2.14.90.0.7"
 
-PREFERRED_VERSION_unik-olsrd = "0.4.8"
+PREFERRED_VERSION_olsrd = "0.4.8"
 PREFERRED_VERSION_prism54-firmware = "1.0.3.0"
 PREFERRED_VERSION_usbutils = "0.11"
 
diff --git a/packages/meta/nylon-feed.bb b/packages/meta/nylon-feed.bb
index 63b99e3bf2..a0fd32f408 100644
--- a/packages/meta/nylon-feed.bb
+++ b/packages/meta/nylon-feed.bb
@@ -50,6 +50,7 @@ net-snmp \
 ntp \
 nylon-scripts \
 nylon-statistics \
+olsrd \
 openssh \
 openssl \
 openvpn \
@@ -70,7 +71,6 @@ sysvinit \
 tcpdump \
 tinc \
 timezones \
-unik-olsrd \
 usbutils \
 vtun \
 wireless-tools \
diff --git a/packages/meta/nylon-image-standard.bb b/packages/meta/nylon-image-standard.bb
index 65599af776..1cd0853678 100644
--- a/packages/meta/nylon-image-standard.bb
+++ b/packages/meta/nylon-image-standard.bb
@@ -10,13 +10,13 @@ NYLON_STANDARD = "\
 	ifplugd iproute2 iptables \
 	mobilemesh \
 	nylon-scripts \
+	olsrd \
 	ppp pciutils \
 	rp-pppoe \
 	shorewall \
 	tcpdump \
 	usbutils \
-	wireless-tools \
-	unik-olsrd"
+	wireless-tools"
 
 DEPENDS += "hostap-modules ntp \ 
 	${NYLON_STANDARD}"
diff --git a/packages/unik-olsrd/files/lib.diff b/packages/olsrd/files/init
index e69de29bb2..e69de29bb2 100644
--- a/packages/unik-olsrd/files/lib.diff
+++ b/packages/olsrd/files/init
diff --git a/packages/unik-olsrd/files/olsrd.conf b/packages/olsrd/files/lib.diff
index e69de29bb2..e69de29bb2 100644
--- a/packages/unik-olsrd/files/olsrd.conf
+++ b/packages/olsrd/files/lib.diff
diff --git a/packages/unik-olsrd/files/unik-olsrd b/packages/olsrd/files/olsrd.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/unik-olsrd/files/unik-olsrd
+++ b/packages/olsrd/files/olsrd.conf
diff --git a/packages/unik-olsrd/unik-olsrd-0.4.5/unik-olsrd-0.4.5_Makefiles.diff b/packages/olsrd/olsrd_0.4.7.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/unik-olsrd/unik-olsrd-0.4.5/unik-olsrd-0.4.5_Makefiles.diff
+++ b/packages/olsrd/olsrd_0.4.7.bb
diff --git a/packages/unik-olsrd/unik-olsrd_0.4.5.bb b/packages/olsrd/olsrd_0.4.8.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/unik-olsrd/unik-olsrd_0.4.5.bb
+++ b/packages/olsrd/olsrd_0.4.8.bb
diff --git a/packages/unik-olsrd/unik-olsrd_0.4.6.bb b/packages/olsrd/olsrd_cvs.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/unik-olsrd/unik-olsrd_0.4.6.bb
+++ b/packages/olsrd/olsrd_cvs.bb
diff --git a/packages/unik-olsrd/unik-olsrd_0.4.7.bb b/packages/unik-olsrd/unik-olsrd_0.4.7.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/unik-olsrd/unik-olsrd_0.4.7.bb
+++ /dev/null
diff --git a/packages/unik-olsrd/unik-olsrd_0.4.8.bb b/packages/unik-olsrd/unik-olsrd_0.4.8.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/unik-olsrd/unik-olsrd_0.4.8.bb
+++ /dev/null
diff --git a/packages/unik-olsrd/unik-olsrd_cvs.bb b/packages/unik-olsrd/unik-olsrd_cvs.bb
deleted file mode 100644
index 122f76cc53..0000000000
--- a/packages/unik-olsrd/unik-olsrd_cvs.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "OLSR mesh routing daemon"
-HOMEPAGE = "http://www.olsr.org"
-DESCRIPTION_unik-olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "BSD"
-PV = "cvs${CVSDATE}"
-
-SRC_URI="cvs://anonymous@cvs.sourceforge.net/cvsroot/olsrd;module=olsrd-current \
-	file://unik-olsrd \
-	file://olsrd.conf"
-
-PACKAGES =+ "unik-olsrd-libs"
-FILES_unik-olsrd-libs = "${libdir}"
-
-S = "${WORKDIR}/olsrd-current"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "unik-olsrd"
-INITSCRIPT_PARAMS = "defaults"
-
-do_compile() {
-	touch .depend
-	touch src/cfgparser/.depend
-	oe_runmake OS=linux clean all libs
-}
-
-do_install () {
-	oe_runmake INSTALL_PREFIX=${D} install install_libs
-	install -d ${D}/${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/unik-olsrd ${D}/${sysconfdir}/init.d
-	install -m 644 ${WORKDIR}/olsrd.conf ${D}/${sysconfdir}
-}
-
-CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"