diff options
author | Holger Schurig <schurig@mn-solutions.de> | 2005-03-10 12:44:24 +0000 |
---|---|---|
committer | Holger Schurig <schurig@mn-solutions.de> | 2005-03-10 12:44:24 +0000 |
commit | 4679e14a8c614860d889040bc28f94129a18759b (patch) | |
tree | 915d5287ad8a33ae7c8f2cd7474cce27de577d01 | |
parent | f692541aec3b65c816a2e1dc6edc56d257cc8b92 (diff) |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into mnz66.mn-solutions.de:/usr/src/oe/p
2005/03/10 13:00:34+01:00 (none)!br1
olsrd updates:
* new download location on olsr.org.
* cvs version needs OS=linux also on make install.
* deleted obsolete version 0.4.7
BKrev: 42304128wwcRjuTDkK0wWTAdK5bNRg
-rw-r--r-- | packages/olsrd/olsrd_0.4.7.bb | 30 | ||||
-rw-r--r-- | packages/olsrd/olsrd_0.4.8.bb | 2 | ||||
-rw-r--r-- | packages/olsrd/olsrd_cvs.bb | 2 |
3 files changed, 2 insertions, 32 deletions
diff --git a/packages/olsrd/olsrd_0.4.7.bb b/packages/olsrd/olsrd_0.4.7.bb deleted file mode 100644 index cd103a1203..0000000000 --- a/packages/olsrd/olsrd_0.4.7.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "OLSR mesh routing daemon" -DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon - optional libraries" -HOMEPAGE = "http://www.olsr.org" -MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" -SECTION = "console/network" -PRIORITY = "optional" -LICENSE = "GPL" -PR = "r1" - -SRC_URI="http://www.olsr.org/downloadolsr.cgi?file=olsrd-${PV}.tar.bz2 \ - file://init \ - file://lib.diff;patch=1" - -PACKAGES =+ "olsrd-libs" -FILES_olsrd-libs = "${libdir}" - -S = "${WORKDIR}/olsrd-${PV}" - -do_compile() { - oe_runmake all libs -} - -do_install () { - oe_runmake INSTALL_PREFIX=${D} install install_libs - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/olsrd -} - -CONFFILES_${PN} = "/etc/olsrd.conf" - diff --git a/packages/olsrd/olsrd_0.4.8.bb b/packages/olsrd/olsrd_0.4.8.bb index 54925362bd..9d2e43ac3f 100644 --- a/packages/olsrd/olsrd_0.4.8.bb +++ b/packages/olsrd/olsrd_0.4.8.bb @@ -6,7 +6,7 @@ SECTION = "console/network" PRIORITY = "optional" LICENSE = "BSD" -SRC_URI="http://www.olsr.org/downloadolsr.cgi?file=olsrd-${PV}.tar.bz2 \ +SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \ file://init \ file://olsrd.conf" diff --git a/packages/olsrd/olsrd_cvs.bb b/packages/olsrd/olsrd_cvs.bb index 2aa5729992..49f7e0a84b 100644 --- a/packages/olsrd/olsrd_cvs.bb +++ b/packages/olsrd/olsrd_cvs.bb @@ -28,7 +28,7 @@ do_compile() { } do_install () { - oe_runmake INSTALL_PREFIX=${D} install install_libs + oe_runmake OS=linux INSTALL_PREFIX=${D} install install_libs install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/olsrd install -m 644 ${WORKDIR}/olsrd.conf ${D}${sysconfdir} |