summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-12 19:28:24 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-12 19:28:24 +0000
commit52bfb69332adbba0624babb1b4b0eecd990fe5de (patch)
treeba8c973f83cfa1b8eeb4058d7e3fb115921efbfc
parente436f2e66214839f960b5a3481c6c4c82a52c294 (diff)
convert cifsmount to new packaging style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@848 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/package/cifsmount/Makefile30
-rw-r--r--openwrt/package/cifsmount/ipkg/cifsmount.control (renamed from openwrt/package/cifsmount/cifsmount.control)0
2 files changed, 12 insertions, 18 deletions
diff --git a/openwrt/package/cifsmount/Makefile b/openwrt/package/cifsmount/Makefile
index bfd2c9ba46..81eac62b2d 100644
--- a/openwrt/package/cifsmount/Makefile
+++ b/openwrt/package/cifsmount/Makefile
@@ -7,26 +7,20 @@ PKG_VERSION:=1.5
PKG_RELEASE:=2
PKG_BUILD_DIR:=$(BUILD_DIR)/cifsmount
-PKG_IPK_DIR:=$(PKG_BUILD_DIR)
-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-$(PKG_BUILD_DIR)/sbin/mount.cifs:
- mkdir -p $(PKG_BUILD_DIR)/sbin
- $(TARGET_CC) -o $@ mount.cifs.c
- $(STRIP) $@
+include $(TOPDIR)/package/rules.mk
-$(PKG_IPK): $(PKG_BUILD_DIR)/sbin/mount.cifs
- $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
- $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+$(eval $(call PKG_template,CIFSMOUNT,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(IPKG_STATE_DIR)/info/$(PKG_NAME).list:
- $(IPKG) install $(PKG_IPK)
+$(PKG_BUILD_DIR)/.prepared:
+ mkdir -p $@
-source:
-prepare:
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+$(PKG_BUILD_DIR)/.built:
+ $(TARGET_CC) -o $(PKG_BUILD_DIR)/mount.cifs mount.cifs.c
+ $(STRIP) $(PKG_BUILD_DIR)/mount.cifs
+ touch $@
-clean:
- rm -rf $(PKG_BUILD_DIR)
- rm -f $(PKG_IPK)
+$(IPKG_CIFSMOUNT):
+ mkdir -p $(IDIR_CIFSMOUNT)/sbin
+ install -m 0755 $(PKG_BUILD_DIR)/mount.cifs $(IDIR_CIFSMOUNT)/sbin/mount.cifs
+ $(IPKG_BUILD) $(IDIR_CIFSMOUNT) $(PACKAGE_DIR)
diff --git a/openwrt/package/cifsmount/cifsmount.control b/openwrt/package/cifsmount/ipkg/cifsmount.control
index 145bc77c03..145bc77c03 100644
--- a/openwrt/package/cifsmount/cifsmount.control
+++ b/openwrt/package/cifsmount/ipkg/cifsmount.control