From 0d27f51bd6c03bc36fb83ba8e12f4b71ad2f8387 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Mon, 12 Dec 2005 03:52:27 +0000 Subject: [PATCH] move init scripts and related out of ipkg/ SVN-Revision: 2637 --- openwrt/package/snort-wireless/Makefile | 6 ++---- .../snort-wireless/{ipkg => files}/snort-wireless.default | 0 .../snort-wireless/{ipkg => files}/snort-wireless.init | 0 openwrt/package/snort/Makefile | 6 ++---- openwrt/package/snort/{ipkg => files}/snort.default | 0 openwrt/package/snort/{ipkg => files}/snort.init | 0 6 files changed, 4 insertions(+), 8 deletions(-) rename openwrt/package/snort-wireless/{ipkg => files}/snort-wireless.default (100%) rename openwrt/package/snort-wireless/{ipkg => files}/snort-wireless.init (100%) rename openwrt/package/snort/{ipkg => files}/snort.default (100%) rename openwrt/package/snort/{ipkg => files}/snort.init (100%) diff --git a/openwrt/package/snort-wireless/Makefile b/openwrt/package/snort-wireless/Makefile index a0abd732e2..2d0fd76376 100644 --- a/openwrt/package/snort-wireless/Makefile +++ b/openwrt/package/snort-wireless/Makefile @@ -107,13 +107,11 @@ $(PKG_BUILD_DIR)/$(2): $(PKG_BUILD_DIR)/.prepared mv $(PKG_BUILD_DIR)/src/snort $(PKG_BUILD_DIR)/$(2) $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.installed $(PKG_BUILD_DIR)/$(2) - rm -rf $$(IDIR_$(1)) - $(SCRIPT_DIR)/make-ipkg-dir.sh $$(IDIR_$(1)) ./ipkg/$(2).control $(3) $(4) install -m0644 ./ipkg/snort-wireless.conffiles $$(IDIR_$(1))/CONTROL/conffiles install -d -m0755 $$(IDIR_$(1))/etc/default - install -m0644 ./ipkg/snort-wireless.default $$(IDIR_$(1))/etc/default/snort + install -m0644 ./files/snort-wireless.default $$(IDIR_$(1))/etc/default/snort install -d -m0755 $$(IDIR_$(1))/etc/init.d - install -m0755 ./ipkg/snort-wireless.init $$(IDIR_$(1))/etc/init.d/snort + install -m0755 ./files/snort-wireless.init $$(IDIR_$(1))/etc/init.d/snort install -d -m0755 $$(IDIR_$(1))/etc/snort install -m0644 $(PKG_BUILD_DIR)/etc/snort.conf $$(IDIR_$(1))/etc/snort/ install -m0644 $(PKG_BUILD_DIR)/etc/classification.config $$(IDIR_$(1))/etc/snort/ diff --git a/openwrt/package/snort-wireless/ipkg/snort-wireless.default b/openwrt/package/snort-wireless/files/snort-wireless.default similarity index 100% rename from openwrt/package/snort-wireless/ipkg/snort-wireless.default rename to openwrt/package/snort-wireless/files/snort-wireless.default diff --git a/openwrt/package/snort-wireless/ipkg/snort-wireless.init b/openwrt/package/snort-wireless/files/snort-wireless.init similarity index 100% rename from openwrt/package/snort-wireless/ipkg/snort-wireless.init rename to openwrt/package/snort-wireless/files/snort-wireless.init diff --git a/openwrt/package/snort/Makefile b/openwrt/package/snort/Makefile index 630ac127ec..9f265508f0 100644 --- a/openwrt/package/snort/Makefile +++ b/openwrt/package/snort/Makefile @@ -109,13 +109,11 @@ $(PKG_BUILD_DIR)/$(2): $(PKG_BUILD_DIR)/.prepared mv $(PKG_BUILD_DIR)/src/snort $(PKG_BUILD_DIR)/$(2) $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.installed $(PKG_BUILD_DIR)/$(2) - rm -rf $$(IDIR_$(1)) - $(SCRIPT_DIR)/make-ipkg-dir.sh $$(IDIR_$(1)) ./ipkg/$(2).control $(3) $(4) install -m0644 ./ipkg/snort.conffiles $$(IDIR_$(1))/CONTROL/conffiles install -d -m0755 $$(IDIR_$(1))/etc/default - install -m0644 ./ipkg/snort.default $$(IDIR_$(1))/etc/default/snort + install -m0644 ./files/snort.default $$(IDIR_$(1))/etc/default/snort install -d -m0755 $$(IDIR_$(1))/etc/init.d - install -m0755 ./ipkg/snort.init $$(IDIR_$(1))/etc/init.d/snort + install -m0755 ./files/snort.init $$(IDIR_$(1))/etc/init.d/snort install -d -m0755 $$(IDIR_$(1))/etc/snort install -m0644 $(PKG_BUILD_DIR)/etc/snort.conf $$(IDIR_$(1))/etc/snort/ install -m0644 $(PKG_BUILD_DIR)/etc/classification.config $$(IDIR_$(1))/etc/snort/ diff --git a/openwrt/package/snort/ipkg/snort.default b/openwrt/package/snort/files/snort.default similarity index 100% rename from openwrt/package/snort/ipkg/snort.default rename to openwrt/package/snort/files/snort.default diff --git a/openwrt/package/snort/ipkg/snort.init b/openwrt/package/snort/files/snort.init similarity index 100% rename from openwrt/package/snort/ipkg/snort.init rename to openwrt/package/snort/files/snort.init