diff options
Diffstat (limited to 'package/olsrd')
| -rw-r--r-- | package/olsrd/Makefile | 24 | ||||
| -rw-r--r-- | package/olsrd/patches/patch-Makefile | 6 | ||||
| -rw-r--r-- | package/olsrd/patches/patch-make_Makefile_linux | 6 |
3 files changed, 13 insertions, 23 deletions
diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile index 19a999d76..256cf925d 100644 --- a/package/olsrd/Makefile +++ b/package/olsrd/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= olsrd -PKG_VERSION:= 0.5.6-r2 +PKG_VERSION:= 0.6.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= acf15dbd0af521a6826541b567c6473a +PKG_MD5SUM:= 84e9295457cab50539f776118939b343 PKG_DESCR:= Optimized Link State Routing protocol PKG_SECTION:= wifi PKG_URL:= http://www.olsr.org/ -PKG_SITES:= http://www.olsr.org/releases/0.5/ +PKG_SITES:= http://www.olsr.org/releases/0.6/ PKG_MULTI:= 1 PKG_SUBPKGS:= OLSRD OLSRD_MOD_DYN_GW OLSRD_MOD_HTTPINFO OLSRD_MOD_NAMESERVICE @@ -40,23 +40,13 @@ $(eval $(call PKG_mod_template,OLSRD_MOD_NAMESERVICE,nameservice)) $(eval $(call PKG_mod_template,OLSRD_MOD_TAS,tas)) CONFIG_STYLE:= manual -BUILD_STYLE:= manual -INSTALL_STYLE:= manual TCFLAGS+= -fPIC +ALL_TARGET+= libs +INSTALL_TARGET+= install_libs +MAKE_ENV+= OS="linux" NODEBUG=1 STRIP="true" OFLAGS="${TARGET_CFLAGS}" -do-build: - mkdir -p ${WRKINST} - ${MAKE} -C "${WRKBUILD}" \ - ${TARGET_CONFIGURE_OPTS} \ - NODEBUG=1 \ - OFLAGS="${TARGET_CFLAGS}" \ - OS="linux" \ - DESTDIR="${WRKINST}" \ - STRIP="true" \ - all libs install install_libs - -do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} +post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} ${IDIR_OLSRD}/usr/sbin ${IDIR_OLSRD}/etc ${INSTALL_DATA} ${WRKINST}/etc/olsrd.conf ${IDIR_OLSRD}/etc/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/olsrd ${IDIR_OLSRD}/usr/sbin/ diff --git a/package/olsrd/patches/patch-Makefile b/package/olsrd/patches/patch-Makefile index bfbc2e26f..1e0318707 100644 --- a/package/olsrd/patches/patch-Makefile +++ b/package/olsrd/patches/patch-Makefile @@ -1,6 +1,6 @@ ---- olsrd-0.5.6-r2.orig/Makefile 2008-10-03 14:45:06.000000000 +0200 -+++ olsrd-0.5.6-r2/Makefile 2009-06-13 14:02:52.000000000 +0200 -@@ -143,7 +143,7 @@ rpm: +--- olsrd-0.6.0.orig/Makefile 2010-05-13 12:52:55.000000000 +0200 ++++ olsrd-0.6.0/Makefile 2010-10-10 14:34:11.000000000 +0200 +@@ -144,7 +144,7 @@ rpm: # This is quite ugly but at least it works ifeq ($(OS),linux) diff --git a/package/olsrd/patches/patch-make_Makefile_linux b/package/olsrd/patches/patch-make_Makefile_linux index 5099a3d83..d3ca1cdee 100644 --- a/package/olsrd/patches/patch-make_Makefile_linux +++ b/package/olsrd/patches/patch-make_Makefile_linux @@ -1,6 +1,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- olsrd-0.5.6-r2.orig/make/Makefile.linux 2008-10-03 14:45:07.000000000 +0200 -+++ olsrd-0.5.6-r2/make/Makefile.linux 2009-06-13 14:10:25.000000000 +0200 +--- olsrd-0.6.0.orig/make/Makefile.linux 2010-03-31 19:03:53.000000000 +0200 ++++ olsrd-0.6.0/make/Makefile.linux 2010-10-10 14:34:11.000000000 +0200 @@ -4,7 +4,7 @@ ARCH := $(shell uname -m) @@ -10,7 +10,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ SRCS += $(wildcard src/linux/*.c src/unix/*.c) HDRS += $(wildcard src/linux/*.h src/unix/*.h) -@@ -13,8 +13,8 @@ CPPFLAGS += -Dlinux +@@ -13,8 +13,8 @@ CPPFLAGS += -Dlinux -DLINUX_NETLINK_ROU LIBS += PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) |