From: Reto Buerki <reet@codelabs.ch>
Date: Mon, 10 Dec 2012 09:33:19 +0000 (+0100)
Subject: Rename build-umlrootfs script to build-rootimg
X-Git-Tag: 5.0.2rc1~1^2~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90dd71e41c612211027963764b6993b861edd3f9;p=thirdparty%2Fstrongswan.git

Rename build-umlrootfs script to build-rootimg
---

diff --git a/testing/make-testing b/testing/make-testing
index 7c2e4d5674..1980e3b7da 100755
--- a/testing/make-testing
+++ b/testing/make-testing
@@ -9,14 +9,14 @@ then
 	$PWD/scripts/build-baseimage || exit 1
 fi
 
-if [ $ENABLE_BUILD_GUESTKERNEL = "yes" ]
+if [ $ENABLE_BUILD_ROOTIMAGE = "yes" ]
 then
-	$PWD/scripts/build-guestkernel || exit 1
+	$PWD/scripts/build-rootimage || exit 1
 fi
 
-if [ $ENABLE_BUILD_UMLROOTFS = "yes" ]
+if [ $ENABLE_BUILD_GUESTKERNEL = "yes" ]
 then
-	$PWD/scripts/build-umlrootfs || exit 1
+	$PWD/scripts/build-guestkernel || exit 1
 fi
 
 if [ $ENABLE_BUILD_UMLHOSTFS = "yes" ]
diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-rootimage
similarity index 99%
rename from testing/scripts/build-umlrootfs
rename to testing/scripts/build-rootimage
index 1c452f4763..1890c4eed7 100755
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-rootimage
@@ -19,7 +19,6 @@ echo "Building root image"
 . $PWD/scripts/function.sh
 
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
-
 [ -f "$BASEIMG" ] || die "Base image $BASEIMG not found"
 
 check_commands partprobe qemu-nbd
diff --git a/testing/testing.conf b/testing/testing.conf
index d4f520de11..4ed5fdd001 100644
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -71,8 +71,8 @@ SSHCONF="-F $TESTDIR/testing/ssh_config"
 # Enable particular steps in the make-testing
 #
 ENABLE_BUILD_BASEIMAGE="yes"
+ENABLE_BUILD_ROOTIMAGE="yes"
 ENABLE_BUILD_GUESTKERNEL="yes"
-ENABLE_BUILD_UMLROOTFS="yes"
 ENABLE_BUILD_UMLHOSTFS="yes"
 
 ##############################################################