diff options
| -rw-r--r-- | package/olsrd/Makefile | 10 | ||||
| -rw-r--r-- | package/olsrd/patches/patch-Makefile | 11 | ||||
| -rw-r--r-- | package/olsrd/patches/patch-make_Makefile_linux | 23 | ||||
| -rw-r--r-- | package/olsrd/patches/patch-src_unix_ifnet_c | 13 |
4 files changed, 4 insertions, 53 deletions
diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile index 20cb90ee2..5a6b1c9e7 100644 --- a/package/olsrd/Makefile +++ b/package/olsrd/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= olsrd -PKG_VERSION:= 0.6.0 +PKG_VERSION:= 0.6.6.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 84e9295457cab50539f776118939b343 +PKG_MD5SUM:= 65181a5280391d69411908c186fd0c1f PKG_DESCR:= Optimized Link State Routing protocol PKG_SECTION:= wifi PKG_URL:= http://www.olsr.org/ @@ -33,19 +33,17 @@ $(eval $(call PKG_template,OLSRD,olsrd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN $(eval $(call PKG_template,OLSRD_MOD_DYN_GW,olsrd-mod-dyn-gw,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,OLSRD_MOD_HTTPINFO,olsrd-mod-httpinfo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,OLSRD_MOD_NAMESERVICE,olsrd-mod-nameservice,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,OLSRD_MOD_TAS,olsrd-mod-tas,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_mod_template,OLSRD_MOD_DYN_GW,dyn_gw)) $(eval $(call PKG_mod_template,OLSRD_MOD_HTTPINFO,httpinfo)) $(eval $(call PKG_mod_template,OLSRD_MOD_NAMESERVICE,nameservice)) -$(eval $(call PKG_mod_template,OLSRD_MOD_TAS,tas)) CONFIG_STYLE:= manual -TARGET_CFLAGS+= -fPIC +TARGET_CFLAGS+= -fPIC -D_GNU_SOURCE ALL_TARGET+= libs INSTALL_TARGET+= install_libs -MAKE_ENV+= OS="linux" NODEBUG=1 STRIP="true" OFLAGS="${TARGET_CFLAGS}" +MAKE_ENV+= OS="linux" DEBUG=0 STRIP="true" OFLAGS="${TARGET_CFLAGS}" prefix="/usr" post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} ${IDIR_OLSRD}/usr/sbin ${IDIR_OLSRD}/etc diff --git a/package/olsrd/patches/patch-Makefile b/package/olsrd/patches/patch-Makefile deleted file mode 100644 index 1e0318707..000000000 --- a/package/olsrd/patches/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) --SUBDIRS = $(notdir $(shell find lib -maxdepth 2 -name Makefile -not -path lib/Makefile -printf "%h\n"|sort)) -+SUBDIRS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo mini nameservice pgraph quagga secure tas txtinfo - else - ifeq ($(OS),win32) - SUBDIRS := dot_draw httpinfo mini pgraph secure txtinfo diff --git a/package/olsrd/patches/patch-make_Makefile_linux b/package/olsrd/patches/patch-make_Makefile_linux deleted file mode 100644 index d3ca1cdee..000000000 --- a/package/olsrd/patches/patch-make_Makefile_linux +++ /dev/null @@ -1,23 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- 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) - DESTDIR ?= --LIBDIR = $(DESTDIR)$(shell if [ "$(ARCH)" = "x86_64" -a -d "/usr/lib64" ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi) -+LIBDIR = $(DESTDIR)/usr/lib - - SRCS += $(wildcard src/linux/*.c src/unix/*.c) - HDRS += $(wildcard src/linux/*.h src/unix/*.h) -@@ -13,8 +13,8 @@ CPPFLAGS += -Dlinux -DLINUX_NETLINK_ROU - LIBS += - - PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) --INSTALL_LIB = install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ -- /sbin/ldconfig -n $(LIBDIR) -+INSTALL_LIB = install -d -m 755 $(LIBDIR); \ -+ install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); - - ifdef OLSRD_PLUGIN - GENERATE_PIC = true diff --git a/package/olsrd/patches/patch-src_unix_ifnet_c b/package/olsrd/patches/patch-src_unix_ifnet_c deleted file mode 100644 index 67705012b..000000000 --- a/package/olsrd/patches/patch-src_unix_ifnet_c +++ /dev/null @@ -1,13 +0,0 @@ ---- olsrd-0.6.0.orig/src/unix/ifnet.c 2010-04-22 17:11:11.000000000 +0200 -+++ olsrd-0.6.0/src/unix/ifnet.c 2010-10-10 14:34:54.000000000 +0200 -@@ -547,10 +547,8 @@ chk_if_up(struct olsr_if *iface, int deb - struct ifreq ifr; - union olsr_ip_addr null_addr; - size_t name_size; --#ifdef linux - int precedence = IPTOS_PREC(olsr_cnf->tos); - int tos_bits = IPTOS_TOS(olsr_cnf->tos); --#endif - - if (iface->host_emul) - return -1; |