From d5bb4c64d9f38732ceba8b36d9c13d3ef5d337bf Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 13 Feb 2012 14:30:24 +0100 Subject: [PATCH] yumexclude again --- build.common | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.common b/build.common index ebf89d85..d2da1be7 100644 --- a/build.common +++ b/build.common @@ -84,8 +84,10 @@ function pl_yumexclude () { { echo pl_yumexclude failed with fcdistro=$fcdistro and pldistro=$pldistro; return 1 ; } } +# <> fcdistro pldistro builddir # node side : use the 'nodeyumexclude' keywork in yumexclude.pkgs function pl_nodeyumexclude () { pl_yumexclude 'nodeyumexclude' "$@" ; } +# server side : use the 'plcyumexclude' keywork in yumexclude.pkgs function pl_plcyumexclude () { pl_yumexclude 'plcyumexclude' "$@" ; } @@ -241,7 +243,9 @@ function pl_root_mkfedora () { pkgs_precious=$(pl_parsePkgs precious $fcdistro $pldistro $pkgsfile) # formerly related to mkfedora -k : packages to take from our own build # and thus need be excluded frem the stock repos - SUBST_NODEYUMEXCLUDE=$(pl_nodeyumexclude $fcdistro $pldistro) + # locate builddir by looking for pkgs.py + builddir=$(dirname $(type -p pkgs.py)) + SUBST_NODEYUMEXCLUDE=$(pl_nodeyumexclude $fcdistro $pldistro $builddir) pkgs_yumexclude=$(pl_parsePkgs yumexclude $fcdistro $pldistro $pkgsfile | sed -e s,@NODEYUMEXCLUDE@,"$SUBST_NODEYUMEXCLUDE",) # get mirrors if not specified with -l if [ -z "$mirrors" ] ; then -- 2.43.0