[oe-commits] org.oe.dev Second part of OLSR cleanup.
thebohemian commit
oe at amethyst.openembedded.net
Thu Jun 26 19:41:58 UTC 2008
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
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: bbd6a15aefd4cbdcba83461c2dd2b4d5db5036d4
ViewMTN: http://monotone.openembedded.org/revision/info/bbd6a15aefd4cbdcba83461c2dd2b4d5db5036d4
Files:
1
packages/olsr/olsrd/olsrd-0.5.5-unbreak-makefile.patch
packages/olsr/olsrd_0.5.5.bb
packages/olsr/olsrd.inc
packages/olsr/olsrd_0.5.3.bb
Diffs:
#
# mt diff -r4df872ec7d196109135749279109f851f696c1a5 -rbbd6a15aefd4cbdcba83461c2dd2b4d5db5036d4
#
#
#
# add_file "packages/olsr/olsrd/olsrd-0.5.5-unbreak-makefile.patch"
# content [0c3306bd488eb3d0a568b958cd95d687ed861093]
#
# add_file "packages/olsr/olsrd_0.5.5.bb"
# content [db0fac618a0ddb0c4919ccc4c25524f3d182915c]
#
# patch "packages/olsr/olsrd.inc"
# from [78cbd7651bec0ee6e127917dad1568ddb2753ee0]
# to [678b2932aeaa3f061646a45877c30c43f3d8730b]
#
# patch "packages/olsr/olsrd_0.5.3.bb"
# from [f8e759edd3dec4ca996ca63d822d1e729d4153c0]
# to [520f87a3d9cf408d3db766bb2a7af5f28c9ac9a9]
#
============================================================
--- packages/olsr/olsrd/olsrd-0.5.5-unbreak-makefile.patch 0c3306bd488eb3d0a568b958cd95d687ed861093
+++ packages/olsr/olsrd/olsrd-0.5.5-unbreak-makefile.patch 0c3306bd488eb3d0a568b958cd95d687ed861093
@@ -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
============================================================
--- packages/olsr/olsrd_0.5.5.bb db0fac618a0ddb0c4919ccc4c25524f3d182915c
+++ packages/olsr/olsrd_0.5.5.bb db0fac618a0ddb0c4919ccc4c25524f3d182915c
@@ -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"
============================================================
--- packages/olsr/olsrd.inc 78cbd7651bec0ee6e127917dad1568ddb2753ee0
+++ packages/olsr/olsrd.inc 678b2932aeaa3f061646a45877c30c43f3d8730b
@@ -1,12 +1,11 @@ HOMEPAGE = "http://www.olsr.org"
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 @@ INITSCRIPT_PARAMS = "defaults"
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.*"
+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.*"
-RDEPENDS_${PN} = "olsrd-libs"
-
CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"
+
============================================================
--- packages/olsr/olsrd_0.5.3.bb f8e759edd3dec4ca996ca63d822d1e729d4153c0
+++ packages/olsr/olsrd_0.5.3.bb 520f87a3d9cf408d3db766bb2a7af5f28c9ac9a9
@@ -2,14 +2,5 @@ PR = "r0"
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
-}
More information about the Openembedded-commits
mailing list