Commit e0a6aee6 authored by Georg Koppen's avatar Georg Koppen
Browse files

Revert "Moving Go building into utils" 

This reverts commit af596cb5.

Part 12 of sandbox backout for maint-7.0
parent a3b693ac

gitian/descriptors/linux/gitian-pluggable-transports.yml

+22 −6
Original line number Diff line number Diff line
@@ -45,13 +45,13 @@ files: 
- "zope.interface.zip"

- "twisted.tar.bz2"

- "parsley.tar.gz"

- "go14.tar.gz"

- "go.tar.gz"

- "dzip.sh"

- "gmp-linux32-utils.zip"

- "gmp-linux64-utils.zip"

- "openssl-linux32-utils.zip"

- "openssl-linux64-utils.zip"

- "go-linux32-utils.zip"

- "go-linux64-utils.zip"

script: |

  INSTDIR="$HOME/install"

  PTDIR="$INSTDIR/Tor/PluggableTransports"
@@ -71,13 +71,29 @@ script: | 


  unzip -d $INSTDIR gmp-linux$GBUILD_BITS-utils.zip

  unzip -d $INSTDIR openssl-linux$GBUILD_BITS-utils.zip

  unzip -d $INSTDIR go-linux$GBUILD_BITS-utils.zip

  export GOROOT="$INSTDIR/go"

  export GOPATH="$HOME/go"

  export PATH="$PATH:$GOROOT/bin"

  # FTE only needs libgmp.so.10 and no libgmpxx anymore.

  cp $INSTDIR/gmp/lib/libgmp.so.10 $INSTDIR/Tor



  # Building go 1.4.x

  # This is needed to bootstrap the go that we actually use

  # https://golang.org/doc/install/source#go14

  tar xvf go14.tar.gz --transform='s,^go\>,go1.4,'

  cd go1.4/src

  # Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go.

  # https://github.com/golang/go/issues/13114#issuecomment-186922245

  CGO_ENABLED=0 ./make.bash

  cd ../..

  export GOROOT_BOOTSTRAP="$PWD/go1.4"



  # Building go

  # http://golang.org/doc/install/source#environment

  export GOPATH="$HOME/go"

  tar xvf go.tar.gz

  cd go/src

  ./make.bash

  cd ../..

  export PATH="$PATH:$PWD/go/bin"



  # Building pyptlib

  cd pyptlib

  find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"

gitian/descriptors/linux/gitian-utils.yml

+0 −24
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ files: 
- "gcc.tar.bz2"

- "openssl.tar.gz"

- "gmp.tar.bz2"

- "go14.tar.gz"

- "go.tar.gz"

- "versions"

- "dzip.sh"

script: |
@@ -124,27 +122,6 @@ script: | 
  make install

  cd ..



  # Building go 1.4.x

  # This is needed to bootstrap the go that we actually use

  # https://golang.org/doc/install/source#go14

  tar xvf go14.tar.gz --transform='s,^go\>,go1.4,'

  cd go1.4/src

  # Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go.

  # https://github.com/golang/go/issues/13114#issuecomment-186922245

  CGO_ENABLED=0 ./make.bash

  cd ../..

  export GOROOT_BOOTSTRAP="$PWD/go1.4"



  # Building go

  # http://golang.org/doc/install/source#environment

  export GOROOT="$INSTDIR/go"

  tar xvf go.tar.gz

  cd go/src

  ./make.bash

  cd ../..

  # Let's get it zipped up.

  mv go $INSTDIR



  # Grabbing the remaining results and making sure timestamps don't spoil them

  # Since we stopped using libfaketime, the binutils, gcc, openssl,

  # libevent archives are no longer reproducible. The main reason
@@ -156,5 +133,4 @@ script: | 
  ~/build/dzip.sh openssl-$OPENSSL_VER-linux$GBUILD_BITS-utils.zip openssl

  ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent

  ~/build/dzip.sh gmp-$GMP_VER-linux$GBUILD_BITS-utils.zip gmp

  ~/build/dzip.sh go-$GO_VER-linux$GBUILD_BITS-utils.zip go

  cp *utils.zip $OUTDIR/

gitian/mkbundle-linux.sh

+1 −7
Original line number Diff line number Diff line
@@ -110,9 +110,7 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-linux32-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/gmp-$GMP_VER-linux32-utils.zip -o \

     ! -f inputs/gmp-$GMP_VER-linux64-utils.zip -o \

     ! -f inputs/go-$GO_VER-linux32-utils.zip -o \

     ! -f inputs/go-$GO_VER-linux64-utils.zip ];

     ! -f inputs/gmp-$GMP_VER-linux64-utils.zip ];

then

  echo

  echo "****** Starting Utilities Component of Linux Bundle (1/6 for Linux) ******"
@@ -137,8 +135,6 @@ then 
  ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip

  ln -sf gmp-$GMP_VER-linux32-utils.zip gmp-linux32-utils.zip

  ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip

  ln -sf go-$GO_VER-linux32-utils.zip go-linux32-utils.zip

  ln -sf go-$GO_VER-linux64-utils.zip go-linux64-utils.zip

  cd ..

  #cp -a result/utils-linux-res.yml inputs/

else
@@ -158,8 +154,6 @@ else 
  ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip

  ln -sf gmp-$GMP_VER-linux32-utils.zip gmp-linux32-utils.zip

  ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip

  ln -sf go-$GO_VER-linux32-utils.zip go-linux32-utils.zip

  ln -sf go-$GO_VER-linux64-utils.zip go-linux64-utils.zip

  cd ..

fi