| Submitter | Adam Wozniak |
|---|---|
| Date | 2010-01-22 23:22:37 |
| Message ID | <4B5A333D.2090400@irobot.com> |
| Download | mbox | patch |
| Permalink | /patch/1509/ |
| State | New |
| Headers | show |
Comments
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 On 01/22/2010 06:22 PM, 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. > > 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@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
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 Holger Hans Peter Freyther wrote: > 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 > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel >
Patch
To: openembedded-devel@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(-) create mode 100644 recipes/olsrd/files/olsrd-0.5.6-unbreak-makefile.patch create mode 100644 recipes/olsrd/olsrd_0.5.6-r8.bb 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" + -- 1.6.3.3