Fix rt2x00 kernel config reading

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

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 05ad5cf..6c5a697 100644 (file)
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=util-linux
 PKG_VERSION:=2.12r
 
 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,7 +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

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


@@ -31,21 +30,33 @@ endef
 define Package/fdisk
   $(call Package/util-linux/Default)
   TITLE:=Partition table manipulation utility
 define Package/fdisk
   $(call Package/util-linux/Default)
   TITLE:=Partition table manipulation utility

+  DEPENDS:=@!LINUX_2_6_ETRAX

   DESCRIPTION:=\
   DESCRIPTION:=\

-       This package contains an utility for managing disk partition tables.
+       This package contains a utility for managing disk partition tables.
+  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 @!LINUX_2_6_ETRAX
+  DESCRIPTION:=\
+       This package contains a 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
   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

+  DEPENDS:=@!LINUX_2_6_ETRAX

   DESCRIPTION:=\
   DESCRIPTION:=\

-       This package contains an utility for managing loopback devices.
+       This package contains a utility for managing loopback devices.

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

+  DEPENDS:=@!LINUX_2_6_ETRAX

   DESCRIPTION:=\
        This package contains a collection of tools for managing swap space: \\\
        - mkswap\\\
   DESCRIPTION:=\
        This package contains a collection of tools for managing swap space: \\\
        - mkswap\\\


@@ -53,6 +64,14 @@ define Package/swap-utils
        - swapoff
 endef
 
        - swapoff
 endef
 

+define Package/hwclock
+  $(call Package/util-linux/Default)
+  TITLE:=Utilities for managing the hardware clock
+  DEPENDS:=@!LINUX_2_6_ETRAX
+  DESCRIPTION:=\
+        This package contains a utility for managing the hardware clock
+endef
+

 TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib
 define Build/Compile
        $(call Build/Compile/Default, \
 TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib
 define Build/Compile
        $(call Build/Compile/Default, \


@@ -76,6 +95,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


@@ -86,6 +109,12 @@ define Package/swap-utils/install
        $(call Package/Template,sbin/swapoff,$(1)/usr/sbin)
 endef
 
        $(call Package/Template,sbin/swapoff,$(1)/usr/sbin)
 endef
 

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

 $(eval $(call BuildPackage,fdisk))
 $(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))

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