From bdff29149a8eb76f4e85e70b1f862cffd7d9e3bb Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Wed, 28 Sep 2011 15:47:49 -0600
Subject: [PATCH] add mrd6 to router image

---
 packages/router/router.mk | 47 ++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/packages/router/router.mk b/packages/router/router.mk
index d30118e..ed65d09 100644
--- a/packages/router/router.mk
+++ b/packages/router/router.mk
@@ -1,19 +1,17 @@
 ROUTER_PKGDIR = $(TARGET)/router
 ROUTER_BUILDDIR = $(BUILD)/router
 
+router-source:
 
-router-source: $(ROUTER_BUILDDIR)/radvd-source
-
-router-build: $(ROUTER_BUILDDIR)/radvd-build
+router-build:
 
 router-install: router-build
-	mkdir -p $(ROUTER_PKGDIR)/bin
-
-	cp $(RADVD_SRCDIR)/radvd $(ROUTER_PKGDIR)/bin/
-	cp $(RADVD_SRCDIR)/radvdump $(ROUTER_PKGDIR)/bin/
-
 	$(call COPYTREE, packages/router/service, $(ROUTER_PKGDIR)/service)
 
+router-clean:
+	rm -rf $(ROUTER_PKGDIR) $(ROUTER_BUILDDIR)
+
+
 ##
 ## radvd
 ##
@@ -26,19 +24,48 @@ $(RADVD_TARBALL):
 	@ mkdir -p $(@D)
 	wget -O $@ $(RADVD_URL)
 
+router-source: $(ROUTER_BUILDDIR)/radvd-source
 $(ROUTER_BUILDDIR)/radvd-source: $(RADVD_TARBALL)
 	mkdir -p $(ROUTER_BUILDDIR)
 	zcat $(RADVD_TARBALL) | (cd $(ROUTER_BUILDDIR) && tar xf -)
 	touch $@
 
+router-build: $(ROUTER_BUILDDIR)/radvd-build
 $(ROUTER_BUILDDIR)/radvd-build: $(ROUTER_BUILDDIR)/radvd-source
 	cd $(RADVD_SRCDIR) && ./configure $(CONFIG_XCOMPILE_FLAGS)
 	$(MAKE) -C $(RADVD_SRCDIR)
 	touch $@
 
+router-install: radvd-install
+radvd-install:
+	mkdir -p $(ROUTER_PKGDIR)/bin
+	cp $(RADVD_SRCDIR)/radvd $(ROUTER_PKGDIR)/bin/
+	cp $(RADVD_SRCDIR)/radvdump $(ROUTER_PKGDIR)/bin/
 
 
-router-clean:
-	rm -rf $(ROUTER_PKGDIR)
+##
+## mrd6
+##
+MRD6_CACHE = $(CACHE)/mrd6.git
+MRD6_BUILDDIR = $(ROUTER_BUILDDIR)/mrd6
+MRD6_URL = https://github.com/hugosantos/mrd6.git
+
+$(MRD6_CACHE):
+	git clone --bare $(MRD6_URL) $@
+
+router-source: $(MRD6_BUILDDIR)
+$(MRD6_BUILDDIR): $(MRD6_CACHE)
+	git clone $< $@
+
+router-build: $(ROUTER_BUILDDIR)/mrd6-build
+$(ROUTER_BUILDDIR)/mrd6-build: $(MRD6_BUILDDIR)
+	$(MAKE) -C $(MRD6_BUILDDIR)
+	touch $@
+
+router-install: mrd6-install
+mrd6-install:
+	mkdir -p $(ROUTER_PKGDIR)/bin
+	cp $(MRD6_BUILDDIR)/src/mrd $(ROUTER_PKGDIR)/bin
+
 
 PACKAGES += router