From dea803c392ef7ff99ce32c0599ace4ce0db9bf7b Mon Sep 17 00:00:00 2001
From: Nils Schneider <nils@nilsschneider.net>
Date: Wed, 19 Aug 2015 20:59:57 +0200
Subject: [PATCH] uradvd: non-gluon parts of gluon-radvd

---
 Makefile                                     | 39 --------------------
 net/uradvd/Makefile                          | 34 +++++++++++++++++
 {src => net/uradvd/src}/Makefile             |  4 +-
 src/gluon-radvd.c => net/uradvd/src/uradvd.c |  2 +-
 4 files changed, 37 insertions(+), 42 deletions(-)
 delete mode 100644 Makefile
 create mode 100644 net/uradvd/Makefile
 rename {src => net/uradvd/src}/Makefile (61%)
 rename src/gluon-radvd.c => net/uradvd/src/uradvd.c (99%)

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4736af6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gluon-radvd
-PKG_VERSION:=3
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/gluon-radvd
-  SECTION:=gluon
-  CATEGORY:=Gluon
-  TITLE:=Advertise an IPv6 prefix from the node
-  DEPENDS:=+gluon-core +gluon-ebtables +gluon-mesh-batman-adv +librt
-endef
-
-define Package/gluon-radvd/description
-	Gluon community wifi mesh firmware framework: Advertise an IPv6 prefix from the node
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	CFLAGS="$(TARGET_CFLAGS)" CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS)
-endef
-
-define Package/gluon-radvd/install
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/gluon-radvd $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,gluon-radvd))
diff --git a/net/uradvd/Makefile b/net/uradvd/Makefile
new file mode 100644
index 0000000..46b6e41
--- /dev/null
+++ b/net/uradvd/Makefile
@@ -0,0 +1,34 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=uradvd
+PKG_VERSION:=1
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/uradvd
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=A tiny radvd
+  DEPENDS:=+libc +kmod-ipv6 +librt
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+	CFLAGS="$(TARGET_CFLAGS)" CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS)
+endef
+
+define Package/uradvd/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uradvd $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,uradvd))
diff --git a/src/Makefile b/net/uradvd/src/Makefile
similarity index 61%
rename from src/Makefile
rename to net/uradvd/src/Makefile
index f0bc903..ea10866 100644
--- a/src/Makefile
+++ b/net/uradvd/src/Makefile
@@ -1,4 +1,4 @@
-all: gluon-radvd
+all: uradvd
 
-gluon-radvd: gluon-radvd.c
+uradvd: uradvd.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wall -o $@ $^ $(LDLIBS) -lrt
diff --git a/src/gluon-radvd.c b/net/uradvd/src/uradvd.c
similarity index 99%
rename from src/gluon-radvd.c
rename to net/uradvd/src/uradvd.c
index e146c4f..6ea1b1c 100644
--- a/src/gluon-radvd.c
+++ b/net/uradvd/src/uradvd.c
@@ -547,7 +547,7 @@ static void send_advert(void) {
 
 
 static void usage(void) {
-	fprintf(stderr, "Usage: gluon-radvd [-h] -i <interface> -a/-p <prefix> [ -a/-p <prefix> ... ]\n");
+	fprintf(stderr, "Usage: uradvd [-h] -i <interface> -a/-p <prefix> [ -a/-p <prefix> ... ]\n");
 }
 
 static void add_prefix(const char *prefix, bool adv_onlink) {