improved logs of slice image building for system slices wrt yum, pip and gem

[vserver-reference.git] / build.sh

diff --git a/build.sh b/build.sh
index 23b0d49..eb22041 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -74,6 +74,8 @@ systemslice_count=$(ls ../build/config.${pldistro}/sliceimage-*.pkgs 2> /dev/nul
     # "Parse" out the packages and groups for yum
     systempackages=$(pl_getPackages ${pl_DISTRO_NAME} $pldistro $systemslice)
     systemgroups=$(pl_getGroups ${pl_DISTRO_NAME} $pldistro $systemslice)
+    systempips=$(pl_getPips ${pl_DISTRO_NAME} $pldistro $systemslice)
+    systemgems=$(pl_getGems ${pl_DISTRO_NAME} $pldistro $systemslice)
 
     vdir=${vstubdir}/${NAME}
     rm -rf ${vdir}/*
@@ -87,12 +89,31 @@ systemslice_count=$(ls ../build/config.${pldistro}/sliceimage-*.pkgs 2> /dev/nul
     echo ${slicefamily} > ${vdir}.cloned
 
     # Install the system sliceimage specific packages
-    [ -n "$systempackages" ] && yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y install $systempackages
+    for yum_package in $systempackages; do
+       echo " * yum installing $yum_package"
+       yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y install $yum_package
+    done
     for group_plus in $systemgroups; do
        group=$(echo $group_plus | sed -e "s,+++, ,g")
+       echo " * yum groupinstalling $group"
         yum -c ${vdir}/etc/mkfedora-yum.conf --installroot=${vdir} -y groupinstall "$group"
     done
 
+    # this requires pip to be available in sliceimage at that point
+    # fedora and debian -> python-pip
+    # on fedora the command is called pip-python (sigh.)
+    for pip in $systempips; do
+       echo " * pip installing $pip"
+       chroot ${vdir} pip -v install $pip || chroot ${vdir} pip-python -v $pip || echo " * FAILURE with pip $pip"
+    done
+
+    # same for gems; comes with ruby in fedora but ruby-devel is most likely a good thing
+    # we add --no-rdoc --no-ri to keep it low
+    for gem in $systemgems; do
+       echo " * gem installing $gem"
+       chroot ${vdir} gem install --no-rdoc --no-ri $gem || echo " * FAILURE with gem $gem"
+    done
+
     # search e.g. sliceimage-planetflow.post in config.<pldistro> or in config.planetlab otherwise
     postfile=$(pl_locateDistroFile ../build/ ${pldistro} sliceimage-${NAME}.post || : )