Name functions with the name of the component first

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/build.sh b/build.sh
index a269d3192d853e03480018f012f76588cd8144d5..a96f403f03827f6b2a6c34388388ea6b9524ad10 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -22,16 +22,16 @@ mkdir -p "$INST_DIR"
 
 if test "$XEN_UPSTREAM_REVISION"
 then
-    clean_xen
-    build_xen
+    xen_clean
+    xen_build
 fi
 if test "$GRUB_UPSTREAM_REVISION"
 then
-    clean_grub
-    build_grub
+    grub_clean
+    grub_build
 fi
 if test "$LIBVIRT_UPSTREAM_REVISION"
 then
-    clean_libvirt
-    build_libvirt
+    libvirt_clean
+    libvirt_build
 fi

diff --git a/grub.sh b/grub.sh
index 7df8998c5ab0a70390627ace26ca301d1bcaa870..b1fcc898416f6912f326456af72102a60c633730 100644 (file)
--- a/grub.sh
+++ b/grub.sh
@@ -2,12 +2,12 @@
 
 source config
 
-clean_grub() {
+grub_clean() {
     rm -rf memdisk.tar
     rm -rf grub-dir
 }
 
-build_grub() {
+grub_build() {
     tar cf memdisk.tar grub.cfg
     ./git-checkout.sh $GRUB_UPSTREAM_URL $GRUB_UPSTREAM_REVISION grub-dir
     cd grub-dir

diff --git a/libvirt.sh b/libvirt.sh
index 12e2533f23a009d6a8a1b825ec2c77c8b30fd30d..0a587486bbc0733fd3c405519640b48556def0a7 100644 (file)
--- a/libvirt.sh
+++ b/libvirt.sh
@@ -2,11 +2,11 @@
 
 source config
 
-clean_libvirt() {
+libvirt_clean() {
     rm -rf libvirt-dir
 }
 
-build_libvirt() {
+libvirt_build() {
     ./git-checkout.sh $LIBVIRT_UPSTREAM_URL $LIBVIRT_UPSTREAM_REVISION libvirt-dir
     cd libvirt-dir
     ./autogen.sh --disable-threads --with-xen --without-qemu --without-uml     \

diff --git a/xen.sh b/xen.sh
index c74ec580ff9142ab13fe4c2784cd0b8ecff9d50d..edf7a37b520134bdb85b16d0a170c3d845a77e52 100644 (file)
--- a/xen.sh
+++ b/xen.sh
@@ -2,11 +2,11 @@
 
 source config
 
-clean_xen() {
+xen_clean() {
     rm -rf xen-dir
 }
 
-build_xen() {
+xen_build() {
     ./git-checkout.sh $XEN_UPSTREAM_URL $XEN_UPSTREAM_REVISION xen-dir
     cd xen-dir
     ./configure --prefix=$PREFIX