uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
46
pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch
Normal file
46
pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
From b69fee70154a861637c82e98e18be01bbb96423b Mon Sep 17 00:00:00 2001
|
||||
From: Florian Klink <flokli@flokli.de>
|
||||
Date: Wed, 12 Jun 2019 17:03:09 +0200
|
||||
Subject: [PATCH] kubeconfig: don't store absolute path to gcloud binary
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The `gcloud beta container clusters get-credentials $cluster \
|
||||
--region $region --project $project`
|
||||
command can be used to write kubectl config files.
|
||||
|
||||
In that file, normally the absolute path to the `gcloud` binary is
|
||||
stored.
|
||||
|
||||
This is a bad idea in NixOS. We might eventually garbage-collect that
|
||||
specific gcloud binary - and in general, would expect a nix-shell
|
||||
provided gcloud to be used.
|
||||
|
||||
In its current state, token renewal would just start to break with the
|
||||
following error message:
|
||||
|
||||
Unable to connect to the server: error executing access token command "/nix/store/…/gcloud config config-helper --format=json": err=fork/exec /nix/store/…/gcloud: no such file or directory output= stderr=
|
||||
|
||||
Avoid this by storing just `gcloud` inside `cmd-path`, which causes
|
||||
kubectl to lookup the gcloud command from $PATH, which is more likely to
|
||||
keep working.
|
||||
---
|
||||
lib/googlecloudsdk/api_lib/container/kubeconfig.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/googlecloudsdk/api_lib/container/kubeconfig.py b/lib/googlecloudsdk/api_lib/container/kubeconfig.py
|
||||
index 4330988d6..37424b841 100644
|
||||
--- a/lib/googlecloudsdk/api_lib/container/kubeconfig.py
|
||||
+++ b/lib/googlecloudsdk/api_lib/container/kubeconfig.py
|
||||
@@ -352,7 +352,7 @@ def _AuthProvider(name='gcp',
|
||||
if sdk_bin_path is None:
|
||||
log.error(SDK_BIN_PATH_NOT_FOUND)
|
||||
raise Error(SDK_BIN_PATH_NOT_FOUND)
|
||||
- cmd_path = os.path.join(sdk_bin_path, bin_name)
|
||||
+ cmd_path = bin_name
|
||||
|
||||
cfg = {
|
||||
# Command for gcloud credential helper
|
||||
--
|
||||
2.21.0
|
||||
Loading…
Add table
Add a link
Reference in a new issue