[Systemimager-commits] r3341 - in trunk: . make.d

[Andrea R. <ar...@sy...>]

Author: arighi
Date: 2005-12-20 14:18:51 -0600 (Tue, 20 Dec 2005)
New Revision: 3341

Modified:
   trunk/Makefile
   trunk/make.d/util-linux.rul
Log:
specify both sfdisk and mkswap commands using a single variable (UTIL_LINUX_BINARIES)

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-12-20 13:12:10 UTC (rev 3340)
+++ trunk/Makefile	2005-12-20 20:18:51 UTC (rev 3341)
@@ -486,7 +486,7 @@
 				$(MKE2FS_BINARY) \
 				$(TUNE2FS_BINARY) \
 				$(PARTED_BINARY) \
-				$(UTIL_LINUX_DIR).build \
+				$(UTIL_LINUX_BINARIES) \
 				$(RAIDTOOLS_BINARIES) \
 				$(MDADM_BINARIES) \
 				$(MKREISERFS_BINARY) \
@@ -514,8 +514,7 @@
 	install -m 755 --strip $(MKE2FS_BINARY) 		$(BOEL_BINARIES_DIR)/sbin/
 	install -m 755 --strip $(TUNE2FS_BINARY) 		$(BOEL_BINARIES_DIR)/sbin/
 	install -m 755 --strip $(PARTED_BINARY)			$(BOEL_BINARIES_DIR)/sbin/
-	install -m 755 --strip $(SFDISK_BINARY)			$(BOEL_BINARIES_DIR)/sbin/
-	install -m 755 --strip $(MKSWAP_BINARY)			$(BOEL_BINARIES_DIR)/sbin/
+	install -m 755 --strip $(UTIL_LINUX_BINARIES)		$(BOEL_BINARIES_DIR)/sbin/
 	install -m 755 --strip $(RAIDTOOLS_BINARIES) 		$(BOEL_BINARIES_DIR)/sbin/
 	cd $(BOEL_BINARIES_DIR)/sbin/ && ln -f raidstart raidstop
 	#EF: mdadm will replace raidtools

Modified: trunk/make.d/util-linux.rul
===================================================================
--- trunk/make.d/util-linux.rul	2005-12-20 13:12:10 UTC (rev 3340)
+++ trunk/make.d/util-linux.rul	2005-12-20 20:18:51 UTC (rev 3341)
@@ -18,8 +18,8 @@
 UTIL_LINUX_URL      := http://download.systemimager.org/pub/util-linux/$(UTIL_LINUX_TARBALL)
 UTIL_LINUX_PATCHES  := $(shell ls $(PATCH_DIR)/util-linux.*.patch 2>/dev/null | sort)
 
-MKSWAP_BINARY       := $(SRC_DIR)/$(UTIL_LINUX_DIR)/disk-utils/mkswap
-SFDISK_BINARY       := $(SRC_DIR)/$(UTIL_LINUX_DIR)/fdisk/sfdisk
+UTIL_LINUX_BINARIES := $(SRC_DIR)/$(UTIL_LINUX_DIR)/disk-utils/mkswap \
+                        $(SRC_DIR)/$(UTIL_LINUX_DIR)/fdisk/sfdisk
 
 ALL_SOURCE += $(SRC_DIR)/$(UTIL_LINUX_TARBALL)