|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [raisin][PATCH 2/3] Delete dangling white space
Signed-off-by: Doug Goldstein <cardoe@xxxxxxxxxx>
---
lib/commands.sh | 4 ++--
lib/common-functions.sh | 10 +++++-----
scripts/mkdeb | 8 ++++----
scripts/mkrpm | 4 ++--
tests/busybox-hvm | 8 ++++----
tests/busybox-hvm-migrate | 4 ++--
tests/busybox-pv | 6 +++---
7 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/lib/commands.sh b/lib/commands.sh
index a79611e..be445a7 100755
--- a/lib/commands.sh
+++ b/lib/commands.sh
@@ -50,12 +50,12 @@ function install-builddep() {
function build() {
check-builddep
-
+
mkdir -p "$INST_DIR" &>/dev/null
# build and install under $DESTDIR
for_each_component build
-
+
build_package xen-system
}
diff --git a/lib/common-functions.sh b/lib/common-functions.sh
index e96b105..4ab77ba 100644
--- a/lib/common-functions.sh
+++ b/lib/common-functions.sh
@@ -20,9 +20,9 @@ function common_init() {
export PREFIX=${PREFIX-/usr}
export INST_DIR=${DESTDIR-dist}
export PREPEND="[raisin]"
-
+
INST_DIR=`readlink -f $INST_DIR`
-
+
# execution
if [[ $EUID -eq 0 ]]
then
@@ -62,7 +62,7 @@ function get_components() {
COMPONENTS="$ENABLED_COMPONENTS"
fi
- if [[ -z "$COMPONENTS" ]]
+ if [[ -z "$COMPONENTS" ]]
then
local component
for component in `cat "$BASEDIR"/components/series`
@@ -85,7 +85,7 @@ function get_tests() {
TESTS="$ENABLED_TESTS"
fi
- if [[ -z "$TESTS" ]]
+ if [[ -z "$TESTS" ]]
then
local t
for t in `cat "$BASEDIR"/tests/series`
@@ -384,7 +384,7 @@ function init_tests() {
else
error_echo "I don't know distro $DISTRO. It might be missing packages."
fi
-
+
if [[ -n "${missing[@]}" ]]
then
verbose_echo "Installing ${missing[@]}"
diff --git a/scripts/mkdeb b/scripts/mkdeb
index dbd92bd..5259f1e 100755
--- a/scripts/mkdeb
+++ b/scripts/mkdeb
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# mkdeb: package $INST_DIR output in a .deb
+# mkdeb: package $INST_DIR output in a .deb
#
# Takes 1 argument: the package name
# It relies on RAISIN_ARCH and INST_DIR being set correctly
@@ -8,10 +8,10 @@
set -e
if [[ -z "$1" ]]
-then
+then
echo "usage: $0 package_name"
exit 1
-fi
+fi
name=$1
@@ -41,7 +41,7 @@ cp config raise deb/opt/raisin
# Debian doesn't use /usr/lib64 for 64-bit libraries
if [[ -d deb/usr/lib64 ]]
-then
+then
cp -a deb/usr/lib64/* deb/usr/lib/
rm -rf deb/usr/lib64
fi
diff --git a/scripts/mkrpm b/scripts/mkrpm
index 7965c0c..88997c6 100755
--- a/scripts/mkrpm
+++ b/scripts/mkrpm
@@ -8,10 +8,10 @@
set -e
if [[ -z "$1" ]]
-then
+then
echo "usage: $0 package_name"
exit 1
-fi
+fi
name="$1"
diff --git a/tests/busybox-hvm b/tests/busybox-hvm
index 2b6c1dd..51e9e19 100755
--- a/tests/busybox-hvm
+++ b/tests/busybox-hvm
@@ -16,17 +16,17 @@ function busybox-hvm-test() {
echo $PREPEND busybox hvm test only valid on x86
exit 0
fi
-
+
TMPDIR=`mktemp -d`
cd $TMPDIR
-
+
allocate_disk busybox-vm-disk $((20*1024*1024))
LOOP=`create_loop busybox-vm-disk`
LOOP_P0=`create_one_partition busybox-vm-disk`
busybox_rootfs $LOOP_P0
busybox_network_init $LOOP_P0
bootloader_init $LOOP $LOOP_P0
-
+
cat >busybox-hvm <<EOF
builder = "hvm"
memory = 512
@@ -37,7 +37,7 @@ serial="pty"
boot="c"
vif=['bridge=xenbr1']
EOF
-
+
$SUDO xl create busybox-hvm
check_guest_alive
}
diff --git a/tests/busybox-hvm-migrate b/tests/busybox-hvm-migrate
index 14ffc0d..8e8213b 100755
--- a/tests/busybox-hvm-migrate
+++ b/tests/busybox-hvm-migrate
@@ -15,7 +15,7 @@ function busybox-hvm-migrate-test() {
echo $PREPEND busybox hvm test only valid on x86
exit 0
fi
-
+
busybox-hvm-test
TMPSCRIPT=`mktemp`
@@ -26,7 +26,7 @@ function busybox-hvm-migrate-test() {
shift
\$*
EOF
-
+
chmod +x $TMPSCRIPT
xl migrate -s $TMPSCRIPT raisin-test localhost
check_guest_alive
diff --git a/tests/busybox-pv b/tests/busybox-pv
index ec3ba5c..a7ae976 100755
--- a/tests/busybox-pv
+++ b/tests/busybox-pv
@@ -13,12 +13,12 @@ function busybox-pv-cleanup() {
function busybox-pv-test() {
TMPDIR=`mktemp -d`
cd $TMPDIR
-
+
allocate_disk busybox-vm-disk $((20*1024*1024))
LOOP=`create_loop busybox-vm-disk`
busybox_rootfs $LOOP
busybox_network_init $LOOP
-
+
cat >busybox-pv <<EOF
kernel = "`get_host_kernel`"
ramdisk = "`get_host_initrd`"
@@ -31,7 +31,7 @@ serial="pty"
boot="c"
vif=['bridge=xenbr1']
EOF
-
+
$SUDO xl create busybox-pv
check_guest_alive
}
--
2.4.6
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |