Fix reproducible builds

Finschia · May 18, 2019 · d854776 · d854776
1 parent fa76500
commit d854776
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
@@ -94,7 +94,7 @@ f_build() {
 
   l_descriptor=$1
 
-  bin/gbuild --commit cosmos-sdk="$g_commit" ${GBUILD_FLAGS} "$l_descriptor"
+  bin/gbuild --commit gaia="$g_commit" ${GBUILD_FLAGS} "$l_descriptor"
   libexec/stop-target || f_echo_stderr "warning: couldn't stop target"
 }
 
@@ -182,7 +182,7 @@ f_prep_build "${g_platforms}"
 export USE_DOCKER=1
 for g_os in ${g_platforms}; do
   g_release="$(git describe --tags --abbrev=9 | sed 's/^v//')-${g_os}"
-  g_descriptor="${g_workdir}/cmd/gaia/contrib/gitian-descriptors/gitian-${g_os}.yml"
+  g_descriptor="${g_workdir}/contrib/gitian-descriptors/gitian-${g_os}.yml"
   [ -f ${g_descriptor} ]
   g_builddir="$(f_builddir ${g_os})"
 

diff --git a/contrib/gitian-descriptors/gitian-darwin.yml b/contrib/gitian-descriptors/gitian-darwin.yml
@@ -97,7 +97,7 @@ script: |
         -asmflags=all=-trimpath=${GOPATH} \
         -mod=readonly -tags "netgo ledger" \
         -ldflags="${LDFLAGS}" \
-        -o ${INSTALLPATH}/${prog} ./cmd/gaia/cmd/${prog}
+        -o ${INSTALLPATH}/${prog} ./cmd/${prog}
 
     done
     popd # ${distsrc}

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -96,7 +96,7 @@ script: |
         -asmflags=all=-trimpath=${GOPATH} \
         -mod=readonly -tags "netgo ledger" \
         -ldflags="${LDFLAGS}" \
-        -o ${INSTALLPATH}/${prog} ./cmd/gaia/cmd/${prog}
+        -o ${INSTALLPATH}/${prog} ./cmd/${prog}
 
     done
     popd # ${distsrc}

diff --git a/contrib/gitian-descriptors/gitian-windows.yml b/contrib/gitian-descriptors/gitian-windows.yml
@@ -97,7 +97,7 @@ script: |
         -asmflags=all=-trimpath=${GOPATH} \
         -mod=readonly -tags "netgo ledger" \
         -ldflags="${LDFLAGS}" \
-        -o ${INSTALLPATH}/${exe} ./cmd/gaia/cmd/${prog}
+        -o ${INSTALLPATH}/${exe} ./cmd/${prog}
 
     done
     popd # ${distsrc}