package/rt2x00 fixes:

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

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 8ca8052..c5c574c 100644 (file)
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -4,30 +4,24 @@
 # 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:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

-PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
-       http://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_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/

 PKG_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3
 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
 
 define Package/util-linux/Default
   SECTION:=utils
   CATEGORY:=Utilities
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/util-linux/Default
   SECTION:=utils
   CATEGORY:=Utilities

+  DEPENDS:=@!LINUX_2_6_ETRAX

   URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef
 
   URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef
 


@@ -35,7 +29,16 @@ define Package/fdisk
   $(call Package/util-linux/Default)
   TITLE:=Partition table manipulation utility
   DESCRIPTION:=\
   $(call Package/util-linux/Default)
   TITLE:=Partition table manipulation utility
   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
+  DESCRIPTION:=\
+       This package contains a utility for managing disk partition tables.

   URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef
 
   URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef
 


@@ -43,7 +46,7 @@ define Package/losetup
   $(call Package/util-linux/Default)
   TITLE:=Loopback devices setup and control utility
   DESCRIPTION:=\
   $(call Package/util-linux/Default)
   TITLE:=Loopback devices setup and control utility
   DESCRIPTION:=\

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

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


@@ -56,13 +59,29 @@ define Package/swap-utils
        - swapoff
 endef
 
        - swapoff
 endef
 

+define Package/hwclock
+  $(call Package/util-linux/Default)
+  TITLE:=Utilities for managing the hardware clock
+  DESCRIPTION:=\
+        This package contains a utility for managing the hardware clock
+endef
+
+define Build/Configure
+       # this is NOT GNU configure!
+       ( cd $(PKG_BUILD_DIR); \
+               CC="$(TARGET_CC)" \
+               CFLAGS="$(TARGET_CPPFLAGS)" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
+               ./configure \
+       );
+endef
+

 define Build/Compile
 define Build/Compile

-       $(call Build/Compile/Default, \
+       $(MAKE) -C $(PKG_BUILD_DIR) \

                OPT="$(TARGET_CFLAGS)" \
                INSTALLSUID="install -m 4755" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                OPT="$(TARGET_CFLAGS)" \
                INSTALLSUID="install -m 4755" \
                DESTDIR="$(PKG_INSTALL_DIR)" \

-               all install \
-       )
+               all install

 endef
 
 define Package/Template
 endef
 
 define Package/Template


@@ -70,7 +89,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 +97,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


@@ -88,6 +111,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))