From 5b3aac001b7a8fb243bdd091d5d501494abc23a4 Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Thu, 22 Sep 2011 18:41:28 -0600 Subject: [PATCH] remove dnsmasq from router package --- packages/router/router.mk | 27 ++---------------- packages/router/service/dnsmasq/dnsmasq.conf | 29 -------------------- packages/router/service/dnsmasq/log/run | 4 --- packages/router/service/dnsmasq/run | 12 -------- 4 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 packages/router/service/dnsmasq/dnsmasq.conf delete mode 100755 packages/router/service/dnsmasq/log/run delete mode 100755 packages/router/service/dnsmasq/run diff --git a/packages/router/router.mk b/packages/router/router.mk index ea9c639..d30118e 100644 --- a/packages/router/router.mk +++ b/packages/router/router.mk @@ -2,41 +2,18 @@ ROUTER_PKGDIR = $(TARGET)/router ROUTER_BUILDDIR = $(BUILD)/router -router-source: $(ROUTER_BUILDDIR)/dnsmasq-source $(ROUTER_BUILDDIR)/radvd-source +router-source: $(ROUTER_BUILDDIR)/radvd-source -router-build: $(ROUTER_BUILDDIR)/dnsmasq-build $(ROUTER_BUILDDIR)/radvd-build +router-build: $(ROUTER_BUILDDIR)/radvd-build router-install: router-build mkdir -p $(ROUTER_PKGDIR)/bin - cp $(DNSMASQ_SRCDIR)/src/dnsmasq $(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) -## -## dnsmasq -## -DNSMASQ_VERSION = 2.57 -DNSMASQ_SRCDIR = $(ROUTER_BUILDDIR)/dnsmasq-$(DNSMASQ_VERSION) -DNSMASQ_TARBALL = $(CACHE)/dnsmasq-$(DNSMASQ_VERSION).tar.gz -DNSMASQ_URL = http://www.thekelleys.org.uk/dnsmasq/dnsmasq-$(DNSMASQ_VERSION).tar.gz - -$(DNSMASQ_TARBALL): - @ mkdir -p $(@D) - wget -O $@ $(DNSMASQ_URL) - -$(ROUTER_BUILDDIR)/dnsmasq-source: $(DNSMASQ_TARBALL) - mkdir -p $(ROUTER_BUILDDIR) - zcat $(DNSMASQ_TARBALL) | (cd $(ROUTER_BUILDDIR) && tar xf -) - touch $@ - -$(ROUTER_BUILDDIR)/dnsmasq-build: $(ROUTER_BUILDDIR)/dnsmasq-source - $(MAKE) -C $(DNSMASQ_SRCDIR) - touch $@ - - ## ## radvd ## diff --git a/packages/router/service/dnsmasq/dnsmasq.conf b/packages/router/service/dnsmasq/dnsmasq.conf deleted file mode 100644 index a047ccc..0000000 --- a/packages/router/service/dnsmasq/dnsmasq.conf +++ /dev/null @@ -1,29 +0,0 @@ -no-resolv -local=/ctf/ -no-hosts -domain=ctf -dhcp-authoritative -dhcp-range=vlan1,172.16.1.10,172.16.1.254 -dhcp-range=vlan2,172.16.2.10,172.16.2.254 -dhcp-range=vlan3,172.16.3.10,172.16.3.254 -dhcp-range=vlan4,172.16.4.10,172.16.4.254 -dhcp-range=vlan5,172.16.5.10,172.16.5.254 -dhcp-range=vlan6,172.16.6.10,172.16.6.254 -dhcp-range=vlan7,172.16.7.10,172.16.7.254 -dhcp-range=vlan8,172.16.8.10,172.16.8.254 -dhcp-range=vlan9,172.16.9.10,172.16.9.254 -dhcp-range=vlan10,172.16.10.10,172.16.10.254 -dhcp-range=vlan11,172.16.11.10,172.16.11.254 -dhcp-range=vlan12,172.16.12.10,172.16.12.254 -dhcp-range=vlan13,172.16.13.10,172.16.13.254 -dhcp-range=vlan14,172.16.14.10,172.16.14.254 -dhcp-range=vlan15,172.16.15.10,172.16.15.254 -dhcp-range=vlan16,172.16.16.10,172.16.16.254 -dhcp-range=vlan17,172.16.17.10,172.16.17.254 -dhcp-range=vlan18,172.16.18.10,172.16.18.254 -dhcp-range=vlan19,172.16.19.10,172.16.19.254 -dhcp-range=vlan20,172.16.20.10,172.16.20.254 -dhcp-range=vlan21,172.16.21.10,172.16.21.254 -dhcp-range=vlan22,172.16.22.10,172.16.22.254 -dhcp-range=vlan23,172.16.23.10,172.16.23.254 -dhcp-range=vlan24,172.16.24.10,172.16.24.254 diff --git a/packages/router/service/dnsmasq/log/run b/packages/router/service/dnsmasq/log/run deleted file mode 100755 index d9d6355..0000000 --- a/packages/router/service/dnsmasq/log/run +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh - -exec svlogd -tt $PWD - diff --git a/packages/router/service/dnsmasq/run b/packages/router/service/dnsmasq/run deleted file mode 100755 index 1373e45..0000000 --- a/packages/router/service/dnsmasq/run +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/sh -e - -exec 2>&1 - -mkdir -p /var/lib/misc - -exec /opt/router/sbin/dnsmasq \ - --keep-in-foreground \ - --conf-file=dnsmasq.conf \ - --pid-file= \ - --log-facility=/proc/self/fd/1 -