commit 4605be6f1055ef8ffd13f4fdc33c08dbd6760459
Author: Elan Ruusamäe <[email protected]>
Date: Sun Sep 16 15:37:37 2012 +0300
omit builder script just to build in local dir
update-source.sh | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/update-source.sh b/update-source.sh
index 9f1587a..ee20cbd 100755
--- a/update-source.sh
+++ b/update-source.sh
@@ -15,6 +15,7 @@ specfile=$pkg.spec
# work in package dir
dir=$(dirname "$0")
cd "$dir"
+dir=$(pwd)
# extract version components from url
# exports: $version; $release; $svndate; $svnver
@@ -162,27 +163,19 @@ if [ "$publish_packages" = 1 ]; then
fi
fi
-# setup custom logfile via $HOME_ETC hack
-# TODO: just add --logfile support for builder
-cat > $outdir/.builderrc <<-EOF
- if [ -n "$HOME_ETC" ]; then
- . "$HOME_ETC/.builderrc"
- elif [ -r ~/.builderrc ]; then
- . ~/.builderrc
- fi
- LOGFILE='$logfile'
-EOF
-
command=-bp
test "$build_package" = 1 && command=-bb
-> $logfile
-HOME_ETC=$outdir \
- ../builder $command --clean \
+ rpmbuild $command --clean \
--define "_unpackaged_files_terminate_build 1" \
--define '_enable_debug_packages 0' \
+ --define "_topdir $dir" \
+ --define "_specdir $dir" \
+ --define "_sourcedir $dir" \
--define "_builddir $outdir" \
--define "_rpmdir $rpmdir" \
- $specfile || {
+ --without debuginfo \
+ --with verbose \
+ $specfile > $logfile 2>&1 || {
echo >&2 "Package build failed"
tail -n 1000 $logfile >&2
exit 1
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/4605be6f1055ef8ffd13f4fdc33c08dbd6760459
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
