* util linux cleanups

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

1 files changed, 56 insertions, 56 deletions

diff --git a/rules/util-linux.make b/rules/util-linux.make
index df371dd51..c14ef2b79 100644
--- a/rules/util-linux.make
+++ b/rules/util-linux.make
@@ -12,17 +12,17 @@
 #
 # We provide this package
 #
-PACKAGES-$(PTXCONF_UTIL-LINUX) += util-linux
+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.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)
 
 -include $(call package_depfile)
 
@@ -36,9 +36,9 @@ $(STATEDIR)/util-linux.get: $(util-linux_get_deps_default)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
-$(UTIL-LINUX_SOURCE):
+$(UTIL_LINUX_SOURCE):
 	@$(call targetinfo, $@)
-	@$(call get, $(UTIL-LINUX_URL))
+	@$(call get, $(UTIL_LINUX_URL))
 
 # ----------------------------------------------------------------------------
 # Extract
@@ -48,11 +48,11 @@ util-linux_extract: $(STATEDIR)/util-linux.extract
 
 $(STATEDIR)/util-linux.extract: $(util-linux_extract_deps_default)
 	@$(call targetinfo, $@)
-	@$(call clean, $(UTIL-LINUX_DIR))
-	@$(call extract, $(UTIL-LINUX_SOURCE))
-	@$(call patchin, $(UTIL-LINUX))
+	@$(call clean, $(UTIL_LINUX_DIR))
+	@$(call extract, $(UTIL_LINUX_SOURCE))
+	@$(call patchin, $(UTIL_LINUX))
 
-	perl -i -p -e 's/^CPU=.*$$/CPU=$(PTXCONF_ARCH)/g' $(UTIL-LINUX_DIR)/MCONFIG
+	perl -i -p -e 's/^CPU=.*$$/CPU=$(PTXCONF_ARCH)/g' $(UTIL_LINUX_DIR)/MCONFIG
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -61,13 +61,13 @@ $(STATEDIR)/util-linux.extract: $(util-linux_extract_deps_default)
 
 util-linux_prepare: $(STATEDIR)/util-linux.prepare
 
-UTIL-LINUX_PATH	=  PATH=$(CROSS_PATH)
-UTIL-LINUX_ENV 	=  $(CROSS_ENV)
+UTIL_LINUX_PATH	:= PATH=$(CROSS_PATH)
+UTIL_LINUX_ENV 	:= $(CROSS_ENV)
 
 $(STATEDIR)/util-linux.prepare: $(util-linux_prepare_deps_default)
 	@$(call targetinfo, $@)
-	cd $(UTIL-LINUX_DIR) && \
-		$(UTIL-LINUX_PATH) $(UTIL-LINUX_ENV) \
+	cd $(UTIL_LINUX_DIR) && \
+		$(UTIL_LINUX_PATH) $(UTIL_LINUX_ENV) \
 		./configure
 	@$(call touch, $@)
 
@@ -80,33 +80,33 @@ 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
+	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
+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
+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
+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
+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
+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
+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
+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
+ifdef PTXCONF_UTIL_LINUX_CFDISK
+	cd $(UTIL_LINUX_DIR)/fdisk && $(UTIL_LINUX_PATH) make cfdisk
 endif
 	@$(call touch, $@)
 
@@ -132,38 +132,38 @@ $(STATEDIR)/util-linux.targetinstall: $(util-linux_targetinstall_deps_default)
 	@$(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,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)
 
-ifdef PTXCONF_UTIL-LINUX_MKSWAP
-	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/disk-utils/mkswap, /sbin/mkswap)
+ifdef PTXCONF_UTIL_LINUX_MKSWAP
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL_LINUX_DIR)/disk-utils/mkswap, /sbin/mkswap)
 endif
-ifdef PTXCONF_UTIL-LINUX_SWAPON
-	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/mount/swapon, /sbin/swapon)
+ifdef PTXCONF_UTIL_LINUX_SWAPON
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL_LINUX_DIR)/mount/swapon, /sbin/swapon)
 endif
-ifdef PTXCONF_UTIL-LINUX_MOUNT
-	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/mount/mount, /sbin/mount)
+ifdef PTXCONF_UTIL_LINUX_MOUNT
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL_LINUX_DIR)/mount/mount, /sbin/mount)
 endif
-ifdef PTXCONF_UTIL-LINUX_UMOUNT
-	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/mount/umount, /sbin/umount)
+ifdef PTXCONF_UTIL_LINUX_UMOUNT
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL_LINUX_DIR)/mount/umount, /sbin/umount)
 endif
-ifdef PTXCONF_UTIL-LINUX_IPCS
-	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/sys-utils/ipcs, /usr/bin/ipcs)
+ifdef PTXCONF_UTIL_LINUX_IPCS
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL_LINUX_DIR)/sys-utils/ipcs, /usr/bin/ipcs)
 endif
-ifdef PTXCONF_UTIL-LINUX_READPROFILE
-	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/sys-utils/readprofile, /usr/sbin/readprofile)
+ifdef PTXCONF_UTIL_LINUX_READPROFILE
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL_LINUX_DIR)/sys-utils/readprofile, /usr/sbin/readprofile)
 endif
-ifdef PTXCONF_UTIL-LINUX_FDISK
-	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/fdisk/fdisk, /usr/sbin/fdisk)
+ifdef PTXCONF_UTIL_LINUX_FDISK
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL_LINUX_DIR)/fdisk/fdisk, /usr/sbin/fdisk)
 endif
-ifdef PTXCONF_UTIL-LINUX_SFDISK
-	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/fdisk/sfdisk, /usr/sbin/sfdisk)
+ifdef PTXCONF_UTIL_LINUX_SFDISK
+	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL_LINUX_DIR)/fdisk/sfdisk, /usr/sbin/sfdisk)
 endif
-ifdef PTXCONF_UTIL-LINUX_CFDISK
-	@$(call install_copy, util-linux, 0, 0, 0755, $(UTIL-LINUX_DIR)/fdisk/cfdisk, /usr/sbin/cfdisk)
+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, $@)
@@ -175,6 +175,6 @@ endif
 util-linux_clean:
 	rm -rf $(STATEDIR)/util-linux.*
 	rm -rf $(IMAGEDIR)/util-linux_*
-	rm -rf $(UTIL-LINUX_DIR)
+	rm -rf $(UTIL_LINUX_DIR)
 
 # vim: syntax=make