Skip to content

G
Geth-Modification
Commit 4ec4235f authored by Péter Szilágyi's avatar Péter Szilágyi
Browse files
Options

build: fix gobootstrap path for the PPA

parent e1e27811
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
build/deb/ethereum/deb.rules
View file @ 4ec4235f
...@@ -20,7 +20,7 @@ override_dh_auto_build: ...@@ -20,7 +20,7 @@ override_dh_auto_build:
# We're also shipping the bootstrapper as of Go 1.20 as it had minimum version # We're also shipping the bootstrapper as of Go 1.20 as it had minimum version
# requirements opposed to older versions of Go. # requirements opposed to older versions of Go.
(mv .goboot ../ && cd ../.goboot/src && ./make.bash) (mv .goboot ../ && cd ../.goboot/src && ./make.bash)
export GOROOT_BOOTSTRAP=`pwd`/../.goboot/bin export GOROOT_BOOTSTRAP=`pwd`/../.goboot
(mv .go ../ && cd ../.go/src && ./make.bash) (mv .go ../ && cd ../.go/src && ./make.bash)
# We can't download external go modules within Launchpad, so we're shipping the # We can't download external go modules within Launchpad, so we're shipping the
......
internal/build/util.go
View file @ 4ec4235f
...@@ -176,6 +176,7 @@ func UploadSFTP(identityFile, host, dir string, files []string) error { ...@@ -176,6 +176,7 @@ func UploadSFTP(identityFile, host, dir string, files []string) error {
time.Sleep(500 * time.Millisecond) time.Sleep(500 * time.Millisecond)
aborted = true aborted = true
sftp.Process.Kill() sftp.Process.Kill()
return
} }
} }
}() }()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment