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

into null.(none):/data/mtx/oe/openembedded

2004/12/20 19:12:09+01:00 (none)!br1
rename unik-olsrd -> olsrd

BKrev: 41c7160fNmZNA3byVti3-GIavJY4_w

diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index 16f64be..8f04613 100644 (file)
--- 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 63b99e3..a0fd32f 100644 (file)
--- 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 65599af..1cd0853 100644 (file)
--- 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/olsrd/files/init b/packages/olsrd/files/init
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/olsrd/files/lib.diff b/packages/olsrd/files/lib.diff
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/olsrd/files/olsrd.conf b/packages/olsrd/files/olsrd.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/olsrd/olsrd_0.4.7.bb b/packages/olsrd/olsrd_0.4.7.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/olsrd/olsrd_0.4.8.bb b/packages/olsrd/olsrd_0.4.8.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/olsrd/olsrd_cvs.bb b/packages/olsrd/olsrd_cvs.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/unik-olsrd/files/lib.diff b/packages/unik-olsrd/files/lib.diff
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/unik-olsrd/files/olsrd.conf b/packages/unik-olsrd/files/olsrd.conf
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/unik-olsrd/files/unik-olsrd b/packages/unik-olsrd/files/unik-olsrd
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/unik-olsrd/unik-olsrd-0.4.5/unik-olsrd-0.4.5_Makefiles.diff b/packages/unik-olsrd/unik-olsrd-0.4.5/unik-olsrd-0.4.5_Makefiles.diff
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/unik-olsrd/unik-olsrd_0.4.5.bb b/packages/unik-olsrd/unik-olsrd_0.4.5.bb
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/unik-olsrd/unik-olsrd_0.4.6.bb b/packages/unik-olsrd/unik-olsrd_0.4.6.bb
deleted file mode 100644 (file)
index e69de29..0000000

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 (file)
index e69de29..0000000

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 (file)
index e69de29..0000000

diff --git a/packages/unik-olsrd/unik-olsrd_cvs.bb b/packages/unik-olsrd/unik-olsrd_cvs.bb
deleted file mode 100644 (file)
index 122f76c..0000000
--- 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"