Change dhcp-forwarder, rename config var, uniformize package makefile, move ipkg related files to ./ipkg

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@680 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 2 insertions, 131 deletions

diff --git a/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder/CONTROL/conffiles b/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder.conffiles
index 70be85a8a..70be85a8a 100644
--- a/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder/CONTROL/conffiles
+++ b/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder.conffiles
diff --git a/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder/CONTROL/control b/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder.control
index 75128bab3..75128bab3 100644
--- a/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder/CONTROL/control
+++ b/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder.control
diff --git a/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder/etc/init.d/dhcp-fwd b/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder.init
index 8557c78f9..6ad3858e8 100644
--- a/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder/etc/init.d/dhcp-fwd
+++ b/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder.init
@@ -8,10 +8,10 @@ case $1 in
  start)
   [ -d $LOG_D ] || mkdir -p $LOG_D
   [ -d $RUN_D ] || mkdir -p $RUN_D
-  dhcp-fwd >/dev/null 2>&1
+  dhcp-fwd
   ;;
  stop)
-  [ -f $PID_F ] && kill $(cat $PID_F) >/dev/null 2>&1
+  [ -f $PID_F ] && kill $(cat $PID_F)
   ;;
  *)
   echo "usage: $0 (start|stop)"
diff --git a/openwrt/package/dhcp-forwarder/ipkg/rules b/openwrt/package/dhcp-forwarder/ipkg/rules
deleted file mode 100644
index eb9bbcde3..000000000
--- a/openwrt/package/dhcp-forwarder/ipkg/rules
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/make -f
-
-ifneq ($(strip ${IPKG_RULES_INC}),)
- include $(IPKG_RULES_INC)
-endif
-
-##
-
-PKG_VERSION := $(shell cat ./ipkg/version)
-CURRENT_DIR := $(shell pwd)
-INSTALL_DIR ?= $(CURRENT_DIR)/ipkg-install
-
-unexport INSTALL_DIR
-
-I_DHCP_FORWARDER := ipkg/dhcp-forwarder
-
-BUILD_DEPS := \
-
-CONFIGURE_OPTS = \
-
-##
-
-all: package
-
-
-.stamp-configured: $(BUILD_DEPS)
-
-	rm -rf config.cache
-	$(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-	LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-	ac_cv_func_malloc_0_nonnull="yes" \
-	./configure \
-	  --target=$(GNU_TARGET_NAME) \
-	  --host=$(GNU_TARGET_NAME) \
-	  --build=$(GNU_HOST_NAME) \
-	  --program-prefix="" \
-	  --program-suffix="" \
-	  --prefix=/usr \
-	  --exec-prefix=/usr \
-	  --bindir=/usr/bin \
-	  --datadir=/usr/share \
-	  --includedir=/usr/include \
-	  --infodir=/usr/share/info \
-	  --libdir=/usr/lib \
-	  --libexecdir=/usr/lib \
-	  --localstatedir=/var \
-	  --mandir=/usr/share/man \
-	  --sbindir=/usr/sbin \
-	  --sysconfdir=/etc \
-	  $(DISABLE_LARGEFILE) \
-	  $(DISABLE_NLS) \
-	  $(CONFIGURE_OPTS) \
-
-	touch .stamp-configured
-
-
-.stamp-built: .stamp-configured
-
-	$(MAKE) \
-	  $(TARGET_CONFIGURE_OPTS) \
-	  cfg_filename="/etc/dhcp-fwd.conf" \
-
-	touch .stamp-built
-
-
-$(INSTALL_DIR)/usr/sbin/dhcp-fwd: .stamp-built
-
-	mkdir -p $(INSTALL_DIR)
-
-	$(MAKE) \
-	  DESTDIR="$(INSTALL_DIR)" \
-	 install
-
-
-configure: .stamp-configured
-
-
-build: .stamp-built
-
-
-install: $(INSTALL_DIR)/usr/sbin/dhcp-fwd
-
-
-package: $(INSTALL_DIR)/usr/sbin/dhcp-fwd
-
-	mkdir -p $(I_DHCP_FORWARDER)/etc
-	cp -fpR contrib/dhcp-fwd.conf $(I_DHCP_FORWARDER)/etc/
-
-	mkdir -p $(I_DHCP_FORWARDER)/usr/sbin
-	cp -fpR $(INSTALL_DIR)/usr/sbin/dhcp-fwd $(I_DHCP_FORWARDER)/usr/sbin/
-	$(STRIP) $(I_DHCP_FORWARDER)/usr/sbin/*
-
-	chmod 0755 $(I_DHCP_FORWARDER)/etc/
-	chmod 0600 $(I_DHCP_FORWARDER)/etc/dhcp-fwd.conf
-	chmod 0755 $(I_DHCP_FORWARDER)/etc/init.d/
-	chmod 0755 $(I_DHCP_FORWARDER)/etc/init.d/dhcp-fwd
-
-	chmod 0755 ipkg/*/CONTROL/
-	chmod 0644 ipkg/*/CONTROL/control
-	-chmod 0644 ipkg/*/CONTROL/conffiles
-
-	perl -pi -e "s/^Arch.*:.*/Architecture: $(ARCH)/g" ipkg/*/CONTROL/control
-ifneq ($(strip $(PKG_VERSION)),)
-	perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control
-endif
-
-	$(IPKG_BUILD) $(I_DHCP_FORWARDER) $(IPKG_TARGET_DIR)
-
-
-clean:
-
-	-$(MAKE) \
-	  DESTDIR="$(INSTALL_DIR)" \
-	 uninstall clean
-	
-	rm -rf .stamp-* \
-	  $(I_DHCP_FORWARDER)/etc/dhcp-fwd.conf \
-	  $(I_DHCP_FORWARDER)/usr \
-
-
-control:
-
-	@cat $(I_DHCP_FORWARDER)/CONTROL/control
-	@echo
-	
-
-.PHONY: configure build install package clean control
diff --git a/openwrt/package/dhcp-forwarder/ipkg/version b/openwrt/package/dhcp-forwarder/ipkg/version
deleted file mode 100644
index d079bce27..000000000
--- a/openwrt/package/dhcp-forwarder/ipkg/version
+++ /dev/null
@@ -1 +0,0 @@
-0.7-4