From f76cfa84698fc0c0a7539af70ddba811b39a9560 Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Sun, 8 Oct 2017 21:29:11 +0200 Subject: [PATCH 1/3] mmfd: bump version to pull in latest adaptions to libbabelhelper --- net/mmfd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mmfd/Makefile b/net/mmfd/Makefile index d2d9ebb..0a3d3c9 100644 --- a/net/mmfd/Makefile +++ b/net/mmfd/Makefile @@ -1,10 +1,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mmfd -PKG_SOURCE_DATE:=2017-10-04 +PKG_SOURCE_DATE:=2017-10-17 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=https://github.com/freifunk-gluon/mmfd.git -PKG_SOURCE_VERSION:=ba0fc88e2f1690e50341f25311ad35a72b1435e9 +PKG_SOURCE_VERSION:=279eaf6a770f173fb39b8310e9aaa252a11932a3 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk From ce7f69ae4c8efabfdf8c0da38bd7990b34d830b5 Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Sat, 14 Oct 2017 19:26:30 +0200 Subject: [PATCH 2/3] use latest libbabelhelper --- utils/libbabelhelper/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/utils/libbabelhelper/Makefile b/utils/libbabelhelper/Makefile index ab73c64..50be6ff 100644 --- a/utils/libbabelhelper/Makefile +++ b/utils/libbabelhelper/Makefile @@ -1,12 +1,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libbabelhelper -PKG_RELEASE:=1 -PKG_VERSION:=1 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL=https://github.com/christf/libbabelhelper.git -PKG_SOURCE_VERSION:=d1b8b6f6cdf51aacedcab0ee5d9b18e21fb264ff +PKG_SOURCE_URL:=https://github.com/christf/libbabelhelper.git +PKG_SOURCE_VERSION:=e9386644cda44030b353f9444cb9d549463a3f9a +PKG_SOURCE_DATE:=2017-10-17 CMAKE_INSTALL:=1 From 57332536dbca188931df2cc828de58f6dc233dfb Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Sat, 14 Oct 2017 23:28:22 +0200 Subject: [PATCH 3/3] libbabelhelper: adapt to new install paths due to package version change --- utils/libbabelhelper/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/libbabelhelper/Makefile b/utils/libbabelhelper/Makefile index 50be6ff..c61527d 100644 --- a/utils/libbabelhelper/Makefile +++ b/utils/libbabelhelper/Makefile @@ -21,7 +21,7 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libbabelhelper-$(PKG_VERSION) $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libbabelhelper-* $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbabelhelper.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig