From 072ba90ce4b126e84d3e1734ba8e9d4beab48f03 Mon Sep 17 00:00:00 2001 From: Simon Wunderlich Date: Wed, 23 Oct 2013 01:30:22 +0200 Subject: [PATCH] alfred: bump version to 2013.4.0 bump alfred to version 2013.4.0. From the CHANGELOG: * add new json output format for vis * add gps location information service for alfred * allow network interface to vanish and return without restart * allow to switch between master and slave operation without restart * renamed vis to batadv-vis to avoid collisions with other vis binaries * add manpages * various code cleanups * bugs squashed: * handle failing write() in unix sockets * Fix crash when vis opened empty file alfred-gpsd is optional and requires libgps from the gpsd package to compile. It needed its own -lm for libgps which does not link to libm by itself, a patch for upstream alfred has been posted. Signed-off-by: Simon Wunderlich --- alfred/Config.in | 8 ++++- alfred/Makefile | 13 +++++--- ...sd-add-lm-to-linker-flags-for-libgps.patch | 33 +++++++++++++++++++ 3 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 alfred/patches/0001-alfred-gpsd-add-lm-to-linker-flags-for-libgps.patch diff --git a/alfred/Config.in b/alfred/Config.in index fd664ca..1791949 100644 --- a/alfred/Config.in +++ b/alfred/Config.in @@ -1,7 +1,13 @@ +config ALFRED_NEEDS_libgps + bool config PACKAGE_ALFRED_VIS bool "enable vis server for alfred" depends on PACKAGE_alfred default y - +config PACKAGE_ALFRED_GPSD + bool "enable gpsd service for alfred" + depends on PACKAGE_alfred + select ALFRED_NEEDS_libgps + default n diff --git a/alfred/Makefile b/alfred/Makefile index db9c71f..67be82f 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk # The latest alfred git hash in PKG_REV can be obtained from http://git.open-mesh.org/alfred.git # PKG_NAME:=alfred -PKG_VERSION:=2013.3.0 +PKG_VERSION:=2013.4.0 PKG_RELEASE:=0 -PKG_MD5SUM:=018ef6262cdd11e900af31d71a864b13 +PKG_MD5SUM:=3891697e127b1037cfc9349fd96e9993 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) @@ -27,7 +27,8 @@ define Package/alfred SECTION:=net CATEGORY:=Network TITLE:=A.L.F.R.E.D. - Almighty Lightweight Fact Remote Exchange Daemon - DEPENDS:= +libc +IPV6:kmod-ipv6 +librt + DEPENDS:= +libc +IPV6:kmod-ipv6 +librt \ + +ALFRED_NEEDS_libgps:libgps endef define Package/alfred/description @@ -55,7 +56,8 @@ define Package/alfred/config endef MAKE_ALFRED_FLAGS=\ - CONFIG_ALFRED_VIS=$(if $(CONFIG_PACKAGE_ALFRED_VIS),y,n) + CONFIG_ALFRED_VIS=$(if $(CONFIG_PACKAGE_ALFRED_VIS),y,n) \ + CONFIG_ALFRED_GPSD=$(if $(CONFIG_PACKAGE_ALFRED_GPSD),y,n) TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto TARGET_LDFLAGS += -Wl,--gc-sections -fuse-linker-plugin @@ -69,7 +71,8 @@ endef define Package/alfred/install $(INSTALL_DIR) $(1)/usr/sbin cp -fpR $(PKG_BUILD_DIR)/alfred $(1)/usr/sbin/ - [ "x$(CONFIG_PACKAGE_ALFRED_VIS)" == "xy" ] && cp -fpR $(PKG_BUILD_DIR)/vis/vis $(1)/usr/sbin/ ; true + [ "x$(CONFIG_PACKAGE_ALFRED_VIS)" == "xy" ] && cp -fpR $(PKG_BUILD_DIR)/vis/batadv-vis $(1)/usr/sbin/ ; true + [ "x$(CONFIG_PACKAGE_ALFRED_GPSD)" == "xy" ] && cp -fpR $(PKG_BUILD_DIR)/vis/alfred-gpsd $(1)/usr/sbin/ ; true $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/alfred.init $(1)/etc/init.d/alfred $(INSTALL_DIR) $(1)/etc/config diff --git a/alfred/patches/0001-alfred-gpsd-add-lm-to-linker-flags-for-libgps.patch b/alfred/patches/0001-alfred-gpsd-add-lm-to-linker-flags-for-libgps.patch new file mode 100644 index 0000000..3be7169 --- /dev/null +++ b/alfred/patches/0001-alfred-gpsd-add-lm-to-linker-flags-for-libgps.patch @@ -0,0 +1,33 @@ +From dbaaf2b294af120e42a0e95644640b128044a568 Mon Sep 17 00:00:00 2001 +From: Simon Wunderlich +Date: Wed, 23 Oct 2013 01:17:36 +0200 +Subject: [PATCH] alfred-gpsd: add -lm to linker flags for libgps + +Appearently applications using libgps must link -lm themselves. A patch +was submitted [1] to change this unusual behaviour upstream, but was +never applied. Therefore link to -lm to alfred-gpsd too as this should +not hurt anyway. + +[1] https://lists.berlios.de/pipermail/gpsd-dev/2011-August/009451.html + +Signed-off-by: Simon Wunderlich +--- + gpsd/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gpsd/Makefile b/gpsd/Makefile +index 9b21652..92e690f 100644 +--- a/gpsd/Makefile ++++ b/gpsd/Makefile +@@ -49,7 +49,7 @@ ifeq ($(origin LIBGPS_CFLAGS) $(origin LIBGPS_LDLIBS), undefined undefined) + $(error No $(LIBGPS_NAME) development libraries found!) + endif + LIBGPS_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBGPS_NAME)) +- LIBGPS_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBGPS_NAME)) ++ LIBGPS_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBGPS_NAME)) -lm + endif + CFLAGS += $(LIBGPS_CFLAGS) + LDLIBS += $(LIBGPS_LDLIBS) +-- +1.7.10.4 + -- 2.30.2