X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/6b53157103d462f7ea0b81f9fe77412719ea2260..51e0cac07a5c4b2886a1cf8c99ca0e1b5cbfa708:/package/util-linux/Makefile

diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index ad5dd19db..6c5a6972f 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -1,59 +1,120 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=fdisk
+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)/ \
+	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_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3
 
-PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/util-linux/ \
-	http://ftp.kernel.org/pub/linux/utils/util-linux/ \
-	ftp://ftp.de.kernel.org/pub/linux/utils/util-linux/ \
-	http://ftp.de.kernel.org/pub/linux/utils/util-linux/
-PKG_SOURCE:=util-linux-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-PKG_BUILD_DIR:=$(BUILD_DIR)/util-linux-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(TOPDIR)/package/rules.mk
-
-$(eval $(call PKG_template,FDISK,fdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,SWAP_UTILS,swap-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.configured:
-	(cd $(PKG_BUILD_DIR); \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		./configure \
-	);
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
+include $(INCLUDE_DIR)/package.mk
+
+define Package/util-linux/Default
+  SECTION:=utils
+  CATEGORY:=Utilities
+  URL:=http://www.kernel.org/pub/linux/utils/util-linux/
+endef
+
+define Package/fdisk
+  $(call Package/util-linux/Default)
+  TITLE:=Partition table manipulation utility
+  DEPENDS:=@!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/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
+  DEPENDS:=@!LINUX_2_6_ETRAX
+  DESCRIPTION:=\
+	This package contains a utility for managing loopback devices.
+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\\\
+	- swapon\\\
+	- 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, \
 		OPT="$(TARGET_CFLAGS)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
 		INSTALLSUID="install -m 4755" \
-		all install
-	touch $@
-
-$(IPKG_FDISK):
-	install -d -m0755 $(IDIR_FDISK)/usr/sbin
-	cp -fpR $(PKG_INSTALL_DIR)/sbin/fdisk $(IDIR_FDISK)/usr/sbin/
-	$(RSTRIP) $(IDIR_FDISK)
-	$(IPKG_BUILD) $(IDIR_FDISK) $(PACKAGE_DIR)
-
-$(IPKG_SWAP_UTILS):
-	install -d -m0755 $(IDIR_SWAP_UTILS)/usr/sbin
-	cp -fpR $(PKG_INSTALL_DIR)/sbin/mkswap $(IDIR_SWAP_UTILS)/usr/sbin/
-	cp -fpR $(PKG_INSTALL_DIR)/sbin/swap{on,off} $(IDIR_SWAP_UTILS)/usr/sbin/
-	$(RSTRIP) $(IDIR_SWAP_UTILS)
-	$(IPKG_BUILD) $(IDIR_SWAP_UTILS) $(PACKAGE_DIR)
-
-mostlyclean:
-	-$(MAKE) -C $(PKG_BUILD_DIR) clean
-	rm -f $(PKG_BUILD_DIR)/.built
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install \
+	)
+endef
+
+define Package/Template
+	@if [ \! -f "$(PKG_INSTALL_DIR)/$(1)" ]; then \
+		rm -f $(PKG_BUILD_DIR)/.built; \
+		$(MAKE) $(PKG_BUILD_DIR)/.built; \
+	fi
+	$(INSTALL_DIR) $(2)
+	$(CP) $(PKG_INSTALL_DIR)/$(1) $(2)/
+endef
+
+define Package/fdisk/install
+	$(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/swap-utils/install
+	$(call Package/Template,sbin/mkswap,$(1)/usr/sbin)
+	$(call Package/Template,sbin/swapon,$(1)/usr/sbin)
+	$(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,cfdisk))
+$(eval $(call BuildPackage,losetup))
+$(eval $(call BuildPackage,swap-utils))
+$(eval $(call BuildPackage,hwclock))