summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-08-20 20:45:22 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-08-20 20:45:22 +0200
commitf2446554876bf0565d8f9061a3f63f3290fa5fc4 (patch)
treef1277df74f18bd65aa3f068e46d1bb1be90b54a1
parentf87efc79a6176a80c274b5aff6bb4bc461695cb1 (diff)
downloadtde-packaging-f2446554876bf0565d8f9061a3f63f3290fa5fc4.tar.gz
tde-packaging-f2446554876bf0565d8f9061a3f63f3290fa5fc4.zip
RPM Packaging: update build script
-rw-r--r--redhat/buildenv.sh12
1 files changed, 10 insertions, 2 deletions
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index 146ea170d..250c712eb 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -21,8 +21,13 @@ alias cdrpm='cd ~/rpmbuild/RPMS/RPMS${DIST}'
alias tdp4='TARGET=14.0.0 SUFFIX=0 TARBALL_DIR=${TDE_TARBALLS}/main COMPRESS=gzip ${TDE_GITBASESRC}/scripts/create_tarball'
# Rebuild all tarballs
-alias tdep3='(rm -rf ~/tde/tde-tarballs/3.5.13.2; cd ~/tde/tde_v3.5.13-sru; export SUFFIX=0; export COMPRESS=gzip; export TDE_REBRAND=1; ./scripts/create_all_tarballs)'
-alias tdep4='(rm -rf ${TDE_TARBALLS}; cd ${TDE_GITBASESRC}; export SUFFIX=0; export COMPRESS=gzip; export TDE_REBRAND=1; ./scripts/create_all_tarballs)'
+if [ -x /usr/bin/pigz ]; then
+ export TDE_COMPRESS=pigz
+else
+ export TDE_COMPRESS=gzip
+fi
+alias tdep3='(rm -rf ~/tde/tde-tarballs/3.5.13.2; cd ~/tde/tde_v3.5.13-sru; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)'
+alias tdep4='(rm -rf ${TDE_TARBALLS}; cd ${TDE_GITBASESRC}; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)'
# Build a single package
alias cdp='cd ~/tde/tde-packaging/redhat'
@@ -50,6 +55,9 @@ checknew() {
done
}
+# Update main repository
+export tdu='(export GIT_ASKPASS=/bin/true; cd ~/tde/tde_r14; ./scripts/update_all_submodules)'
+
# Build local repository metadata (Mageia)
alias cru='(cdrpm; genhdlist2 --allow-empty-media noarch; genhdlist2 $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)'
alias cruc='(cdrpm; genhdlist2 --clean --allow-empty-media noarch; genhdlist2 --clean $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)'