[tbb-commits] [builders/tor-browser-build] branch main updated: Bug 40659: Add project for gspt as it's now being included with the introduction of go 1.19 and it's new target of 'unix' which packages previously in error used to gate importing this package from

gitolite role git at cupani.torproject.org
Thu Oct 27 16:58:58 UTC 2022


This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch main
in repository builders/tor-browser-build.

The following commit(s) were added to refs/heads/main by this push:
     new 00686946 Bug 40659: Add project for gspt as it's now being included with the introduction of go 1.19 and it's new target of 'unix' which packages previously in error used to gate importing this package from
00686946 is described below

commit 00686946765517de6277c41702f1b39dc5a05ab7
Author: Dan Ballard <dan at mindstab.net>
AuthorDate: Thu Oct 27 09:36:27 2022 -0700

    Bug 40659: Add project for gspt as it's now being included with the introduction of go 1.19 and it's new target of 'unix' which packages previously in error used to gate importing this package from
---
 projects/goservice/config           |  3 +++
 projects/{goservice => gspt}/config | 23 +++--------------------
 projects/ncdns/config               |  3 +++
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/projects/goservice/config b/projects/goservice/config
index 9aff8ebe..8195e388 100644
--- a/projects/goservice/config
+++ b/projects/goservice/config
@@ -13,6 +13,7 @@ var:
   go_lib_deps:
     - gosvcutils
     - goeasyconfig
+    - gspt
   build_go_lib_pre: |
     [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
 
@@ -43,3 +44,5 @@ input_files:
     project: gosvcutils
   - name: goeasyconfig
     project: goeasyconfig
+  - name: gspt
+    project: gspt
diff --git a/projects/goservice/config b/projects/gspt/config
similarity index 63%
copy from projects/goservice/config
copy to projects/gspt/config
index 9aff8ebe..8bbfaa0d 100644
--- a/projects/goservice/config
+++ b/projects/gspt/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
-git_url:  https://github.com/hlandau/service.git
-git_hash: 0496f910e39ef577ba805f512f6e1b80d652c4b9
+git_url:  https://github.com/erikdubbelboer/gspt
+git_hash: ce36a512837778923c9202c819eb6a3435f9d21d
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 container:
   use_container: 1
@@ -9,10 +9,7 @@ container:
 build: '[% c("projects/go/var/build_go_lib") %]'
 
 var:
-  go_lib: gopkg.in/hlandau/service.v2
-  go_lib_deps:
-    - gosvcutils
-    - goeasyconfig
+  go_lib: github.com/erikdubbelboer/gspt
   build_go_lib_pre: |
     [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
 
@@ -21,16 +18,6 @@ var:
 
     export CGO_ENABLED=1
 
-targets:
-  linux-i686:
-    var:
-      arch_deps:
-        - libcap-dev:i386
-  linux-x86_64:
-    var:
-      arch_deps:
-        - libcap-dev
-
 input_files:
   - project: container-image
   - name: go
@@ -39,7 +26,3 @@ input_files:
     project: '[% c("var/compiler") %]'
   - name: binutils
     project: binutils
-  - name: gosvcutils
-    project: gosvcutils
-  - name: goeasyconfig
-    project: goeasyconfig
diff --git a/projects/ncdns/config b/projects/ncdns/config
index 9ee20970..3ddcdb74 100644
--- a/projects/ncdns/config
+++ b/projects/ncdns/config
@@ -27,6 +27,7 @@ var:
     - goeasyconfig
     - goservice
     - goxnet
+    - gspt
   go_lib_install:
     - github.com/namecoin/ncdns
     - github.com/namecoin/ncdns/backend
@@ -81,3 +82,5 @@ input_files:
     project: godegoutils
   - name: goxnet
     project: goxnet
+  - name: gspt
+    project: gspt
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the tbb-commits mailing list