From: Thierry Parmentelat Date: Tue, 15 Apr 2014 11:21:02 +0000 (+0200) Subject: will install pip's and gem's if specified in sliceimage-.pkgs X-Git-Tag: sliceimage-5.1-7~4 X-Git-Url: http://git.onelab.eu/?p=vserver-reference.git;a=commitdiff_plain;h=91f86df07e8e0d0976f1c9db839cdcaf3d332a33 will install pip's and gem's if specified in sliceimage-.pkgs --- diff --git a/build.sh b/build.sh index 23b0d49..d37dd48 100755 --- 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}/* @@ -93,6 +95,19 @@ systemslice_count=$(ls ../build/config.${pldistro}/sliceimage-*.pkgs 2> /dev/nul 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 + chroot ${vdir} pip -v install $pip || chroot ${vdir} pip-python -v $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 + chroot ${vdir} gem install --no-rdoc --no-ri $gem || : + done + # search e.g. sliceimage-planetflow.post in config. or in config.planetlab otherwise postfile=$(pl_locateDistroFile ../build/ ${pldistro} sliceimage-${NAME}.post || : )