From 45a08570bfb597d858a79850c29fc1c37ebdefba Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Thu, 24 Jun 2004 11:21:17 +0000 Subject: [PATCH] Clifford Wolf: Moved declaration of $archdir upwards in Build-Pkg Create $builddir/archdir as before but without using $archdir ..that solves some of the $archdir related troubles. [2004061909431925033] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3378 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- scripts/Build-Pkg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg index ac428fae5..15a139565 100755 --- a/scripts/Build-Pkg +++ b/scripts/Build-Pkg @@ -247,6 +247,7 @@ if [ "$ROCKCFG_RETRY_BROKEN" = 0 -a $norebuild = 1 -a \ fi confdir="" +archdir="$builddir/archdir" if [ -z "$pkgdir" ] ; then for x in package/*/$pkg/$pkg.desc ; do if [ -f "$x" ] ; then @@ -569,10 +570,10 @@ elif [ "$ROCKCFG_FLIST" = "find" ] ; then sleep 2 fi -archdir="$builddir/archdir"; mkdir -p "$archdir" +mkdir -p "$builddir/archdir" while read l_cksum l_srctar l_url l_flags ; do [ -z "$l_cksum" ] && continue - ln -s `source_file l_cksum $l_srctar l_url $l_flags` $archdir/ + ln -s `source_file l_cksum $l_srctar l_url $l_flags` $builddir/archdir/ done < <( echo "$desc_D" | column_clean ) hook_eval prepare