olsrd: Moved the common parts of recipes for 0.4.9 and 0.4.10 into a

seperate .inc file.

diff --git a/packages/olsrd/olsrd.inc b/packages/olsrd/olsrd.inc
new file mode 100644 (file)
index 0000000..bd51196
--- /dev/null
+++ b/packages/olsrd/olsrd.inc
@@ -0,0 +1,41 @@
+DESCRIPTION = "OLSR mesh routing daemon"
+HOMEPAGE = "http://www.olsr.org"
+DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+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
+
+INITSCRIPT_NAME = "olsrd"
+INITSCRIPT_PARAMS = "defaults"
+EXTRA_OEMAKE="MAKEFLAGS=-I${WORKDIR}/olsrd-${PV}"
+
+
+do_configure() {
+       oe_runmake OS=linux clean
+}
+
+do_compile() {
+        oe_runmake
+}
+
+do_install () {
+       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}
+}
+
+CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"

diff --git a/packages/olsrd/olsrd_0.4.10.bb b/packages/olsrd/olsrd_0.4.10.bb
index 6a74639..4f4f70c 100644 (file)
--- a/packages/olsrd/olsrd_0.4.10.bb
+++ b/packages/olsrd/olsrd_0.4.10.bb
@@ -1,43 +1,2 @@
-DESCRIPTION = "OLSR mesh routing daemon"
-HOMEPAGE = "http://www.olsr.org"
-DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "BSD"
-RDEPENDS_olsrd = "olsrd-libs"
-PR = "r0"
-
-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
-
-INITSCRIPT_NAME = "olsrd"
-INITSCRIPT_PARAMS = "defaults"
-EXTRA_OEMAKE="MAKEFLAGS=-I${WORKDIR}/olsrd-${PV}"
-
-do_configure() {
-       oe_runmake OS=linux clean
-}
-
-do_compile() {
-
-        oe_runmake
-}
-
-do_install () {
-       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}
-}
-
-CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"
+include olsrd.inc
+PR = "r1"

diff --git a/packages/olsrd/olsrd_0.4.9.bb b/packages/olsrd/olsrd_0.4.9.bb
index 2fd3cec..80e790d 100644 (file)
--- a/packages/olsrd/olsrd_0.4.9.bb
+++ b/packages/olsrd/olsrd_0.4.9.bb
@@ -1,31 +1,7 @@
-DESCRIPTION = "OLSR mesh routing daemon"
-HOMEPAGE = "http://www.olsr.org"
-DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "BSD"
-RDEPENDS_olsrd = "olsrd-libs"
-PR = "r1"
+include olsrd.inc
+PR = "r2"
 
-SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \
-       file://0.4.9-httpinfo-makefile.diff;patch=1 \
-       file://init \
-       file://olsrd.conf"
-
-PACKAGES =+ "olsrd-libs"
-FILES_olsrd-libs = "${libdir}"
-
-S = "${WORKDIR}/olsrd-${PV}"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "olsrd"
-INITSCRIPT_PARAMS = "defaults"
-
-do_configure() {
-       oe_runmake OS=linux clean
-}
+SRC_URI += "file://0.4.9-httpinfo-makefile.diff;patch=1"
 
 do_compile() {
        oe_runmake OS=linux clean
@@ -33,12 +9,3 @@ do_compile() {
        touch src/cfgparser/.depend
        oe_runmake OS=linux all libs
 }
-
-do_install () {
-       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}
-}
-
-CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"