From cf6bb806b73ca740f29f7ee9a638d0e2d684ccc3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 31 Mar 2009 18:51:05 +0200 Subject: [PATCH] make-binpkg.sh: build tmp pkgs in XBPS_BUILDDIR rather than DESTDIR. --HG-- extra : convert_revision : ce460c47ac3edb7d871c7266f69b3f4ab6b39791 --- shutils/make-binpkg.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/shutils/make-binpkg.sh b/shutils/make-binpkg.sh index 563d30f14a8..1cf1bbf8192 100644 --- a/shutils/make-binpkg.sh +++ b/shutils/make-binpkg.sh @@ -85,21 +85,22 @@ xbps_make_binpkg_real() # this is to ensure that it's run before any other file is # unpacked. # - run_rootcmd $use_sudo tar cfp $XBPS_DESTDIR/$binpkg ./INSTALL && \ - run_rootcmd $use_sudo tar rfp $XBPS_DESTDIR/$binpkg . \ + run_rootcmd $use_sudo tar cfp \ + $XBPS_BUILDDIR/$binpkg ./INSTALL && \ + run_rootcmd $use_sudo tar rfp $XBPS_BUILDDIR/$binpkg . \ --exclude "./INSTALL" \ --exclude "./var/db/xbps/metadata/*/flist" && \ - bzip2 -9 $XBPS_DESTDIR/$binpkg && \ - mv $XBPS_DESTDIR/$binpkg.bz2 $XBPS_DESTDIR/$binpkg + bzip2 -9 $XBPS_BUILDDIR/$binpkg && \ + mv $XBPS_BUILDDIR/$binpkg.bz2 $XBPS_BUILDDIR/$binpkg else - run_rootcmd $use_sudo tar cfp $XBPS_DESTDIR/$binpkg . \ + run_rootcmd $use_sudo tar cfp $XBPS_BUILDDIR/$binpkg . \ --exclude "./var/db/xbps/metadata/*/flist" && \ - bzip2 -9 $XBPS_DESTDIR/$binpkg && \ - mv $XBPS_DESTDIR/$binpkg.bz2 $XBPS_DESTDIR/$binpkg + bzip2 -9 $XBPS_BUILDDIR/$binpkg && \ + mv $XBPS_BUILDDIR/$binpkg.bz2 $XBPS_BUILDDIR/$binpkg fi if [ $? -eq 0 ]; then [ ! -d $pkgdir ] && mkdir -p $pkgdir - mv -f $XBPS_DESTDIR/$binpkg $pkgdir + mv -f $XBPS_BUILDDIR/$binpkg $pkgdir echo "=> Built package: $binpkg" fi