From ea98b768ac56f815cc3c5c085a68fef5dd18f670 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sun, 25 Jul 2004 07:10:37 +0000 Subject: [PATCH] Clifford Wolf: Remaining "src.$xpkg.$id" fixes git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3659 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- scripts/Build-Pkg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg index 087cddce4..a4a502eac 100755 --- a/scripts/Build-Pkg +++ b/scripts/Build-Pkg @@ -191,8 +191,8 @@ if [ "$chroot" = 1 ] ; then ln -snf ../.. "ROCK/build/$ROCKCFG_ID" fi - mkdir -p "ROCK/src.$pkg.$id" - ln -s "$PWD/ROCK/src.$pkg.$id" "$builddir" + mkdir -p "ROCK/src.$xpkg.$id" + ln -s "$PWD/ROCK/src.$xpkg.$id" "$builddir" cat > $builddir/chroot.sh <<- EOT export ROCK_THIS_IS_CHROOT=1; cd /ROCK @@ -202,7 +202,7 @@ if [ "$chroot" = 1 ] ; then cat > $builddir/debug.sh <<- EOT #!/bin/bash export ROCK_THIS_IS_CHROOT=1 - chroot "$xroot" /bin/bash ROCK/src.$pkg.$id/debug_x.sh + chroot "$xroot" /bin/bash ROCK/src.$xpkg.$id/debug_x.sh EOT chmod +x $builddir/debug.sh @@ -220,7 +220,7 @@ if [ "$chroot" = 1 ] ; then fi fi - TZ="/ROCK/localtime" chroot . bin/bash ROCK/src.$pkg.$id/chroot.sh + TZ="/ROCK/localtime" chroot . bin/bash ROCK/src.$xpkg.$id/chroot.sh returncode=$? if [ ! -d "$builddir/." ]; then