added new recipe for olsrd_0.5.6-r8
PATCH 1/1 added new recipe for olsrd_0.5.6-r8
The latest release version of olsrd is 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(-)
create mode 100644 recipes/olsrd/files/olsrd-0.5.6-unbreak-makefile.patch create mode 100644 recipes/olsrd/olsrd_0.5.6-r8.bb
recipes/olsrd/files/olsrd-0.5.6-unbreak-makefile.patch new file +59 -0
@@ -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
recipes/olsrd/olsrd_0.5.6-r8.bb new file +6 -0
@@ -0,0 +1,6 @@ +require olsrd.inc + +PR = "r2" + +SRC_URI += "file://olsrd-0.5.6-unbreak-makefile.patch;patch=1" +
Signature · 1 line
1.6.3.3
Quoted 102 lines · Adam Wozniak
The latest release version of olsrd is 0.5.6-r8
Signed-off-by Adam Wozniak <[email protected]>---
.../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(-)create mode 100644
recipes/olsrd/files/olsrd-0.5.6-unbreak-makefile.patchcreate mode 100644 recipes/olsrd/olsrd_0.5.6-r8.bbrecipes/olsrd/files/olsrd-0.5.6-unbreak-makefile.patch new file +32
-0@@ -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
+ endifrecipes/olsrd/files/olsrd-0.5.6-unbreak-makefile.patch new file +7
-0+ + tags: +@@ -160,10 +158,10 @@ endif + endif + + libs: +- set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dirLIBDIR=$(LIBDIR);done
++ set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(INSTALL_PREFIX)$(LIBDIR);done
+
+libs_cleanclean_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 -flib/pgraph/olsrd_pgraph.dll
+ -rm -flib/txtinfo/olsrd_txtinfo.dll
+@@ -174,7 +172,7 @@ ifeq ($(OS), win32)
+ endif
+
+libs_installinstall_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;donerecipes/olsrd/files/olsrd-0.5.6-unbreak-makefile.patch new file +3
-0+ + httpinfo: + $(MAKECMD) -C lib/httpinfo cleanrecipes/olsrd/olsrd_0.5.6-r8.bb new file +6
-1@@ -0,0 +1,6 @@ +require olsrd.inc + +PR = "r2" + +SRC_URI += "file://olsrd-0.5.6-unbreak-makefile.patch;patch=1" + --1.6.3.3
Quoted 5 lines
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
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
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.
Quoted 4 lines · Khem Raj
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
Quoted 8 lines
Thx
-Khem_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
To: [email protected]
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(-) create mode 100644 recipes/olsrd/files/olsrd-0.5.6-unbreak-makefile.patch create mode 100644 recipes/olsrd/olsrd_0.5.6-r8.bb
recipes/olsrd/files/olsrd-0.5.6-unbreak-makefile.patch new file +59 -0
@@ -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
recipes/olsrd/olsrd_0.5.6-r8.bb new file +6 -0
@@ -0,0 +1,6 @@ +require olsrd.inc + +PR = "r2" + +SRC_URI += "file://olsrd-0.5.6-unbreak-makefile.patch;patch=1" +
Signature · 1 line
1.6.3.3
Adam,
I did get one of your attachments to apply, I did see a number of files that were installed but not packaged? Do you see this? Does the package built from the recipe work? I'll try and post the list tomorrow.
Philip
Quoted 23 lines · Adam Wozniak
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.
Quoted 11 lines · Khem Raj
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 comboThx
-Khem_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Quoted 4 lines · On Saturday 23 January 2010 00:22:37 Adam Wozniak wrote:
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.
The upstream version number of "olsrd_0.5.6-r8" is a bit unfortunate. Is that revision or release candidate 8? This also means that the generated OE package will be something like olsrd-0.5.6-r8-rX".
In case it is the release version it is probably fine but just a little bit awkward, in case of rc we would have a small problem.
It is "revision" 8, not "release candidate" 8. If you look at http://www.olsr.org/releases/0.5/ you'll notice they ALSO have things labeled 0.5.6-rcN, but these all predate 0.5.6-rN. I think their numbering scheme through 0.5.6 is horrible. It gets worse... Four days after they posted 0.5.6-r8, they decided to break convention again and posted 0.5.6-r8-2 (and not 0.5.6-r9 as you'd expect).
It is indeed unfortunate.
--Adam
Quoted 16 lines · Holger Hans Peter Freyther
Quoted 4 lines · On Saturday 23 January 2010 00:22:37 Adam Wozniak wrote:
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.
The upstream version number of "olsrd_0.5.6-r8" is a bit unfortunate. Is that revision or release candidate 8? This also means that the generated OE package will be something like olsrd-0.5.6-r8-rX".
In case it is the release version it is probably fine but just a little bit awkward, in case of rc we would have a small problem.
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel