From 1d5412130af85eeaf74267bec9b5b6ac765a4ab7 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 2 Nov 2007 13:27:54 +0000 Subject: [PATCH] Stefan Fiedler: scripts/Build-Pkg: pass FLWRAPPER variables to 2nd stage environment [2007100422340422657] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8770 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- scripts/Build-Pkg | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg index d878842f2..a447ed400 100755 --- a/scripts/Build-Pkg +++ b/scripts/Build-Pkg @@ -424,7 +424,11 @@ if [ $this_is_the_2nd_run = 0 ] ; then TZ="$TZ" ROCK_BUILD_TARGET=$ROCK_BUILD_TARGET \ build_root="$build_root" build_rock="$build_rock" \ build_logs="$build_logs" build_pkgs="$build_pkgs" \ - ROCK_THIS_IS_CHROOT="$ROCK_THIS_IS_CHROOT" $0 $options + ROCK_THIS_IS_CHROOT="$ROCK_THIS_IS_CHROOT" \ + FLWRAPPER_WLOG="$FLWRAPPER_WLOG" FLWRAPPER_RLOG="$FLWRAPPER_RLOG" \ + FLWRAPPER_BASEPID="$FLWRAPPER_BASEPID" FLWRAPPER="$FLWRAPPER" \ + LD_PRELOAD="${LD_PRELOAD}" \ + $0 $options returncode=$? [ ! -e "$root/var/adm/cache/$xpkg.tm" ] && exit $returncode @@ -494,7 +498,11 @@ if [ $this_is_the_2nd_run = 0 ] ; then TZ="$TZ" ROCK_BUILD_TARGET=$ROCK_BUILD_TARGET \ build_root="$build_root" build_rock="$build_rock" \ build_logs="$build_logs" build_pkgs="$build_pkgs" \ - ROCK_THIS_IS_CHROOT="$ROCK_THIS_IS_CHROOT" $0 $options + ROCK_THIS_IS_CHROOT="$ROCK_THIS_IS_CHROOT" \ + FLWRAPPER_WLOG="$FLWRAPPER_WLOG" FLWRAPPER_RLOG="$FLWRAPPER_RLOG" \ + FLWRAPPER_BASEPID="$FLWRAPPER_BASEPID" FLWRAPPER="$FLWRAPPER" \ + LD_PRELOAD="${LD_PRELOAD}" \ + $0 $options fi fi