commit b0e00cbdc9af37becdb4fba568e9fb7218fdda03 Author: Georg Koppen gk@torproject.org Date: Thu May 8 12:23:55 2014 +0000
Extract Libevent version properly; code clean-up. --- gitian/descriptors/linux/gitian-utils.yml | 7 +++---- gitian/mkbundle-linux.sh | 14 ++++++-------- 2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 427e69b..9bbae76 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -89,14 +89,13 @@ script: | $INSTDIR/python/bin/python2.7 setup.py build cd build/lib* ~/build/dzip.sh lxml-$LXML_VER-linux$GBUILD_BITS-utils.zip lxml - cp *-utils.zip $OUTDIR + cp *utils.zip $OUTDIR cd ../../../
# Grabbing the remaining results cd $INSTDIR ~/build/dzip.sh openssl-$OPENSSL_VER-linux$GBUILD_BITS-utils.zip openssl - # TODO: It is not guaranteed we have a X.X.XX-style version. - ~/build/dzip.sh libevent-${LIBEVENT_TAG:8:6}-linux$GBUILD_BITS-utils.zip libevent + ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent ~/build/dzip.sh python-$PYTHON_VER-linux$GBUILD_BITS-utils.zip python
- cp $INSTDIR/*-utils.zip $OUTDIR/ + cp *utils.zip $OUTDIR/ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index d6186d2..4c9de72 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -100,8 +100,8 @@ cd $GITIAN_DIR
if [ ! -f inputs/openssl-$OPENSSL_VER-linux32-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-linux64-utils.zip -o \ - ! -f inputs/libevent-${LIBEVENT_TAG_ORIG:8:6}-linux32-utils.zip -o \ - ! -f inputs/libevent-${LIBEVENT_TAG_ORIG:8:6}-linux64-utils.zip -o \ + ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip -o \ + ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip -o \ ! -f inputs/python-$PYTHON_VER-linux32-utils.zip -o \ ! -f inputs/python-$PYTHON_VER-linux64-utils.zip -o \ ! -f inputs/lxml-$LXML_VER-linux32-utils.zip -o \ @@ -122,9 +122,8 @@ then cp -a ../build/out/*-utils.zip . ln -sf openssl-$OPENSSL_VER-linux32-utils.zip openssl-linux32-utils.zip ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip - # TODO: It is not guaranteed we have a X.X.XX-style version. - ln -sf libevent-${LIBEVENT_TAG_ORIG:8:6}-linux32-utils.zip libevent-linux32-utils.zip - ln -sf libevent-${LIBEVENT_TAG_ORIG:8:6}-linux64-utils.zip libevent-linux64-utils.zip + ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip libevent-linux32-utils.zip + ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip ln -sf python-$PYTHON_VER-linux32-utils.zip python-linux32-utils.zip ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip ln -sf lxml-$LXML_VER-linux32-utils.zip lxml-linux32-utils.zip @@ -140,9 +139,8 @@ else cd inputs ln -sf openssl-$OPENSSL_VER-linux32-utils.zip openssl-linux32-utils.zip ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip - # TODO: It is not guaranteed we have a X.X.XX-style version. - ln -sf libevent-${LIBEVENT_TAG_ORIG:8:6}-linux32-utils.zip libevent-linux32-utils.zip - ln -sf libevent-${LIBEVENT_TAG_ORIG:8:6}-linux64-utils.zip libevent-linux64-utils.zip + ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip libevent-linux32-utils.zip + ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip ln -sf python-$PYTHON_VER-linux32-utils.zip python-linux32-utils.zip ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip ln -sf lxml-$LXML_VER-linux32-utils.zip lxml-linux32-utils.zip