From 8caf798b801af61f6c64cfc5f42ea767cfa22fc2 Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 18 Apr 2005 21:54:20 +0000 Subject: Change dhcp-forwarder, rename config var, uniformize package makefile, move ipkg related files to ./ipkg git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@680 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../dhcp-forwarder/ipkg/dhcp-forwarder.conffiles | 1 + package/dhcp-forwarder/ipkg/dhcp-forwarder.control | 8 ++ package/dhcp-forwarder/ipkg/dhcp-forwarder.init | 21 ++++ .../ipkg/dhcp-forwarder/CONTROL/conffiles | 1 - .../ipkg/dhcp-forwarder/CONTROL/control | 8 -- .../ipkg/dhcp-forwarder/etc/init.d/dhcp-fwd | 21 ---- package/dhcp-forwarder/ipkg/rules | 128 --------------------- package/dhcp-forwarder/ipkg/version | 1 - 8 files changed, 30 insertions(+), 159 deletions(-) create mode 100644 package/dhcp-forwarder/ipkg/dhcp-forwarder.conffiles create mode 100644 package/dhcp-forwarder/ipkg/dhcp-forwarder.control create mode 100644 package/dhcp-forwarder/ipkg/dhcp-forwarder.init delete mode 100644 package/dhcp-forwarder/ipkg/dhcp-forwarder/CONTROL/conffiles delete mode 100644 package/dhcp-forwarder/ipkg/dhcp-forwarder/CONTROL/control delete mode 100644 package/dhcp-forwarder/ipkg/dhcp-forwarder/etc/init.d/dhcp-fwd delete mode 100644 package/dhcp-forwarder/ipkg/rules delete mode 100644 package/dhcp-forwarder/ipkg/version (limited to 'package/dhcp-forwarder/ipkg') diff --git a/package/dhcp-forwarder/ipkg/dhcp-forwarder.conffiles b/package/dhcp-forwarder/ipkg/dhcp-forwarder.conffiles new file mode 100644 index 000000000..70be85a8a --- /dev/null +++ b/package/dhcp-forwarder/ipkg/dhcp-forwarder.conffiles @@ -0,0 +1 @@ +/etc/dhcp-fwd.conf diff --git a/package/dhcp-forwarder/ipkg/dhcp-forwarder.control b/package/dhcp-forwarder/ipkg/dhcp-forwarder.control new file mode 100644 index 000000000..75128bab3 --- /dev/null +++ b/package/dhcp-forwarder/ipkg/dhcp-forwarder.control @@ -0,0 +1,8 @@ +Package: dhcp-forwarder +Priority: optional +Section: net +Version: [TBDL] +Architecture: [TBDL] +Maintainer: Nico +Source: http://nthill.free.fr/openwrt/sources/dhcp-forwarder/ +Description: a DHCP relay agent diff --git a/package/dhcp-forwarder/ipkg/dhcp-forwarder.init b/package/dhcp-forwarder/ipkg/dhcp-forwarder.init new file mode 100644 index 000000000..6ad3858e8 --- /dev/null +++ b/package/dhcp-forwarder/ipkg/dhcp-forwarder.init @@ -0,0 +1,21 @@ +#!/bin/sh + +LOG_D=/var/log +RUN_D=/var/run +PID_F=$RUN_D/dhcpd-fwd.pid + +case $1 in + start) + [ -d $LOG_D ] || mkdir -p $LOG_D + [ -d $RUN_D ] || mkdir -p $RUN_D + dhcp-fwd + ;; + stop) + [ -f $PID_F ] && kill $(cat $PID_F) + ;; + *) + echo "usage: $0 (start|stop)" + exit 1 +esac + +exit $? diff --git a/package/dhcp-forwarder/ipkg/dhcp-forwarder/CONTROL/conffiles b/package/dhcp-forwarder/ipkg/dhcp-forwarder/CONTROL/conffiles deleted file mode 100644 index 70be85a8a..000000000 --- a/package/dhcp-forwarder/ipkg/dhcp-forwarder/CONTROL/conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/dhcp-fwd.conf diff --git a/package/dhcp-forwarder/ipkg/dhcp-forwarder/CONTROL/control b/package/dhcp-forwarder/ipkg/dhcp-forwarder/CONTROL/control deleted file mode 100644 index 75128bab3..000000000 --- a/package/dhcp-forwarder/ipkg/dhcp-forwarder/CONTROL/control +++ /dev/null @@ -1,8 +0,0 @@ -Package: dhcp-forwarder -Priority: optional -Section: net -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/dhcp-forwarder/ -Description: a DHCP relay agent diff --git a/package/dhcp-forwarder/ipkg/dhcp-forwarder/etc/init.d/dhcp-fwd b/package/dhcp-forwarder/ipkg/dhcp-forwarder/etc/init.d/dhcp-fwd deleted file mode 100644 index 8557c78f9..000000000 --- a/package/dhcp-forwarder/ipkg/dhcp-forwarder/etc/init.d/dhcp-fwd +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -LOG_D=/var/log -RUN_D=/var/run -PID_F=$RUN_D/dhcpd-fwd.pid - -case $1 in - start) - [ -d $LOG_D ] || mkdir -p $LOG_D - [ -d $RUN_D ] || mkdir -p $RUN_D - dhcp-fwd >/dev/null 2>&1 - ;; - stop) - [ -f $PID_F ] && kill $(cat $PID_F) >/dev/null 2>&1 - ;; - *) - echo "usage: $0 (start|stop)" - exit 1 -esac - -exit $? diff --git a/package/dhcp-forwarder/ipkg/rules b/package/dhcp-forwarder/ipkg/rules deleted file mode 100644 index eb9bbcde3..000000000 --- a/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/package/dhcp-forwarder/ipkg/version b/package/dhcp-forwarder/ipkg/version deleted file mode 100644 index d079bce27..000000000 --- a/package/dhcp-forwarder/ipkg/version +++ /dev/null @@ -1 +0,0 @@ -0.7-4 -- cgit v1.2.3