diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/nrlolsr | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
download | openembedded-709c4d66e0b107ca606941b988bad717c0b45d9b.tar.gz |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/nrlolsr')
-rw-r--r-- | packages/nrlolsr/nrlolsr-7.8.1/nrlolsr-cross.patch | 120 | ||||
-rw-r--r-- | packages/nrlolsr/nrlolsr_7.8.1.bb | 27 |
2 files changed, 0 insertions, 147 deletions
diff --git a/packages/nrlolsr/nrlolsr-7.8.1/nrlolsr-cross.patch b/packages/nrlolsr/nrlolsr-7.8.1/nrlolsr-cross.patch deleted file mode 100644 index 92af69f4f3..0000000000 --- a/packages/nrlolsr/nrlolsr-7.8.1/nrlolsr-cross.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -Nurd nrlolsr/protolib/unix/Makefile.common nrlolsr.new/protolib/unix/Makefile.common ---- nrlolsr/protolib/unix/Makefile.common 2006-12-15 12:30:58.000000000 -0500 -+++ nrlolsr.new/protolib/unix/Makefile.common 2009-02-13 10:43:26.000000000 -0500 -@@ -12,9 +12,9 @@ - - INCLUDES = $(TCL_INCL_PATH) $(SYSTEM_INCLUDES) -I$(UNIX) -I$(COMMON) - --CFLAGS = -g -DPROTO_DEBUG -DUNIX -D_FILE_OFFSET_BITS=64 -O -Wall -Wcast-align -pedantic -fPIC $(SYSTEM_HAVES) $(INCLUDES) -+NRL_CFLAGS = -g -DPROTO_DEBUG -DUNIX -D_FILE_OFFSET_BITS=64 -O -Wall -Wcast-align -pedantic -fPIC $(SYSTEM_HAVES) $(INCLUDES) - --LDFLAGS = $(SYSTEM_LDFLAGS) -+NRL_LDFLAGS = $(SYSTEM_LDFLAGS) - - LIBS = $(SYSTEM_LIBS) -lm -lpthread - -@@ -22,7 +22,7 @@ - - # Rule for C++ .cpp extension - .cpp.o: -- $(CC) -c $(CFLAGS) -o $*.o $*.cpp -+ $(CC) -c $(CFLAGS) $(NRL_CFLAGS) -o $*.o $*.cpp - - KIT_SRC = $(COMMON)/protoDebug.cpp $(COMMON)/protoAddress.cpp \ - $(COMMON)/protoSocket.cpp $(COMMON)/protoTimer.cpp \ -@@ -50,37 +50,37 @@ - EXAMPLE_OBJ = $(EXAMPLE_SRC:.cpp=.o) - - protoExample: $(EXAMPLE_OBJ) libProtokit.a -- $(CC) $(CFLAGS) -o $@ $(EXAMPLE_OBJ) $(LDFLAGS) $(LIBS) libProtokit.a -+ $(CC) $(CFLAGS) $(NRLCFLAGS) -o $@ $(EXAMPLE_OBJ) $(LDFLAGS) $(NRL_LDFLAGS) $(LIBS) libProtokit.a - - THREAD_SRC = $(COMMON)/threadExample.cpp - THREAD_OBJ = $(THREAD_SRC:.cpp=.o) - - threadExample: $(THREAD_OBJ) libProtokit.a -- $(CC) $(CFLAGS) -o $@ $(THREAD_OBJ) $(LDFLAGS) $(LIBS) libProtokit.a -+ $(CC) $(CFLAGS) $(BRL_CFLAGS) -o $@ $(THREAD_OBJ) $(LDFLAGS) $(LIBS) libProtokit.a - - PIPE_SRC = $(COMMON)/pipeExample.cpp - PIPE_OBJ = $(PIPE_SRC:.cpp=.o) - - pipeExample: $(PIPE_OBJ) libProtokit.a -- $(CC) $(CFLAGS) -o $@ $(PIPE_OBJ) $(LDFLAGS) $(LIBS) libProtokit.a -+ $(CC) $(CFLAGS) $(NRLCFLAGS) -o $@ $(PIPE_OBJ) $(LDFLAGS) $(NRL_LDFLAGS) $(LIBS) libProtokit.a - - PCAP_SRC = $(COMMON)/pcapExample.cpp $(COMMON)/protoPacketeer.cpp linuxPacketeer.cpp - PCAP_OBJ = $(PCAP_SRC:.cpp=.o) - - pcapExample: $(PCAP_OBJ) libProtokit.a -- $(CC) $(CFLAGS) -o $@ $(PCAP_OBJ) $(LDFLAGS) $(LIBS) libProtokit.a -lpcap -+ $(CC) $(CFLAGS) $(NRL_CFLAGS) -o $@ $(PCAP_OBJ) $(LDFLAGS) $(NRL_LDFLAGS) $(LIBS) libProtokit.a -lpcap - - CAP_SRC = $(COMMON)/protoCapExample.cpp - CAP_OBJ = $(CAP_SRC:.cpp=.o) - - protoCapExample: $(CAP_OBJ) libProtokit.a -- $(CC) $(CFLAGS) -o $@ $(CAP_OBJ) $(LDFLAGS) $(LIBS) libProtokit.a -+ $(CC) $(CFLAGS) $(NRL_CFLAGS) -o $@ $(CAP_OBJ) $(LDFLAGS) $(NRL_LDFLAGS) $(LIBS) libProtokit.a - - DETOUR_SRC = $(COMMON)/detourExample.cpp $(SYSTEM_SRC_EX) - DETOUR_OBJ = $(DETOUR_SRC:.cpp=.o) - - detourExample: $(DETOUR_OBJ) libProtokit.a -- $(CC) $(CFLAGS) -o $@ $(DETOUR_OBJ) $(LDFLAGS) $(LIBS) libProtokit.a -+ $(CC) $(CFLAGS) $(NRL_CFLAGS) -o $@ $(DETOUR_OBJ) $(LDFLAGS) $(NRL_LDFLOAGS) $(LIBS) libProtokit.a - - clean: - rm -f *.o $(COMMON)/*.o $(NS)/*.o ../wx/*.o *.a \ -diff -Nurd nrlolsr/unix/Makefile.common nrlolsr.new/unix/Makefile.common ---- nrlolsr/unix/Makefile.common 2005-11-03 12:09:57.000000000 -0500 -+++ nrlolsr.new/unix/Makefile.common 2009-02-13 11:12:23.000000000 -0500 -@@ -13,11 +13,11 @@ - - INCLUDES = $(TCL_INCL_PATH) $(SYSTEM_INCLUDES) $(WX_INCLUDES) -I$(UNIX) -I$(COMMON) -I$(PROTOLIB)/common - --CFLAGS = -g -DPROTO_DEBUG -DUNIX -Wall -O -fPIC $(SYSTEM_HAVES) $(INCLUDES) -+NRL_CFLAGS = -g -DPROTO_DEBUG -DUNIX -Wall -O -fPIC $(SYSTEM_HAVES) $(INCLUDES) - - WXCFLAGS = -g -DPROTO_DEBUG -DUNIX -Wall -O -fPIC $(WX_FLAGS) $(SYSTEM_HAVES) $(INCLUDES) - --LDFLAGS = $(SYSTEM_LDFLAGS) -+NRL_LDFLAGS = $(SYSTEM_LDFLAGS) - - LIBS = $(SYSTEM_LIBS) -lm - -@@ -25,7 +25,7 @@ - - # Rule for C++ .cpp extension - .cpp.o: -- $(CC) -c $(CFLAGS) -o $*.o $*.cpp -+ $(CC) -c $(CFLAGS) $(NRL_CFLAGS) -o $*.o $*.cpp - - all: nrlolsrd - -@@ -40,13 +40,13 @@ - OLSR_OBJ = $(OLSR_SRC:.cpp=.o) - - nrlolsrd: $(LIBPROTO) $(OLSR_OBJ) -- $(CC) -g $(CFLAGS) -o $@ $(OLSR_OBJ) $(LDFLAGS) $(LIBS) $(LIBPROTO) -l pcap -+ $(CXX) -g $(CFLAGS) -o $@ $(OLSR_OBJ) $(LDFLAGS) $(NRL_LDFLAGS) $(LIBS) $(LIBPROTO) -l pcap - - MNM_SRC = $(COMMON)/mnmMacMsg.cpp $(COMMON)/mnmExample.cpp - MNM_OBJ = $(MNM_SRC:.cpp=.o) - - mnmExample: $(LIBPROTO) $(MNM_OBJ) -- $(CC) -g $(CFLAGS) -o $@ $(MNM_OBJ) $(LDFLAGS) $(LIBS) $(LIBPROTO) -+ $(CC) -g $(CFLAGS) $(NRL_CFLAGS) -o $@ $(MNM_OBJ) $(LDFLAGS) $(NRL_LDFLAGS) $(LIBS) $(LIBPROTO) - - # Re-define rule for C++ .cpp extension - .cpp.o: -@@ -56,7 +56,7 @@ - NRLOLSRGUI_OBJ = $(NRLOLSRGUI_SRC:.cpp=.o) - - olsrgui: $(NRLOLSRGUI_OBJ) $(LIBPROTO) -- $(CC) -g $(WXCFLAGS) -o $@ $(NRLOLSRGUI_OBJ) $(LIBPROTO) $(LDFLAGS) $(WX_FLAGS) $(LIBS) $(WX_LIBS) -+ $(CC) -g $(WXCFLAGS) -o $@ $(NRLOLSRGUI_OBJ) $(LIBPROTO) $(LDFLAGS) $(NRL_LDFLAGS) $(WX_FLAGS) $(LIBS) $(WX_LIBS) - - clean: - rm -f *.o $(COMMON)/*.o $(NS)/*.o nrlolsrd olsrgui -Binary files nrlolsr/unix/.Makefile.common.swp and nrlolsr.new/unix/.Makefile.common.swp differ diff --git a/packages/nrlolsr/nrlolsr_7.8.1.bb b/packages/nrlolsr/nrlolsr_7.8.1.bb deleted file mode 100644 index 3fa5e2f4df..0000000000 --- a/packages/nrlolsr/nrlolsr_7.8.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "NRL OLSR - added to OE to support the Maniac Challenge (http://www.maniacchallenge.org/)" -SECTION = "applications" -LICENSE = "Public Domain" - -S="${WORKDIR}/nrlolsr/" - -SRC_URI = "http://downloads.pf.itd.nrl.navy.mil/olsr/nrlolsrdv7.8.1.tgz \ - file://nrlolsr-cross.patch;patch=1 \ - " - -do_compile () { - cd ${S}/unix - - sed -i -e 's:-I/usr/X11R6/include:-I${STAGING_INCDIR}:g' Makefile.linux - sed -i -e 's:-L/usr/X11R6/lib:-L${STAGING_LIBDIR}:g' Makefile.linux - sed -i -e 's:/usr/local/bin:${STAGING_BINDIR}:g' Makefile.linux - sed -i -e 's:make -f Makefile:make -e -f Makefile:g' Makefile.common - -# EXTRA_OEMAKE="-f Makefile.linux" - oe_runmake -f Makefile.linux - -} - -do_install () { - install -d ${D}/${bindir} - install unix/nrlolsrd ${D}/${bindir} -} |