diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-07 00:34:07 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-07 00:34:07 +0000 |
| commit | 2f8521c6d1173dd650d9ae2bba8c18e690fa3b1f (patch) | |
| tree | 06bc2b997b60797bc42f696f3427f92890089d2b /packages/olsrd | |
| parent | 0d0bf315513039bd8560ac91865c7174e789d675 (diff) | |
| parent | 6e90aae26efa66553063b74b9afa9563b70fb982 (diff) | |
merge of '603b2d0c7e4ad80e5779bd3bbdb822331cc0ea2b'
and '6ab53da82d157971966f5a17d0c29d54df22cac9'
Diffstat (limited to 'packages/olsrd')
| -rw-r--r-- | packages/olsrd/files/unbreak-makefile.patch | 45 | ||||
| -rw-r--r-- | packages/olsrd/olsrd.inc | 14 | ||||
| -rw-r--r-- | packages/olsrd/olsrd_0.5.3.bb | 14 |
3 files changed, 67 insertions, 6 deletions
diff --git a/packages/olsrd/files/unbreak-makefile.patch b/packages/olsrd/files/unbreak-makefile.patch new file mode 100644 index 0000000000..cdf31df414 --- /dev/null +++ b/packages/olsrd/files/unbreak-makefile.patch @@ -0,0 +1,45 @@ +--- /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 diff --git a/packages/olsrd/olsrd.inc b/packages/olsrd/olsrd.inc index 96341d9d88..990d8a1678 100644 --- a/packages/olsrd/olsrd.inc +++ b/packages/olsrd/olsrd.inc @@ -4,15 +4,11 @@ DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon - optional libraries" SECTION = "console/network" PRIORITY = "optional" LICENSE = "BSD" -RDEPENDS_olsrd = "olsrd-libs" SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \ file://init \ file://olsrd.conf" -PACKAGES =+ "olsrd-libs" -FILES_olsrd-libs = "${libdir}" - S = "${WORKDIR}/olsrd-${PV}" inherit update-rc.d @@ -27,14 +23,20 @@ do_configure() { } do_compile() { - oe_runmake + oe_runmake } do_install () { - oe_runmake OS=linux INSTALL_PREFIX=${D} install install_libs + oe_runmake OS=linux INSTALL_PREFIX=${D} STRIP=echo 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} } + +PACKAGES =+ "olsrd-libs" +FILES_olsrd-libs = "${libdir}/*.so.*" + +RDEPENDS_${PN} = "olsrd-libs" + CONFFILES_${PN} = "${sysconfdir}/olsrd.conf" diff --git a/packages/olsrd/olsrd_0.5.3.bb b/packages/olsrd/olsrd_0.5.3.bb new file mode 100644 index 0000000000..5bc448a126 --- /dev/null +++ b/packages/olsrd/olsrd_0.5.3.bb @@ -0,0 +1,14 @@ +require olsrd.inc +PR = "r0" + +SRC_URI="http://www.olsr.org/releases/0.5/olsrd-${PV}.tar.bz2 \ + file://init \ + file://olsrd.conf \ + file://unbreak-makefile.patch;patch=1" + +do_compile() { + oe_runmake OS=linux clean + touch .depend + touch src/cfgparser/.depend + oe_runmake OS=linux all libs +} |