[packages/rpm-build-tools] builder --no-init: reset all variables to current dir

glen glen at pld-linux.org
Tue Mar 4 19:53:25 CET 2014


commit d723feca635c814087c01b04852f7a95b4bd4b9b
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Mar 4 20:51:43 2014 +0200

    builder --no-init: reset all variables to current dir
    
    useful to skip fetching any files and build from files of current dir
    (perhaps you checked out project repo externally):
    
    $ builder --no-init -bb $JOB_NAME.spec

 builder.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/builder.sh b/builder.sh
index dfb0867..b997716 100755
--- a/builder.sh
+++ b/builder.sh
@@ -848,8 +848,10 @@ init_builder() {
 			PACKAGE_DIR=$REPO_DIR/$ASSUMED_NAME
 		fi
 	else
-		PACKAGE_DIR=$(pwd)
+		TOP_DIR=$(pwd)
+		PACKAGE_DIR=$TOP_DIR
 		REPO_DIR=$PACKAGE_DIR
+		RPMBUILDOPTS="$RPMBUILDOPTS --define '_topdir $TOP_DIR' --define '_builddir %_topdir' --define '_rpmdir %_topdir' --define '_srcrpmdir %_topdir'"
 	fi
 	export GIT_WORK_TREE=$PACKAGE_DIR
 	export GIT_DIR=$PACKAGE_DIR/.git
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/9f0af327dafaa8a4b0f6242db76f5641ec2d8ad8



More information about the pld-cvs-commit mailing list