[oe-commits] Adam Wozniak : added new recipe for olsrd_0.5.6-r8

[git version control]

Module: openembedded.git
Branch: holger/staging-branch
Commit: 48837957951e8b5e05caad2a5f1107866eb54aff
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=48837957951e8b5e05caad2a5f1107866eb54aff

Author: Adam Wozniak <awozniak at irobot.com>
Date:   Fri Jan 22 13:22:37 2010 +0000

added new recipe for olsrd_0.5.6-r8

Sorry, I've tried and tried, but I can't get send-email to work (network
config settings which are completely out of my control).  Please try
this attachment.

Khem Raj wrote:
> this patch seems corrupt. Please resend it without line wrapping (
> teach your mail client not to muck with patches)
> best is to use git format-patch and git send-email combo
>
> Thx
> -Khem
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

To: openembedded-devel at lists.openembedded.org
Date: Tue, 19 Jan 2010 14:20:49 -0800
Subject: [PATCH v2] olsrd : Add recipe for new version 0.5.6-r8.

---

 .../olsrd/files/olsrd-0.5.6-unbreak-makefile.patch |   59 ++++++++++++++++++++
 recipes/olsrd/olsrd_0.5.6-r8.bb                    |    6 ++
 2 files changed, 65 insertions(+), 0 deletions(-)

diff --git a/recipes/olsrd/files/olsrd-0.5.6-unbreak-makefile.patch b/recipes/olsrd/files/olsrd-0.5.6-unbreak-makefile.patch
new file mode 100644
index 0000000..479448d
--- /dev/null
+++ b/recipes/olsrd/files/olsrd-0.5.6-unbreak-makefile.patch
@@ -0,0 +1,59 @@
+--- a/Makefile	2010-01-19 14:01:15.264703049 -0800
++++ b/Makefile	2010-01-19 14:10:38.765700100 -0800
+@@ -103,9 +103,8 @@ uberclean:	clean clean_libs
+ 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 ============
+@@ -117,17 +116,16 @@ install_olsrd:	install_bin
+ 		@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\)
+ ifneq ($(MANDIR),)
+-		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
+ endif
+ 
+ tags:
+@@ -160,10 +158,10 @@ endif
+ endif
+ 
+ libs:
+-		set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR);done
++		set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(INSTALL_PREFIX)$(LIBDIR);done
+ 
+ libs_clean clean_libs:
+-		-for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) clean;done
++		-for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(INSTALL_PREFIX)$(LIBDIR) clean;done
+ ifeq ($(OS), win32)
+ 		-rm -f lib/pgraph/olsrd_pgraph.dll
+ 		-rm -f lib/txtinfo/olsrd_txtinfo.dll
+@@ -174,7 +172,7 @@ ifeq ($(OS), win32)
+ endif
+ 
+ libs_install install_libs:
+-		set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) install;done
++		set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(INSTALL_PREFIX)$(LIBDIR) install;done
+ 
+ httpinfo:
+ 		$(MAKECMD) -C lib/httpinfo clean
diff --git a/recipes/olsrd/olsrd_0.5.6-r8.bb b/recipes/olsrd/olsrd_0.5.6-r8.bb
new file mode 100644
index 0000000..366474c
--- /dev/null
+++ b/recipes/olsrd/olsrd_0.5.6-r8.bb
@@ -0,0 +1,6 @@
+require olsrd.inc
+
+PR = "r2"
+
+SRC_URI += "file://olsrd-0.5.6-unbreak-makefile.patch;patch=1"
+