pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

scaleway: Properly limit `container namespace deploy` command



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Thu May 9 22:16:19 2024 +0200
Changeset:	823dbb240589f7546f3dccd04ef7a802f8bfdfaa

Modified Files:
	scaleway-cli/distinfo
Added Files:
	scaleway-cli/patches/patch-internal_namespaces_container_v1beta1_custom__deploy.go
	scaleway-cli/patches/patch-internal_namespaces_container_v1beta1_custom__deploy__disabled.go
	scaleway-cli/patches/patch-internal_namespaces_container_v1beta1_custom__deploy__helpers.go
Removed Files:
	scaleway-cli/TODO

Log Message:
scaleway: Properly limit `container namespace deploy` command

The `container namespace deploy` command needs
github.com/buildpacks/lifecycle/internal/path that right now (both by
0.18.5 used by scw and upstream 0.19.4) supports only darwin, linux and
windows GOOSes.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=823dbb240589f7546f3dccd04ef7a802f8bfdfaa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 scaleway-cli/TODO                                   | 21 ---------------------
 scaleway-cli/distinfo                               |  3 +++
 ...l_namespaces_container_v1beta1_custom__deploy.go | 13 +++++++++++++
 ...es_container_v1beta1_custom__deploy__disabled.go | 13 +++++++++++++
 ...ces_container_v1beta1_custom__deploy__helpers.go | 13 +++++++++++++
 5 files changed, 42 insertions(+), 21 deletions(-)

diffs:
diff --git a/scaleway-cli/TODO b/scaleway-cli/TODO
deleted file mode 100644
index 75c038aeff..0000000000
--- a/scaleway-cli/TODO
+++ /dev/null
@@ -1,21 +0,0 @@
-Build on NetBSD/amd64 fails with:
-
- go: downloading github.com/prometheus/common v0.44.0
- go: downloading github.com/prometheus/client_model v0.5.0
- go: downloading github.com/beorn7/perks v1.0.1
- go: downloading github.com/cespare/xxhash/v2 v2.2.0
- go: downloading github.com/prometheus/procfs v0.12.0
- go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.4
- package github.com/scaleway/scaleway-cli/v2/cmd/scw
-         imports github.com/scaleway/scaleway-cli/v2/internal/namespaces
-         imports github.com/scaleway/scaleway-cli/v2/internal/namespaces/container/v1beta1
-         imports github.com/buildpacks/pack/pkg/client
-         imports github.com/buildpacks/lifecycle/phase
-         imports github.com/buildpacks/lifecycle/cache
-         imports github.com/buildpacks/lifecycle/platform
-         imports github.com/buildpacks/lifecycle/internal/path: build constraints exclude all Go files in .../pkgsrc/wip/scaleway-cli/work/.gopath/pkg/mod/github.com/buildpacks/lifecycle@v0.18.5/internal/path
-
-The problem is likely due
-github.com/buildpacks/lifecycle/internal/path/defaults_unix.go that is
-actually only for "linux" and "darwin"... Unix-like OS-es are not just
-Linux and macOS!
diff --git a/scaleway-cli/distinfo b/scaleway-cli/distinfo
index a79db24351..72af313107 100644
--- a/scaleway-cli/distinfo
+++ b/scaleway-cli/distinfo
@@ -1935,3 +1935,6 @@ Size (honnef.co_go_tools_@v_v0.0.0-20190523083050-ea95bdfd59fc.mod) = 26 bytes
 BLAKE2s (scaleway-cli-2.30.0.tar.gz) = 509f0332e076fc1eb2af21e7328b5de3c8bd69e4ddab49c516bf08e40e0f8caf
 SHA512 (scaleway-cli-2.30.0.tar.gz) = 0868db014546a79f2fd31219bedba4c2284f56f31403017b8b58114e5626325ce374fe3e5819dd2919872bb7a5d1827984dc5dc494004c5574990ec15d6fb5cc
 Size (scaleway-cli-2.30.0.tar.gz) = 2467651 bytes
+SHA1 (patch-internal_namespaces_container_v1beta1_custom__deploy.go) = b43eb44efc70958fad0800c0d059ce8a99f2188e
+SHA1 (patch-internal_namespaces_container_v1beta1_custom__deploy__disabled.go) = 967eaad8de1a27de4127ab9eb48600c6a0672399
+SHA1 (patch-internal_namespaces_container_v1beta1_custom__deploy__helpers.go) = 0b0c1fe123c94708cb74816a99c62a7ace5c1684
diff --git a/scaleway-cli/patches/patch-internal_namespaces_container_v1beta1_custom__deploy.go b/scaleway-cli/patches/patch-internal_namespaces_container_v1beta1_custom__deploy.go
new file mode 100644
index 0000000000..7328d4f0da
--- /dev/null
+++ b/scaleway-cli/patches/patch-internal_namespaces_container_v1beta1_custom__deploy.go
@@ -0,0 +1,13 @@
+$NetBSD$
+
+Needs github.com/buildpacks/lifecycle/internal/path that is only for
+darwin, linux and windows.
+
+--- internal/namespaces/container/v1beta1/custom_deploy.go.orig	2024-05-09 19:54:13.431346572 +0000
++++ internal/namespaces/container/v1beta1/custom_deploy.go
+@@ -1,4 +1,4 @@
+-//go:build !wasm && !freebsd
++//go:build darwin || linux || windows
+ 
+ package container
+ 
diff --git a/scaleway-cli/patches/patch-internal_namespaces_container_v1beta1_custom__deploy__disabled.go b/scaleway-cli/patches/patch-internal_namespaces_container_v1beta1_custom__deploy__disabled.go
new file mode 100644
index 0000000000..9e7e978161
--- /dev/null
+++ b/scaleway-cli/patches/patch-internal_namespaces_container_v1beta1_custom__deploy__disabled.go
@@ -0,0 +1,13 @@
+$NetBSD$
+
+Needs github.com/buildpacks/lifecycle/internal/path that is only for
+darwin, linux and windows.
+
+--- internal/namespaces/container/v1beta1/custom_deploy_disabled.go.orig	2024-05-09 20:01:32.287395065 +0000
++++ internal/namespaces/container/v1beta1/custom_deploy_disabled.go
+@@ -1,4 +1,4 @@
+-//go:build wasm || freebsd
++//go:build !(darwin || linux || windows)
+ 
+ package container
+ 
diff --git a/scaleway-cli/patches/patch-internal_namespaces_container_v1beta1_custom__deploy__helpers.go b/scaleway-cli/patches/patch-internal_namespaces_container_v1beta1_custom__deploy__helpers.go
new file mode 100644
index 0000000000..87f82da7ab
--- /dev/null
+++ b/scaleway-cli/patches/patch-internal_namespaces_container_v1beta1_custom__deploy__helpers.go
@@ -0,0 +1,13 @@
+$NetBSD$
+
+Needs github.com/buildpacks/lifecycle/internal/path that is only for
+darwin, linux and windows.
+
+--- internal/namespaces/container/v1beta1/custom_deploy_helpers.go.orig	2024-05-09 19:54:13.436082150 +0000
++++ internal/namespaces/container/v1beta1/custom_deploy_helpers.go
+@@ -1,4 +1,4 @@
+-//go:build !wasm && !freebsd
++//go:build darwin || linux || windows
+ 
+ package container
+ 


Home | Main Index | Thread Index | Old Index