* util-linux: updated to 2.13-pre7

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6167 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 46 insertions, 48 deletions

diff --git a/rules/util-linux.make b/rules/util-linux.make
index 899fe2fa0..956dcb727 100644
--- a/rules/util-linux.make
+++ b/rules/util-linux.make
@@ -1,8 +1,8 @@
 # -*-makefile-*-
 # $Id$
 #
-# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
-#          
+# Copyright (C) 2006 by Robert Schwebel
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -17,13 +17,12 @@ PACKAGES-$(PTXCONF_UTIL_LINUX) += util-linux
 #
 # Paths and names
 #
-UTIL_LINUX_VERSION	= 2.12j
-UTIL_LINUX		= util-linux-$(UTIL_LINUX_VERSION)
-UTIL_LINUX_SUFFIX	= tar.gz
-UTIL_LINUX_URL		= http://ftp.cwi.nl/aeb/util-linux/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX)
-UTIL_LINUX_SOURCE	= $(SRCDIR)/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX)
-UTIL_LINUX_DIR		= $(BUILDDIR)/$(UTIL_LINUX)
-
+UTIL_LINUX_VERSION	:= 2.13-pre7
+UTIL_LINUX		:= util-linux-$(UTIL_LINUX_VERSION)
+UTIL_LINUX_SUFFIX	:= tar.bz2
+UTIL_LINUX_URL		:= http://www.kernel.org/pub/linux/utils/util-linux/testing/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX)
+UTIL_LINUX_SOURCE	:= $(SRCDIR)/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX)
+UTIL_LINUX_DIR		:= $(BUILDDIR)/$(UTIL_LINUX)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -50,8 +49,6 @@ $(STATEDIR)/util-linux.extract: $(util-linux_extract_deps_default)
 	@$(call clean, $(UTIL_LINUX_DIR))
 	@$(call extract, UTIL_LINUX)
 	@$(call patchin, UTIL_LINUX)
-
-	perl -i -p -e 's/^CPU=.*$$/CPU=$(PTXCONF_ARCH)/g' $(UTIL_LINUX_DIR)/MCONFIG
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -63,11 +60,17 @@ util-linux_prepare: $(STATEDIR)/util-linux.prepare
 UTIL_LINUX_PATH	:= PATH=$(CROSS_PATH)
 UTIL_LINUX_ENV 	:= $(CROSS_ENV)
 
+#
+# autoconf
+#
+UTIL_LINUX_AUTOCONF := $(CROSS_AUTOCONF_USR)
+
 $(STATEDIR)/util-linux.prepare: $(util-linux_prepare_deps_default)
 	@$(call targetinfo, $@)
+	@$(call clean, $(UTIL_LINUX_DIR)/config.cache)
 	cd $(UTIL_LINUX_DIR) && \
 		$(UTIL_LINUX_PATH) $(UTIL_LINUX_ENV) \
-		./configure
+		./configure $(UTIL_LINUX_AUTOCONF)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -78,35 +81,7 @@ util-linux_compile: $(STATEDIR)/util-linux.compile
 
 $(STATEDIR)/util-linux.compile: $(util-linux_compile_deps_default)
 	@$(call targetinfo, $@)
-
-	cd $(UTIL_LINUX_DIR)/lib && $(UTIL_LINUX_PATH) make all
-ifdef PTXCONF_UTIL_LINUX_MKSWAP
-	cd $(UTIL_LINUX_DIR)/disk-utils && $(UTIL_LINUX_PATH) make mkswap
-endif
-ifdef PTXCONF_UTIL_LINUX_SWAPON
-	cd $(UTIL_LINUX_DIR)/mount && $(UTIL_LINUX_PATH) make swapon
-endif
-ifdef PTXCONF_UTIL_LINUX_MOUNT
-	cd $(UTIL_LINUX_DIR)/mount && $(UTIL_LINUX_PATH) make mount
-endif
-ifdef PTXCONF_UTIL_LINUX_UMOUNT
-	cd $(UTIL_LINUX_DIR)/mount && $(UTIL_LINUX_PATH) make umount
-endif
-ifdef PTXCONF_UTIL_LINUX_IPCS
-	cd $(UTIL_LINUX_DIR)/sys-utils && $(UTIL_LINUX_PATH) make ipcs
-endif
-ifdef PTXCONF_UTIL_LINUX_READPROFILE
-	cd $(UTIL_LINUX_DIR)/sys-utils && $(UTIL_LINUX_PATH) make readprofile
-endif
-ifdef PTXCONF_UTIL_LINUX_FDISK
-	cd $(UTIL_LINUX_DIR)/fdisk && $(UTIL_LINUX_PATH) make fdisk
-endif
-ifdef PTXCONF_UTIL_LINUX_SFDISK
-	cd $(UTIL_LINUX_DIR)/fdisk && $(UTIL_LINUX_PATH) make sfdisk
-endif
-ifdef PTXCONF_UTIL_LINUX_CFDISK
-	cd $(UTIL_LINUX_DIR)/fdisk && $(UTIL_LINUX_PATH) make cfdisk
-endif
+	cd $(UTIL_LINUX_DIR) && $(UTIL_LINUX_PATH) $(MAKE)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -117,6 +92,7 @@ util-linux_install: $(STATEDIR)/util-linux.install
 
 $(STATEDIR)/util-linux.install: $(util-linux_install_deps_default)
 	@$(call targetinfo, $@)
+	@$(call install, UTIL_LINUX)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -129,13 +105,18 @@ $(STATEDIR)/util-linux.targetinstall: $(util-linux_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init, util-linux)
-	@$(call install_fixup, util-linux,PACKAGE,util-linux)
-	@$(call install_fixup, util-linux,PRIORITY,optional)
-	@$(call install_fixup, util-linux,VERSION,$(UTIL_LINUX_VERSION))
-	@$(call install_fixup, util-linux,SECTION,base)
-	@$(call install_fixup, util-linux,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup, util-linux,DEPENDS,)
-	@$(call install_fixup, util-linux,DESCRIPTION,missing)
+	@$(call install_fixup,util-linux,PACKAGE,util-linux)
+	@$(call install_fixup,util-linux,PRIORITY,optional)
+	@$(call install_fixup,util-linux,VERSION,$(UTIL_LINUX_VERSION))
+	@$(call install_fixup,util-linux,SECTION,base)
+	@$(call install_fixup,util-linux,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,util-linux,DEPENDS,)
+	@$(call install_fixup,util-linux,DESCRIPTION,missing)
+
+# FIXME (rsc):
+#
+# - add more utilities, for example schedutils
+# - audit for autodetected things (i.e. ionice)
 
 ifdef PTXCONF_UTIL_LINUX_MKSWAP
 	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL_LINUX_DIR)/disk-utils/mkswap, /sbin/mkswap)
@@ -164,6 +145,22 @@ endif
 ifdef PTXCONF_UTIL_LINUX_CFDISK
 	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL_LINUX_DIR)/fdisk/cfdisk, /usr/sbin/cfdisk)
 endif
+
+	@$(call install_finish,util-linux)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+util-linux_clean:
+	rm -rf $(STATEDIR)/util-linux.*
+	rm -rf $(IMAGEDIR)/util-linux_*
+	rm -rf $(UTIL_LINUX_DIR)
+
+# vim: syntax=make
+
 	@$(call install_finish, util-linux)
 	@$(call touch, $@)
 
@@ -177,3 +174,4 @@ util-linux_clean:
 	rm -rf $(UTIL_LINUX_DIR)
 
 # vim: syntax=make
+