From e1e2781105130b8cce6d34b33df7ea90838c1061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Mon, 20 Feb 2023 09:56:03 +0200
Subject: [PATCH] build: fix setting env var, temp early exit

---
 build/ci.go                  | 1 +
 build/deb/ethereum/deb.rules | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/ci.go b/build/ci.go
index 0a6eb2b49..9230945e9 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -721,6 +721,7 @@ func doDebianSource(cmdline []string) {
 			if *upload != "" {
 				ppaUpload(*workdir, *upload, *sshUser, []string{source, dsc, changes, buildinfo})
 			}
+			return
 		}
 	}
 }
diff --git a/build/deb/ethereum/deb.rules b/build/deb/ethereum/deb.rules
index 882b45d14..885444a7e 100644
--- a/build/deb/ethereum/deb.rules
+++ b/build/deb/ethereum/deb.rules
@@ -20,7 +20,7 @@ override_dh_auto_build:
 	# We're also shipping the bootstrapper as of Go 1.20 as it had minimum version
 	# requirements opposed to older versions of Go.
 	(mv .goboot ../ && cd ../.goboot/src && ./make.bash)
-	(cd ../.goboot/bin && export GOROOT_BOOTSTRAP=`pwd`)
+	export GOROOT_BOOTSTRAP=`pwd`/../.goboot/bin
 	(mv .go ../ && cd ../.go/src && ./make.bash)
 
 	# We can't download external go modules within Launchpad, so we're shipping the