X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.functions;h=a96e295ef66e50612eff65e37cc752acb0c81206;hb=ddabda845fded2f97bc0e67fa839c36c4ef29d00;hp=895dcc493786b730a8216210e34299dc02f6926c;hpb=15fb91bafd60b3c004fdcc08a44cab8a511dd6b1;p=myplc.git diff --git a/build.functions b/build.functions index 895dcc4..a96e295 100644 --- a/build.functions +++ b/build.functions @@ -46,37 +46,15 @@ set -e # Be verbose set -x -# Make a basic chroot at the specified location given the specified -# configuration. -make_chroot_from_lst() { - root=$1; shift - fcdistro=$1; shift - - packages=$(pl_getPackagesOptions2 $fcdistro $lst"$@") - groups=$(pl_getGroupsOptions2 $fcdistro "$@") - - pl_setup_chroot $root $packages $groups -} - -# Move specified directories out of the chroot and into a "data" -# directory that will be bind mounted on /data inside the chroot. -#move_datadirs() { -# root=$1 -# data=$2 -# shift 2 -# pl_move_dirs $root $data /data "$@" -#} - -# Make loopback filesystem from specified location -#make_image() { -# root=$1 -# image=$2 -# pl_make_image $root $image 100000000 -#} +# this is fragile, as the actual layout may vary from one mirror to the other +# however this should be in line with the layouts obtained +# when running build/vbuild-fedora-mirror.sh function yum_conf_to_build_host () { - BUILD_HOST=$(hostname) - cat < $php - -

Build-time error - could not locate documentation $html

-__header_no_doc__ + template=$build_dir/mirroring/${pl_DISTRO_NAME}/yum.repos.d/building.repo.in + if [ ! -f $template ] ; then + echo "# MyPLC/$0: cannot find template $template" else - # insert header, makes sure we have a trailing eol - (cat << __header_doc__ ; cat $html ) > $php - -__header_doc__ - # ignore ed return status - set +e - # cuts off around the - # preserves the 4 first lines that we just added as a header - ed -s $php << __ed_script__ -/BODY/ -/>/ -s,><,<, -5,-d -$ -?/BODY? -s,><.*,>, -+ -;d -w -q -__ed_script__ - set -e + sed -e s,@MIRRORURL@,http://${BUILD_HOST}/mirror/, $template fi -} +} +