From af9c1f7e9f1082641b03adec1c268ba2f67dd29b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 17 Nov 2018 19:45:18 +0100
Subject: [PATCH] gluon-mesh-babel: fix respondd provider build/install
Rename to respondd.c / respondd.so, gluon.mk expects these names. This way
we can remove the install code. The installed filename is changed to
gluon-mesh-babel.so, bringing it in line with out common naming scheme.
---
package/gluon-mesh-babel/Makefile | 3 ---
package/gluon-mesh-babel/src/Makefile | 4 ++--
package/gluon-mesh-babel/src/{babel-respondd.c => respondd.c} | 0
3 files changed, 2 insertions(+), 5 deletions(-)
rename package/gluon-mesh-babel/src/{babel-respondd.c => respondd.c} (100%)
diff --git a/package/gluon-mesh-babel/Makefile b/package/gluon-mesh-babel/Makefile
index 14577c82e..20ccd125f 100644
--- a/package/gluon-mesh-babel/Makefile
+++ b/package/gluon-mesh-babel/Makefile
@@ -17,9 +17,6 @@ endef
define Package/gluon-mesh-babel/install
$(Gluon/Build/Install)
- $(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_DIR) $(1)/usr/lib/respondd
- $(CP) $(PKG_BUILD_DIR)/babel-respondd.so $(1)/usr/lib/respondd/mesh-babel.so
$(INSTALL_DIR) $(1)/lib/gluon/status-page/providers
$(INSTALL_BIN) $(PKG_BUILD_DIR)/neighbours-babel $(1)/lib/gluon/status-page/providers/
endef
diff --git a/package/gluon-mesh-babel/src/Makefile b/package/gluon-mesh-babel/src/Makefile
index e307d6ea0..98a22d5e5 100644
--- a/package/gluon-mesh-babel/src/Makefile
+++ b/package/gluon-mesh-babel/src/Makefile
@@ -1,4 +1,4 @@
-all: babel-respondd.so neighbours-babel
+all: respondd.so neighbours-babel
CFLAGS += -Wall -g -fPIC -D_GNU_SOURCE
@@ -24,7 +24,7 @@ CFLAGS_JSONC = $(shell pkg-config --cflags json-c)
LDFLAGS_JSONC = $(shell pkg-config --libs json-c)
-babel-respondd.so: babel-respondd.c handle_neighbour.c
+respondd.so: respondd.c handle_neighbour.c
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LDLIBS) -shared $(LDFLAGS_JSONC) -o $@ $^ -lgluonutil -lblobmsg_json -lubox -lubus -liwinfo -luci
neighbours-babel: neighbours-babel.c handle_neighbour.c
diff --git a/package/gluon-mesh-babel/src/babel-respondd.c b/package/gluon-mesh-babel/src/respondd.c
similarity index 100%
rename from package/gluon-mesh-babel/src/babel-respondd.c
rename to package/gluon-mesh-babel/src/respondd.c
--
GitLab