diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2005-08-27 15:40:56 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2005-08-27 15:40:56 +0000 |
| commit | b4466422c894a43e093bedb341b16e8e7839004b (patch) | |
| tree | 681f7a870d4ba428f3286ba741badacf63197767 | |
| parent | 95689ed7ac21e3a705bae12a0884a984db238d95 (diff) | |
| download | upstream-b4466422c894a43e093bedb341b16e8e7839004b.tar.gz upstream-b4466422c894a43e093bedb341b16e8e7839004b.tar.bz2 upstream-b4466422c894a43e093bedb341b16e8e7839004b.zip | |
move hotplug script into an extra package so that it doesn't conflict with nas
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1772 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/Makefile | 12 | ||||
| -rwxr-xr-x | package/base-files/files/hotplug (renamed from package/base-files/default/sbin/hotplug) | 0 | ||||
| -rw-r--r-- | package/base-files/ipkg/hotplug.control | 6 |
3 files changed, 17 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index af60baface..9cca04a738 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -11,6 +11,9 @@ include $(TOPDIR)/package/rules.mk IDIR_BASE:=$(PKG_BUILD_DIR)/base-files IPKG_BASE:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_RELEASE)_$(ARCH).ipk +IDIR_HOTPLUG:=$(PKG_BUILD_DIR)/hotplug +IPKG_HOTPLUG:=$(PACKAGE_DIR)/hotplug_$(PKG_RELEASE)_$(ARCH).ipk + LIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version} IDIR_LIBC:=$(PKG_BUILD_DIR)/uclibc IPKG_LIBC:=$(PACKAGE_DIR)/uclibc_$(LIBC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk @@ -19,7 +22,7 @@ GCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version} IDIR_GCC:=$(PKG_BUILD_DIR)/libgcc IPKG_GCC:=$(PACKAGE_DIR)/libgcc_$(GCC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PACKAGES:=$(IPKG_BASE) $(IPKG_LIBC) $(IPKG_GCC) +PACKAGES:=$(IPKG_BASE) $(IPKG_LIBC) $(IPKG_GCC) $(IPKG_HOTPLUG) $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) $(PACKAGE_DIR) @@ -43,6 +46,7 @@ $(IPKG_BASE): ln -sf /tmp $(IDIR_BASE)/var -find $(IDIR_BASE) -type d -name CVS | xargs rm -rf -find $(IDIR_BASE) -type d -name .svn | xargs rm -rf + -find $(IDIR_BASE) -name '.#*' | xargs rm -f mkdir -p $(IDIR_BASE)/etc -grep \^BR2_SYSCONF $(TOPDIR)/.config > $(IDIR_BASE)/etc/sysconf $(IPKG_BUILD) $(IDIR_BASE) $(PACKAGE_DIR) @@ -64,6 +68,12 @@ $(IPKG_GCC): -$(STRIP) $(IDIR_GCC)/lib/* $(IPKG_BUILD) $(IDIR_GCC) $(PACKAGE_DIR) +$(IPKG_HOTPLUG): + $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_HOTPLUG) ipkg/hotplug.control $(PKG_RELEASE) $(ARCH) + mkdir -p $(IDIR_HOTPLUG)/sbin + install -m0755 files/hotplug $(IDIR_HOTPLUG)/sbin + $(IPKG_BUILD) $(IDIR_HOTPLUG) $(PACKAGE_DIR) + package-clean: rm -f $(PACKAGES) clean: package-clean diff --git a/package/base-files/default/sbin/hotplug b/package/base-files/files/hotplug index 74134e848a..74134e848a 100755 --- a/package/base-files/default/sbin/hotplug +++ b/package/base-files/files/hotplug diff --git a/package/base-files/ipkg/hotplug.control b/package/base-files/ipkg/hotplug.control new file mode 100644 index 0000000000..8d6f7852c3 --- /dev/null +++ b/package/base-files/ipkg/hotplug.control @@ -0,0 +1,6 @@ +Package: hotplug +Priority: optional +Section: net +Maintainer: Felix Fietkau <nbd@vd-s.ath.cx> +Source: buildroot internal +Description: Hotplug script for WDS |