fixed mount path (closes #3464)

[openwrt.git] / package / util-linux-ng / Makefile

diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
index 103e790..38b7c5d 100644 (file)
--- a/package/util-linux-ng/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -56,6 +56,15 @@ define Package/losetup/description
  This package contains a utility for managing loopback devices.
 endef
 
  This package contains a utility for managing loopback devices.
 endef
 

+define Package/mount-utils
+$(call Package/util-linux/Default)
+  TITLE:=Devices mount/unmounting utilities
+endef
+
+define Package/mount-utils/description
+ This package contains utilities to mount/unmount devices.
+endef
+

 define Package/swap-utils
 $(call Package/util-linux/Default)
   TITLE:=Swap space management utilities
 define Package/swap-utils
 $(call Package/util-linux/Default)
   TITLE:=Swap space management utilities


@@ -63,7 +72,7 @@ $(call Package/util-linux/Default)
 endef
 
 define Package/swap-utils/description
 endef
 
 define Package/swap-utils/description

- This package contains a collection of tools for managing swap space: 
+ This package contains a collection of tools for managing swap space:

  - mkswap
  - swapon
  - swapoff
  - mkswap
  - swapon
  - swapoff


@@ -80,40 +89,45 @@ endef
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR)/disk-utils mkswap
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR)/disk-utils mkswap

-       $(MAKE) -C $(PKG_BUILD_DIR)/mount swapon losetup
+       $(MAKE) -C $(PKG_BUILD_DIR)/mount swapon losetup umount mount

        $(MAKE) -C $(PKG_BUILD_DIR)/fdisk fdisk cfdisk
        $(MAKE) -C $(PKG_BUILD_DIR)/hwclock hwclock
 endef
 
 define Package/fdisk/install
        $(MAKE) -C $(PKG_BUILD_DIR)/fdisk fdisk cfdisk
        $(MAKE) -C $(PKG_BUILD_DIR)/hwclock hwclock
 endef
 
 define Package/fdisk/install

-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/fdisk $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/fdisk $(1)/sbin/

 endef
 
 define Package/cfdisk/install
 endef
 
 define Package/cfdisk/install

-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/cfdisk $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/fdisk/cfdisk $(1)/sbin/

 endef
 
 define Package/losetup/install
 endef
 
 define Package/losetup/install

-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/losetup $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/losetup $(1)/sbin/
+endef
+
+define Package/mount-utils/install
+       $(INSTALL_DIR) $(1)/bin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/{u,}mount $(1)/bin

 endef
 
 define Package/swap-utils/install
 endef
 
 define Package/swap-utils/install

-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/mkswap $(1)/usr/sbin/
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/swapon $(1)/usr/sbin/
-       ln -sf swapon $(1)/usr/sbin/swapoff
+       $(INSTALL_DIR) $(1)/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/disk-utils/mkswap $(PKG_BUILD_DIR)/mount/swapon $(1)/sbin/
+       ln -sf swapon $(1)/sbin/swapoff

 endef
 
 define Package/hwclock/install
 endef
 
 define Package/hwclock/install

-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/hwclock/hwclock $(1)/sbin/

 endef
 
 $(eval $(call BuildPackage,fdisk))
 $(eval $(call BuildPackage,cfdisk))
 $(eval $(call BuildPackage,losetup))
 endef
 
 $(eval $(call BuildPackage,fdisk))
 $(eval $(call BuildPackage,cfdisk))
 $(eval $(call BuildPackage,losetup))

+$(eval $(call BuildPackage,mount-utils))

 $(eval $(call BuildPackage,swap-utils))
 $(eval $(call BuildPackage,hwclock))
 $(eval $(call BuildPackage,swap-utils))
 $(eval $(call BuildPackage,hwclock))