From addbebb12907ec1a96051f13325fb39c07d62aac Mon Sep 17 00:00:00 2001 From: emmett1 Date: Sat, 22 Sep 2018 08:53:09 +0800 Subject: [PATCH] fix WORK_DIR --- INSTALL.sh | 2 +- pkgbuild | 4 ++-- scratchpkg.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/INSTALL.sh b/INSTALL.sh index bd60c90..76385d0 100755 --- a/INSTALL.sh +++ b/INSTALL.sh @@ -12,4 +12,4 @@ install -m755 revdep pkgadd pkgdel pkgbuild pkgdeplist pkglibdepends scratch ${D install -m644 scratchpkg.conf scratchpkg.repo ${DESTDIR}${CONFDIR} install -m755 extra/* ${DESTDIR}${BINDIR} mkdir -pv ${DESTDIR}${INDEX_DIR}/index -install -dm777 ${DESTDIR}${CACHE_DIR}/{packages,sources,work} +install -dm777 ${DESTDIR}${CACHE_DIR}/{packages,sources} diff --git a/pkgbuild b/pkgbuild index 8675e50..fcb91f8 100755 --- a/pkgbuild +++ b/pkgbuild @@ -623,7 +623,7 @@ main() { msgerr "Option '--pkgdir=' need argument (path)" abort 1 fi - checkdir "$SOURCE_DIR" "$PACKAGE_DIR" + checkdir "$SOURCE_DIR" "$PACKAGE_DIR" "$WORK_DIR" check_buildscript set_options @@ -680,7 +680,7 @@ PKGBUILD_BSCRIPT="spkgbuild" SOURCE_DIR="/var/cache/scratchpkg/sources" PACKAGE_DIR="/var/cache/scratchpkg/packages" -WORK_DIR="/tmp/pkgbuild" +WORK_DIR="/tmp" OPTIONS=(!libtool emptydirs strip docs purge zipman buildflags makeflags) DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) diff --git a/scratchpkg.conf b/scratchpkg.conf index 39038c6..38bd7f2 100644 --- a/scratchpkg.conf +++ b/scratchpkg.conf @@ -17,7 +17,7 @@ MAKEFLAGS="-j$(nproc)" # # SOURCE_DIR="/var/cache/scratchpkg/sources" # PACKAGE_DIR="/var/cache/scratchpkg/packages" -# WORK_DIR="/var/cache/scratchpkg/work" +# WORK_DIR="/tmp" # HOOK_DIR="/etc/hooks" ##