From 96ba5d184ab1fee15a008d5025aefd958c348eb7 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Mon, 7 Jun 2021 20:17:18 +0200 Subject: [PATCH] olsrd: update to 2021-06-07 - pud: fix openwrt glibc compilation Signed-off-by: Nick Hainke (cherry picked from commit 4f7791a1fd3fb1c77baa94ca57264378d0ace7a1) --- olsrd/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/olsrd/Makefile b/olsrd/Makefile index 9a68041..82c3808 100644 --- a/olsrd/Makefile +++ b/olsrd/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=olsrd -PKG_SOURCE_DATE:=2021-06-01 +PKG_SOURCE_DATE:=2021-06-07 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git -PKG_SOURCE_VERSION:=4e86a40b06ea84885e5903ef5349cd6b24e4a7fe -PKG_MIRROR_HASH:=9fe818d59da7a9ea846d8b52c3f099c663b2c9daa0c3aaf5d27be0825ee20f92 +PKG_SOURCE_VERSION:=ed22e72a6233d53385fd99742ca5cb24150c2bb8 +PKG_MIRROR_HASH:=f2ea166ad98acb7baf7fb3b544a35046a8e83d08c9723e9642e0d0d40f5b41d4 PKG_MAINTAINER:=Nick Hainke PKG_BUILD_PARALLEL:=0 @@ -170,7 +170,11 @@ MAKE_FLAGS+= \ DESTDIR="$(PKG_INSTALL_DIR)" \ STRIP="true" \ INSTALL_LIB="true" \ +<<<<<<< HEAD SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo netjson mdns nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog" +======= + SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo filtergw jsoninfo netjson mdns nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog" +>>>>>>> 4f7791a (olsrd: update to 2021-06-07) define Build/Compile $(call Build/Compile/Default,all)