X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Futil-linux-ng%2FMakefile;h=8f4ee9b1892a138527965ffe6aa88f0576d7b5d1;hb=148d1344ce7d2e40de0d2fa3848f2e9530015e18;hp=96fefd3e8a4b41eeeb14b40c88abb28828fcfaac;hpb=1c9eef45516a6239cbbb742410c6152b1264c026;p=openwrt-10.03%2F.git

diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
index 96fefd3e8..8f4ee9b18 100644
--- a/package/util-linux-ng/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,20 +9,19 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=util-linux-ng
 PKG_VERSION:=2.13.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.13
 PKG_MD5SUM:=c841dc8743905c8f0db20c9db5094f57
 
-PKG_BUILD_DEPENDS=libblkid libuuid
+PKG_BUILD_DEPENDS=e2fsprogs
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/util-linux/Default
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@!TARGET_etrax
   URL:=http://www.kernel.org/pub/linux/utils/util-linux-ng/
 endef
 
@@ -38,9 +37,9 @@ endef
 
 define Package/cfdisk
 $(call Package/util-linux/Default)
+  SUBMENU:=disc
   TITLE:=Partition table manipulation utility
   DEPENDS:= +libncurses
-  SUBMENU:=disc
 endef
 
 define Package/cfdisk/description
@@ -59,6 +58,7 @@ endef
 define Package/mount-utils
 $(call Package/util-linux/Default)
   TITLE:=Devices mount/unmounting utilities
+  DEPENDS+= +libblkid +libuuid
 endef
 
 define Package/mount-utils/description
@@ -67,8 +67,9 @@ endef
 
 define Package/swap-utils
 $(call Package/util-linux/Default)
-  TITLE:=Swap space management utilities
   SUBMENU:=disc
+  TITLE:=Swap space management utilities
+  DEPENDS+= +libblkid +libuuid
 endef
 
 define Package/swap-utils/description
@@ -110,8 +111,8 @@ define Package/losetup/install
 endef
 
 define Package/mount-utils/install
-	$(INSTALL_DIR) $(1)/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/{u,}mount $(1)/sbin
+	$(INSTALL_DIR) $(1)/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mount/{u,}mount $(1)/bin
 endef
 
 define Package/swap-utils/install