Second part of OLSR cleanup.

olsrd 0.5.5: Recipe for new version.
olsrd 0.5.3: Simplified.
olsrd.inc:
 * package each OLSR plugin as optional binary package
 * do_compile() suitable for 0.5 series
 * some formatting fixes

diff --git a/packages/olsr/olsrd.inc b/packages/olsr/olsrd.inc
index e668f11..7fd25c2 100644 (file)
--- a/packages/olsr/olsrd.inc
+++ b/packages/olsr/olsrd.inc
@@ -1,12 +1,11 @@
 DESCRIPTION = "OLSR mesh routing daemon"
 HOMEPAGE = "http://www.olsr.org"
-DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "BSD"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
-SRC_URI="http://www.olsr.org/releases/${MAJ_VER}/olsrd-${PV}.tar.bz2 \
+SRC_URI = "http://www.olsr.org/releases/${MAJ_VER}/olsrd-${PV}.tar.bz2 \
        file://init \
        file://olsrd.conf"
 
@@ -16,28 +15,56 @@ inherit update-rc.d
 
 INITSCRIPT_NAME = "olsrd"
 INITSCRIPT_PARAMS = "defaults"
-EXTRA_OEMAKE="MAKEFLAGS=-I${WORKDIR}/olsrd-${PV}"
-
+EXTRA_OEMAKE = "MAKEFLAGS=-I${WORKDIR}/olsrd-${PV}"
 
 do_configure() {
        oe_runmake OS=linux clean
 }
 
 do_compile() {
-        oe_runmake 
+  oe_runmake OS=linux clean
+  touch .depend
+  touch src/cfgparser/.depend
+  oe_runmake OS=linux all libs
 }
 
 do_install () {
        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-plugin-dyngw \
+  olsrd-plugin-dyngw-plain \
+  olsrd-plugin-httpinfo \
+  olsrd-plugin-nameservice \
+  olsrd-plugin-quagga \
+  olsrd-plugin-tas \
+  olsrd-plugin-pgraph \
+  olsrd-plugin-bmf \
+  olsrd-plugin-txtinfo \
+  olsrd-plugin-arprefresh \
+  olsrd-plugin-secure \
+  olsrd-plugin-dotdraw \
+  olsrd-plugin-mini \
+  "
 
-PACKAGES =+ "olsrd-libs"
-FILES_olsrd-libs = "${libdir}/*.so.*"
-
-RDEPENDS_${PN} = "olsrd-libs"
+FILES_olsrd-plugin-dyngw = "${libdir}/${PN}_dyn_gw.so.*"
+FILES_olsrd-plugin-dyngw-plain = "${libdir}/${PN}_dyn_gw_plain.so.*"
+FILES_olsrd-plugin-httpinfo = "${libdir}/${PN}_httpinfo.so.*"
+FILES_olsrd-plugin-nameservice = "${libdir}/${PN}_nameservice.so.*"
+FILES_olsrd-plugin-quagga = "${libdir}/${PN}_quagga.so.*"
+FILES_olsrd-plugin-tas = "${libdir}/${PN}_tas.so.*"
+FILES_olsrd-plugin-pgraph = "${libdir}/${PN}_pgraph.so.*"
+FILES_olsrd-plugin-bmf = "${libdir}/${PN}_bmf.so.*"
+FILES_olsrd-plugin-txtinfo = "${libdir}/${PN}_txtinfo.so.*"
+FILES_olsrd-plugin-arprefresh = "${libdir}/${PN}_arprefresh.so.*"
+FILES_olsrd-plugin-dotdraw = "${libdir}/${PN}_dot_draw.so.*"
+FILES_olsrd-plugin-secure = "${libdir}/${PN}_secure.so.*"
+FILES_olsrd-plugin-mini = "${libdir}/${PN}_mini.so.*"
 
 CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"
+

diff --git a/packages/olsr/olsrd/olsrd-0.5.5-unbreak-makefile.patch b/packages/olsr/olsrd/olsrd-0.5.5-unbreak-makefile.patch
new file mode 100644 (file)
index 0000000..c08a495
--- /dev/null
+++ b/packages/olsr/olsrd/olsrd-0.5.5-unbreak-makefile.patch
@@ -0,0 +1,47 @@
+Index: olsrd-a5b9cf969979/Makefile
+===================================================================
+--- olsrd-a5b9cf969979.orig/Makefile   2008-02-06 19:32:49.000000000 +0100
++++ olsrd-a5b9cf969979/Makefile        2008-06-23 15:33:35.000000000 +0200
+@@ -95,9 +95,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 ============
+@@ -109,16 +108,15 @@
+               @echo per default.
+               @echo can be found at files/olsrd.conf.default.lq
+               @echo ==========================================================
+-              mkdir -p $(ETCDIR)
+-              -cp -i files/olsrd.conf.default.lq $(CFGFILE)
++              mkdir -p $(INSTALL_PREFIX)$(ETCDIR)
+               @echo -------------------------------------------
+               @echo Edit $(CFGFILE) before running olsrd!!
+               @echo -------------------------------------------
+               @echo Installing manpages $(EXENAME)\(8\) and $(CFGNAME)\(5\)
+-              mkdir -p $(MANDIR)/man8/
+-              cp files/olsrd.8.gz $(MANDIR)/man8/$(EXENAME).8.gz
+-              mkdir -p $(MANDIR)/man5/
+-              cp files/olsrd.conf.5.gz $(MANDIR)/man5/$(CFGNAME).5.gz
++              mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man8/
++              cp files/olsrd.8.gz $(INSTALL_PREFIX)$(MANDIR)/man8/$(EXENAME).8.gz
++              mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man5/
++              cp files/olsrd.conf.5.gz $(INSTALL_PREFIX)$(MANDIR)/man5/$(CFGNAME).5.gz
+ 
+ tags:
+               $(TAGCMD) -o $(TAGFILE) $(TAG_SRCS)
+@@ -140,7 +138,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/olsr/olsrd_0.5.3.bb b/packages/olsr/olsrd_0.5.3.bb
index 34f20f6..fc59b70 100644 (file)
--- a/packages/olsr/olsrd_0.5.3.bb
+++ b/packages/olsr/olsrd_0.5.3.bb
@@ -2,14 +2,5 @@ require olsrd.inc
 
 PR = "r0"
 
-SRC_URI="http://www.olsr.org/releases/${MAJ_VER}/olsrd-${PV}.tar.bz2 \
-        file://init \
-        file://olsrd.conf \
-        file://unbreak-makefile.patch;patch=1"
+SRC_URI += "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
-}

diff --git a/packages/olsr/olsrd_0.5.5.bb b/packages/olsr/olsrd_0.5.5.bb
new file mode 100644 (file)
index 0000000..d871974
--- /dev/null
+++ b/packages/olsr/olsrd_0.5.5.bb
@@ -0,0 +1,7 @@
+require olsrd.inc
+PR = "r0"
+
+# Oddity in the 0.5.5 source tarball.
+S = "${WORKDIR}/olsrd-a5b9cf969979"
+
+SRC_URI += "file://olsrd-0.5.5-unbreak-makefile.patch;patch=1"