update imq patches (fixes #2009)

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

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 8ca8052..43d7f7f 100644 (file)
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -4,13 +4,13 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id: Makefile 3822 2006-05-24 07:01:52Z nico $
+# $Id$

 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=util-linux
 PKG_VERSION:=2.12r
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=util-linux
 PKG_VERSION:=2.12r

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \


@@ -18,10 +18,6 @@ PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
        ftp://ftp.de.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
        http://ftp.de.kernel.org/pub/linux/utils/$(PKG_NAME)/
 PKG_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3
        ftp://ftp.de.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
        http://ftp.de.kernel.org/pub/linux/utils/$(PKG_NAME)/
 PKG_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3

-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -39,6 +35,15 @@ define Package/fdisk
   URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef
 
   URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef
 

+define Package/cfdisk
+  $(call Package/util-linux/Default)
+  TITLE:=Partition table manipulation utility
+  DEPENDS:=+libncurses
+  DESCRIPTION:=\
+       This package contains an utility for managing disk partition tables.
+  URL:=http://www.kernel.org/pub/linux/utils/util-linux/
+endef
+

 define Package/losetup
   $(call Package/util-linux/Default)
   TITLE:=Loopback devices setup and control utility
 define Package/losetup
   $(call Package/util-linux/Default)
   TITLE:=Loopback devices setup and control utility


@@ -56,6 +61,7 @@ define Package/swap-utils
        - swapoff
 endef
 
        - swapoff
 endef
 

+TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib

 define Build/Compile
        $(call Build/Compile/Default, \
                OPT="$(TARGET_CFLAGS)" \
 define Build/Compile
        $(call Build/Compile/Default, \
                OPT="$(TARGET_CFLAGS)" \


@@ -70,7 +76,7 @@ define Package/Template
                rm -f $(PKG_BUILD_DIR)/.built; \
                $(MAKE) $(PKG_BUILD_DIR)/.built; \
        fi
                rm -f $(PKG_BUILD_DIR)/.built; \
                $(MAKE) $(PKG_BUILD_DIR)/.built; \
        fi

-       install -d -m0755 $(2)
+       $(INSTALL_DIR) $(2)

        $(CP) $(PKG_INSTALL_DIR)/$(1) $(2)/
 endef
 
        $(CP) $(PKG_INSTALL_DIR)/$(1) $(2)/
 endef
 


@@ -78,6 +84,10 @@ define Package/fdisk/install
        $(call Package/Template,sbin/fdisk,$(1)/usr/sbin)
 endef
 
        $(call Package/Template,sbin/fdisk,$(1)/usr/sbin)
 endef
 

+define Package/cfdisk/install
+       $(call Package/Template,sbin/cfdisk,$(1)/usr/sbin)
+endef
+

 define Package/losetup/install
        $(call Package/Template,sbin/losetup,$(1)/usr/sbin)
 endef
 define Package/losetup/install
        $(call Package/Template,sbin/losetup,$(1)/usr/sbin)
 endef


@@ -89,5 +99,6 @@ define Package/swap-utils/install
 endef
 
 $(eval $(call BuildPackage,fdisk))
 endef
 
 $(eval $(call BuildPackage,fdisk))

+$(eval $(call BuildPackage,cfdisk))

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