[prev in list] [next in list] [prev in thread] [next in thread]
List: tor-cvs
Subject: [tor-commits] [tor-browser-bundle/master] Fix the tor version checks when applying backported patche
From: mikeperry () torproject ! org
Date: 2015-07-29 16:13:05
Message-ID: 20150729161305.C43B6419CA () cupani ! torproject ! org
[Download RAW message or body]
commit abb0ef2e192c4268980a2e670fdfac6c3715c4c5
Author: Mike Perry <mikeperry-git@torproject.org>
Date: Wed Jul 29 09:11:11 2015 -0700
Fix the tor version checks when applying backported patches.
---
gitian/descriptors/linux/gitian-tor.yml | 7 +++----
gitian/descriptors/mac/gitian-tor.yml | 7 +++----
gitian/descriptors/windows/gitian-tor.yml | 7 +++----
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index bfd0e18..906077b 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -79,14 +79,13 @@ script: |
export GIT_COMMITTER_NAME="nobody"
export GIT_COMMITTER_EMAIL="nobody@localhost"
export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
- if [ ${TOR_TAG::9} == "tor-0.2.5" ];
+ if [ ${TOR_TAG::9} == "tor-0.2.6" ];
then
- git am ~/build/bug8405.patch
- git am ~/build/bug8402-master.patch
- else
git am ~/build/bug15482.patch
git am ~/build/bug16430.patch
git am ~/build/bug16674.patch
+ else
+ git am ~/build/bug15482.patch
fi
mkdir -p $OUTDIR/src
#git archive HEAD | tar -x -C $OUTDIR/src
diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml
index c755851..8e64922 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -57,14 +57,13 @@ script: |
export GIT_COMMITTER_NAME="nobody"
export GIT_COMMITTER_EMAIL="nobody@localhost"
export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
- if [ ${TOR_TAG::9} == "tor-0.2.5" ];
+ if [ ${TOR_TAG::9} == "tor-0.2.6" ];
then
- git am ~/build/bug8405.patch
- git am ~/build/bug8402-master.patch
- else
git am ~/build/bug15482.patch
git am ~/build/bug16430.patch
git am ~/build/bug16674.patch
+ else
+ git am ~/build/bug15482.patch
fi
mkdir -p $OUTDIR/src
#git archive HEAD | tar -x -C $OUTDIR/src
diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml
index a6be6b4..7320a65 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -57,14 +57,13 @@ script: |
export GIT_COMMITTER_NAME="nobody"
export GIT_COMMITTER_EMAIL="nobody@localhost"
export GIT_COMMITTER_DATE="$REFERENCE_DATETIME"
- if [ ${TOR_TAG::9} == "tor-0.2.5" ];
+ if [ ${TOR_TAG::9} == "tor-0.2.6" ];
then
- git am ~/build/bug8405.patch
- git am ~/build/bug8402-master.patch
- else
git am ~/build/bug15482.patch
git am ~/build/bug16430.patch
git am ~/build/bug16674.patch
+ else
+ git am ~/build/bug15482.patch
fi
mkdir -p $OUTDIR/src
#git archive HEAD | tar -x -C $OUTDIR/src
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic