[backfire] firewall: merge r28535

[openwrt-10.03/.git] / package / block-mount / Makefile

diff --git a/package/block-mount/Makefile b/package/block-mount/Makefile
index a31096de3bc07986adf977b9468207103acd1052..abcf3eb57aedf685a0c1c1f5a60a8785d55a9333 100644 (file)
--- a/package/block-mount/Makefile
+++ b/package/block-mount/Makefile
@@ -9,9 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=block-mount
 PKG_VERSION:=0.1.0
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_RELEASE:=2.1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -25,27 +23,6 @@ define Package/block-mount
   TITLE:=Block device mounting and checking
 endef
 
-define Package/block-mount/config
-  select BUSYBOX_CONFIG_MKSWAP
-  select BUSYBOX_CONFIG_FEATURE_MKSWAP_UUID
-  select BUSYBOX_CONFIG_SWAPONOFF
-  select BUSYBOX_CONFIG_BLKID
-  select BUSYBOX_CONFIG_FEATURE_VOLUMEID_EXT
-  select BUSYBOX_CONFIG_FEATURE_VOLUMEID_REISERFS
-  select BUSYBOX_CONFIG_FEATURE_VOLUMEID_FAT
-  select BUSYBOX_CONFIG_FEATURE_VOLUMEID_HFS
-  select BUSYBOX_CONFIG_FEATURE_VOLUMEID_JFS
-  select BUSYBOX_CONFIG_FEATURE_VOLUMEID_XFS
-  select BUSYBOX_CONFIG_FEATURE_VOLUMEID_NTFS
-  select BUSYBOX_CONFIG_FEATURE_VOLUMEID_SYSV
-  select BUSYBOX_CONFIG_FEATURE_VOLUMEID_OCFS2
-  select BUSYBOX_CONFIG_FEATURE_VOLUMEID_ISO9660
-  select BUSYBOX_CONFIG_FEATURE_VOLUMEID_UDF
-  select BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP
-  select BUSYBOX_CONFIG_FEATURE_VOLUMEID_CRAMFS
-  select BUSYBOX_CONFIG_FEATURE_VOLUMEID_ROMFS
-endef
-
 define Package/block-mount/description
   Scripts used to mount and check block devices (filesystems and swap)
 endef
@@ -53,7 +30,7 @@ endef
 define Package/block-hotplug
   $(call Package/block-mount/Default)
   TITLE:=Automount and autocheck block devices
-  DEPENDS:=block-mount hotplug2
+  DEPENDS:=+block-mount +hotplug2
 endef
 
 define Package/block-hotplug/description
@@ -63,6 +40,10 @@ endef
 define Build/Compile
 endef
 
+define Package/block-mount/conffiles
+/etc/config/fstab
+endef
+
 define Package/block-mount/install
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/fstab.init $(1)/etc/init.d/fstab