[Buildroot] [PATCH 0/4] package: add some docker credential helpers

[Buildroot] [PATCH 0/4] package: add some docker credential helpers

[yann.morin]

From: "Yann E. MORIN" <yann.morin@orange.com>

Hello All!

This series introduces some docker credential helpers for various cloud
providers: AWS ECR, Google Cloud Platform, and Azure. This will allow
one to pull and push images to/from those registries.

The series starts by extending the golab-package infra to accept
packages which sources are located in a sub-directory.

Then it introduces the credential helpers. Pretty boring packages...


Regards,
Yann E. MORIN.


The following changes since commit f0693546ab9eb30ee033747fe1c51664d23b207b

  package/python-setuptools: bump to version 76.0.0 (2025-03-20 23:02:42 +0100)


are available as patches in this mail series,

for you to apply patches up to cff564db203c97fc8800efa120d8e0494696814d

  package/docker-credential-acr-env: new package (2025-03-21 10:58:44 +0100)


----------------------------------------------------------------
Yann E. MORIN (4):
      package/pkg-golang: support _SUBDIR
      package/amazon-ecr-credential-helper: new package
      package/docker-credential-gcr: new package
      package/docker-credential-acr-env: new package

 package/Config.in                                    |  3 +++
 package/amazon-ecr-credential-helper/Config.in       |  9 +++++++++
 .../amazon-ecr-credential-helper.hash                |  2 ++
 .../amazon-ecr-credential-helper.mk                  | 20 ++++++++++++++++++++
 package/docker-credential-acr-env/Config.in          | 12 ++++++++++++
 .../docker-credential-acr-env.hash                   |  2 ++
 .../docker-credential-acr-env.mk                     | 14 ++++++++++++++
 package/docker-credential-gcr/Config.in              | 10 ++++++++++
 .../docker-credential-gcr/docker-credential-gcr.hash |  2 ++
 .../docker-credential-gcr/docker-credential-gcr.mk   | 16 ++++++++++++++++
 package/pkg-golang.mk                                | 13 +++++++++----
 support/download/go-post-process                     |  5 +++--
 12 files changed, 102 insertions(+), 6 deletions(-)
 create mode 100644 package/amazon-ecr-credential-helper/Config.in
 create mode 100644 package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.hash
 create mode 100644 package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.mk
 create mode 100644 package/docker-credential-acr-env/Config.in
 create mode 100644 package/docker-credential-acr-env/docker-credential-acr-env.hash
 create mode 100644 package/docker-credential-acr-env/docker-credential-acr-env.mk
 create mode 100644 package/docker-credential-gcr/Config.in
 create mode 100644 package/docker-credential-gcr/docker-credential-gcr.hash
 create mode 100644 package/docker-credential-gcr/docker-credential-gcr.mk

--
                                        ____________
.-----------------.--------------------:       _    :------------------.
|  Yann E. MORIN  | Real-Time Embedded |    __/ )   | /"\ ASCII RIBBON |
|                 | Software  Designer |  _/ - /'   | \ / CAMPAIGN     |
| +33 638.411.245 '--------------------: (_    `--, |  X  AGAINST      |
| yann.morin (at) orange.com           |_="    ,--' | / \ HTML MAIL    |
'--------------------------------------:______/_____:------------------'

____________________________________________________________________________________________________________
Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.

This message and its attachments may contain confidential or privileged information that may be protected by law;
they should not be distributed, used or copied without authorisation.
If you have received this email in error, please notify the sender and delete this message and its attachments.
As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
Thank you.

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 1/4] package/pkg-golang: support _SUBDIR

[yann.morin]

From: "Yann E. MORIN" <yann.morin@orange.com>

Some packages have their actual source tree in a sub-directory (even if
that is the only source in the repository); this is the case for example
with the Amazon ECR credential helper (to be packaged in a follow up
commit):
    https://github.com/awslabs/amazon-ecr-credential-helper

Do the build in _SUBDIR, and also do the vendoring in there.

We don't need the build to generate executables inside _SUBDIR, so we
just keep using $(@D)/bin as a place to generate them (and install them
from).

Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
Cc: Christian Stewart <christian@aperture.us>
---
 package/pkg-golang.mk            | 13 +++++++++----
 support/download/go-post-process |  5 +++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk
index bdf8de4d66..a4e8bd30cc 100644
--- a/package/pkg-golang.mk
+++ b/package/pkg-golang.mk
@@ -79,8 +79,8 @@ $(2)_GOMOD ?= $$($(2)_SRC_DOMAIN)/$$($(2)_SRC_VENDOR)/$$($(2)_SRC_SOFTWARE)
 # Generate a go.mod file if it doesn't exist. Note: Go is configured
 # to use the "vendor" dir and not make network calls.
 define $(2)_GEN_GOMOD
-	if [ ! -f $$(@D)/go.mod ]; then \
-		printf "module $$($(2)_GOMOD)\n" > $$(@D)/go.mod; \
+	if [ ! -f $$(@D)/$$($(2)_SUBDIR)/go.mod ]; then \
+		printf "module $$($(2)_GOMOD)\n" > $$(@D)/$$($(2)_SUBDIR)/go.mod; \
 	fi
 endef
 $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD
@@ -91,6 +91,11 @@ $(2)_DL_ENV += \
 	GOPROXY=direct \
 	$$($(2)_GO_ENV)
 
+# If building in a sub directory, do the vendoring in there
+ifneq ($$($(2)_SUBDIR),)
+$(2)_DOWNLOAD_POST_PROCESS_OPTS += -s$$($(2)_SUBDIR)
+endif
+
 # Because we append vendored info, we can't rely on the values being empty
 # once we eventually get into the generic-package infra. So, we duplicate
 # the heuristics here
@@ -135,7 +140,7 @@ endif
 # Build package for target
 define $(2)_BUILD_CMDS
 	$$(foreach d,$$($(2)_BUILD_TARGETS),\
-		cd $$(@D); \
+		cd $$(@D)/$$($(2)_SUBDIR); \
 		$$(HOST_GO_TARGET_ENV) \
 			$$($(2)_GO_ENV) \
 			$$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \
@@ -147,7 +152,7 @@ else
 # Build package for host
 define $(2)_BUILD_CMDS
 	$$(foreach d,$$($(2)_BUILD_TARGETS),\
-		cd $$(@D); \
+		cd $$(@D)/$$($(2)_SUBDIR); \
 		$$(HOST_GO_HOST_ENV) \
 			$$($(2)_GO_ENV) \
 			$$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \
diff --git a/support/download/go-post-process b/support/download/go-post-process
index ef96a76948..edc23ec564 100755
--- a/support/download/go-post-process
+++ b/support/download/go-post-process
@@ -5,10 +5,11 @@ set -e
 . "${0%/*}/helpers"
 
 # Parse our options
-while getopts "n:o:" OPT; do
+while getopts "n:o:s:" OPT; do
     case "${OPT}" in
     o)  output="${OPTARG}";;
     n)  base_name="${OPTARG}";;
+    s)  subdir="${OPTARG}";;
     :)  error "option '%s' expects a mandatory argument\n" "${OPTARG}";;
     \?) error "unknown option '%s'\n" "${OPTARG}";;
     esac
@@ -22,7 +23,7 @@ fi
 post_process_unpack "${base_name}" "${output}"
 
 # Do the Go vendoring
-pushd "${base_name}" > /dev/null
+pushd "${base_name}/${subdir}" > /dev/null
 
 if [ ! -f go.mod ]; then
     echo "ERROR: no vendor/ folder and no go.mod, aborting"
-- 
2.34.1

____________________________________________________________________________________________________________
Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.

This message and its attachments may contain confidential or privileged information that may be protected by law;
they should not be distributed, used or copied without authorisation.
If you have received this email in error, please notify the sender and delete this message and its attachments.
As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
Thank you.

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/4] package/amazon-ecr-credential-helper: new package

[yann.morin]

From: "Yann E. MORIN" <yann.morin@orange.com>

Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
Cc: Christian Stewart <christian@aperture.us>
---
 package/Config.in                             |  1 +
 .../amazon-ecr-credential-helper/Config.in    |  9 +++++++++
 .../amazon-ecr-credential-helper.hash         |  2 ++
 .../amazon-ecr-credential-helper.mk           | 20 +++++++++++++++++++
 4 files changed, 32 insertions(+)
 create mode 100644 package/amazon-ecr-credential-helper/Config.in
 create mode 100644 package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.hash
 create mode 100644 package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.mk

diff --git a/package/Config.in b/package/Config.in
index 5c6e334a75..5bc443c1ed 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2806,6 +2806,7 @@ endmenu
 
 menu "System tools"
 	source "package/acl/Config.in"
+	source "package/amazon-ecr-credential-helper/Config.in"
 	source "package/android-tools/Config.in"
 	source "package/atop/Config.in"
 	source "package/attr/Config.in"
diff --git a/package/amazon-ecr-credential-helper/Config.in b/package/amazon-ecr-credential-helper/Config.in
new file mode 100644
index 0000000000..88e7d644c6
--- /dev/null
+++ b/package/amazon-ecr-credential-helper/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_AMAZON_ECR_CREDENTIAL_HELPER
+	bool "amazon-ecr-credential-helper"
+	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
+	help
+	  The Amazon ECR Docker Credential Helper is a credential helper
+	  for the Docker daemon that makes it easier to use Amazon Elastic
+	  Container Registry.
+
+	  https://github.com/awslabs/amazon-ecr-credential-helper
diff --git a/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.hash b/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.hash
new file mode 100644
index 0000000000..6ebcd4e204
--- /dev/null
+++ b/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.hash
@@ -0,0 +1,2 @@
+# Localy computed
+sha256  53765b3e441a0e785131731d0cee4c0e2b2a22b90e523e9e4ec3e461c0ec5b05  amazon-ecr-credential-helper-v0.9.1-git4-go2.tar.gz
diff --git a/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.mk b/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.mk
new file mode 100644
index 0000000000..acfeea16fb
--- /dev/null
+++ b/package/amazon-ecr-credential-helper/amazon-ecr-credential-helper.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# amazon-ecr-credential-helper
+#
+################################################################################
+
+AMAZON_ECR_CREDENTIAL_HELPER_VERSION = v0.9.1
+AMAZON_ECR_CREDENTIAL_HELPER_SITE = https://github.com/awslabs/amazon-ecr-credential-helper
+AMAZON_ECR_CREDENTIAL_HELPER_SITE_METHOD = git
+
+AMAZON_ECR_CREDENTIAL_HELPER_LICENSE = Apache-2.0
+AMAZON_ECR_CREDENTIAL_HELPER_LICENSE_FILES = LICENSE
+
+AMAZON_ECR_CREDENTIAL_HELPER_SUBDIR = ecr-login
+
+AMAZON_ECR_CREDENTIAL_HELPER_GOMOD = ./cli
+AMAZON_ECR_CREDENTIAL_HELPER_BUILD_TARGETS = docker-credential-ecr-login
+AMAZON_ECR_CREDENTIAL_HELPER_INSTALL_BINS = docker-credential-ecr-login
+
+$(eval $(golang-package))
-- 
2.34.1

____________________________________________________________________________________________________________
Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.

This message and its attachments may contain confidential or privileged information that may be protected by law;
they should not be distributed, used or copied without authorisation.
If you have received this email in error, please notify the sender and delete this message and its attachments.
As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
Thank you.

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 3/4] package/docker-credential-gcr: new package

[yann.morin]

From: "Yann E. MORIN" <yann.morin@orange.com>

Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
Cc: Christian Stewart <christian@aperture.us>
---
 package/Config.in                                |  1 +
 package/docker-credential-gcr/Config.in          | 10 ++++++++++
 .../docker-credential-gcr.hash                   |  2 ++
 .../docker-credential-gcr.mk                     | 16 ++++++++++++++++
 4 files changed, 29 insertions(+)
 create mode 100644 package/docker-credential-gcr/Config.in
 create mode 100644 package/docker-credential-gcr/docker-credential-gcr.hash
 create mode 100644 package/docker-credential-gcr/docker-credential-gcr.mk

diff --git a/package/Config.in b/package/Config.in
index 5bc443c1ed..345ce6ff1d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2831,6 +2831,7 @@ menu "System tools"
 	source "package/docker-cli/Config.in"
 	source "package/docker-cli-buildx/Config.in"
 	source "package/docker-compose/Config.in"
+	source "package/docker-credential-gcr/Config.in"
 	source "package/docker-engine/Config.in"
 	source "package/earlyoom/Config.in"
 	source "package/efibootmgr/Config.in"
diff --git a/package/docker-credential-gcr/Config.in b/package/docker-credential-gcr/Config.in
new file mode 100644
index 0000000000..4d399949d0
--- /dev/null
+++ b/package/docker-credential-gcr/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_DOCKER_CREDENTIAL_GCR
+	bool "docker-credential-gcr"
+	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
+	help
+	  docker-credential-gcr is Google Container Registry's standalone,
+	  gcloud SDK-independent Docker credential helper. It allows for
+	  v18.03+ Docker clients to easily make authenticated requests to
+	  GCR's repositories (gcr.io, eu.gcr.io, etc.).
+
+	  https://github.com/GoogleCloudPlatform/docker-credential-gcr/
diff --git a/package/docker-credential-gcr/docker-credential-gcr.hash b/package/docker-credential-gcr/docker-credential-gcr.hash
new file mode 100644
index 0000000000..2796b5746c
--- /dev/null
+++ b/package/docker-credential-gcr/docker-credential-gcr.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256  126fdbf7351d2c7aaee6c525d9660738519eae53eeef77920b105fd4d1bc5dbd  docker-credential-gcr-v2.1.26-git4-go2.tar.gz
diff --git a/package/docker-credential-gcr/docker-credential-gcr.mk b/package/docker-credential-gcr/docker-credential-gcr.mk
new file mode 100644
index 0000000000..658e9baf33
--- /dev/null
+++ b/package/docker-credential-gcr/docker-credential-gcr.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# docker-credential-gcr
+#
+################################################################################
+
+DOCKER_CREDENTIAL_GCR_VERSION = v2.1.26
+DOCKER_CREDENTIAL_GCR_SITE = https://github.com/GoogleCloudPlatform/docker-credential-gcr
+DOCKER_CREDENTIAL_GCR_SITE_METHOD = git
+
+DOCKER_CREDENTIAL_GCR_LICENSE = Apache-2.0
+DOCKER_CREDENTIAL_GCR_LICENSE_FILES = LICENSE
+
+DOCKER_CREDENTIAL_GCR_GOMOD = github.com/GoogleCloudPlatform/docker-credential-gcr/v2
+
+$(eval $(golang-package))
-- 
2.34.1

____________________________________________________________________________________________________________
Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.

This message and its attachments may contain confidential or privileged information that may be protected by law;
they should not be distributed, used or copied without authorisation.
If you have received this email in error, please notify the sender and delete this message and its attachments.
As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
Thank you.

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 4/4] package/docker-credential-acr-env: new package

[yann.morin]

From: "Yann E. MORIN" <yann.morin@orange.com>

Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
Cc: Christian Stewart <christian@aperture.us>
---
 package/Config.in                                  |  1 +
 package/docker-credential-acr-env/Config.in        | 12 ++++++++++++
 .../docker-credential-acr-env.hash                 |  2 ++
 .../docker-credential-acr-env.mk                   | 14 ++++++++++++++
 4 files changed, 29 insertions(+)
 create mode 100644 package/docker-credential-acr-env/Config.in
 create mode 100644 package/docker-credential-acr-env/docker-credential-acr-env.hash
 create mode 100644 package/docker-credential-acr-env/docker-credential-acr-env.mk

diff --git a/package/Config.in b/package/Config.in
index 345ce6ff1d..b8ac01d4e9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2831,6 +2831,7 @@ menu "System tools"
 	source "package/docker-cli/Config.in"
 	source "package/docker-cli-buildx/Config.in"
 	source "package/docker-compose/Config.in"
+	source "package/docker-credential-acr-env/Config.in"
 	source "package/docker-credential-gcr/Config.in"
 	source "package/docker-engine/Config.in"
 	source "package/earlyoom/Config.in"
diff --git a/package/docker-credential-acr-env/Config.in b/package/docker-credential-acr-env/Config.in
new file mode 100644
index 0000000000..ddb101d52f
--- /dev/null
+++ b/package/docker-credential-acr-env/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_DOCKER_CREDENTIAL_ACR_ENV
+	bool "docker-credential-acr-env"
+	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
+	help
+	  The ACR docker credential helper is an alternative to the
+	  existing file store based ACR helper [...] which relies
+	  on az command line and is not optimised for use in CI
+	  environments. Primary use case for this helper is for use
+	  with kaniko and other tools running in CI scenarios wishing
+	  to push to Azure Container Registry.
+
+	  https://github.com/chrismellard/docker-credential-acr-env/
diff --git a/package/docker-credential-acr-env/docker-credential-acr-env.hash b/package/docker-credential-acr-env/docker-credential-acr-env.hash
new file mode 100644
index 0000000000..eb1fdebbf8
--- /dev/null
+++ b/package/docker-credential-acr-env/docker-credential-acr-env.hash
@@ -0,0 +1,2 @@
+# Localy computed
+sha256  deff9d133fdd87b6cbe454e82e72eb7b124d1aea330c17236e804071a446b4ae  docker-credential-acr-env-0.7.0-git4-go2.tar.gz
diff --git a/package/docker-credential-acr-env/docker-credential-acr-env.mk b/package/docker-credential-acr-env/docker-credential-acr-env.mk
new file mode 100644
index 0000000000..31f895e0e3
--- /dev/null
+++ b/package/docker-credential-acr-env/docker-credential-acr-env.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# docker-credential-acr-env
+#
+################################################################################
+
+DOCKER_CREDENTIAL_ACR_ENV_VERSION = 0.7.0
+DOCKER_CREDENTIAL_ACR_ENV_SITE = https://github.com/chrismellard/docker-credential-acr-env
+DOCKER_CREDENTIAL_ACR_ENV_SITE_METHOD = git
+
+DOCKER_CREDENTIAL_ACR_ENV_LICENSE = Apache-2.0
+DOCKER_CREDENTIAL_ACR_ENV_LICENSE_FILES = LICENSE
+
+$(eval $(golang-package))
-- 
2.34.1

____________________________________________________________________________________________________________
Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc
pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler
a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration,
Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci.

This message and its attachments may contain confidential or privileged information that may be protected by law;
they should not be distributed, used or copied without authorisation.
If you have received this email in error, please notify the sender and delete this message and its attachments.
As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified.
Thank you.

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 0/4] package: add some docker credential helpers

[Christian Stewart via buildroot]

Hi Yann,


On Fri, Mar 21, 2025 at 6:32 AM <yann.morin@orange.com> wrote:
>
> From: "Yann E. MORIN" <yann.morin@orange.com>
>
> Hello All!
>
> This series introduces some docker credential helpers for various cloud
> providers: AWS ECR, Google Cloud Platform, and Azure. This will allow
> one to pull and push images to/from those registries.
>
> The series starts by extending the golab-package infra to accept
> packages which sources are located in a sub-directory.
>
> Then it introduces the credential helpers. Pretty boring packages...


Thanks!

Series lgtm

Reviewed-by: Christian Stewart <christian@aperture.us>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/4] package/pkg-golang: support _SUBDIR

[Christian Stewart via buildroot]

Lgtm

On Fri, Mar 21, 2025 at 6:32 AM <yann.morin@orange.com> wrote:
>
> From: "Yann E. MORIN" <yann.morin@orange.com>
>
> Some packages have their actual source tree in a sub-directory (even if
> that is the only source in the repository); this is the case for example
> with the Amazon ECR credential helper (to be packaged in a follow up
> commit):
>     https://github.com/awslabs/amazon-ecr-credential-helper
>
> Do the build in _SUBDIR, and also do the vendoring in there.
>
> We don't need the build to generate executables inside _SUBDIR, so we
> just keep using $(@D)/bin as a place to generate them (and install them
> from).
>
> Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
> Cc: Christian Stewart <christian@aperture.us>
> ---
>  package/pkg-golang.mk            | 13 +++++++++----
>  support/download/go-post-process |  5 +++--
>  2 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk
> index bdf8de4d66..a4e8bd30cc 100644
> --- a/package/pkg-golang.mk
> +++ b/package/pkg-golang.mk
> @@ -79,8 +79,8 @@ $(2)_GOMOD ?= $$($(2)_SRC_DOMAIN)/$$($(2)_SRC_VENDOR)/$$($(2)_SRC_SOFTWARE)
>  # Generate a go.mod file if it doesn't exist. Note: Go is configured
>  # to use the "vendor" dir and not make network calls.
>  define $(2)_GEN_GOMOD
> -       if [ ! -f $$(@D)/go.mod ]; then \
> -               printf "module $$($(2)_GOMOD)\n" > $$(@D)/go.mod; \
> +       if [ ! -f $$(@D)/$$($(2)_SUBDIR)/go.mod ]; then \
> +               printf "module $$($(2)_GOMOD)\n" > $$(@D)/$$($(2)_SUBDIR)/go.mod; \
>         fi
>  endef
>  $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD
> @@ -91,6 +91,11 @@ $(2)_DL_ENV += \
>         GOPROXY=direct \
>         $$($(2)_GO_ENV)
>
> +# If building in a sub directory, do the vendoring in there
> +ifneq ($$($(2)_SUBDIR),)
> +$(2)_DOWNLOAD_POST_PROCESS_OPTS += -s$$($(2)_SUBDIR)
> +endif
> +
>  # Because we append vendored info, we can't rely on the values being empty
>  # once we eventually get into the generic-package infra. So, we duplicate
>  # the heuristics here
> @@ -135,7 +140,7 @@ endif
>  # Build package for target
>  define $(2)_BUILD_CMDS
>         $$(foreach d,$$($(2)_BUILD_TARGETS),\
> -               cd $$(@D); \
> +               cd $$(@D)/$$($(2)_SUBDIR); \
>                 $$(HOST_GO_TARGET_ENV) \
>                         $$($(2)_GO_ENV) \
>                         $$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \
> @@ -147,7 +152,7 @@ else
>  # Build package for host
>  define $(2)_BUILD_CMDS
>         $$(foreach d,$$($(2)_BUILD_TARGETS),\
> -               cd $$(@D); \
> +               cd $$(@D)/$$($(2)_SUBDIR); \
>                 $$(HOST_GO_HOST_ENV) \
>                         $$($(2)_GO_ENV) \
>                         $$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \
> diff --git a/support/download/go-post-process b/support/download/go-post-process
> index ef96a76948..edc23ec564 100755
> --- a/support/download/go-post-process
> +++ b/support/download/go-post-process
> @@ -5,10 +5,11 @@ set -e
>  . "${0%/*}/helpers"
>
>  # Parse our options
> -while getopts "n:o:" OPT; do
> +while getopts "n:o:s:" OPT; do
>      case "${OPT}" in
>      o)  output="${OPTARG}";;
>      n)  base_name="${OPTARG}";;
> +    s)  subdir="${OPTARG}";;
>      :)  error "option '%s' expects a mandatory argument\n" "${OPTARG}";;
>      \?) error "unknown option '%s'\n" "${OPTARG}";;
>      esac
> @@ -22,7 +23,7 @@ fi
>  post_process_unpack "${base_name}" "${output}"
>
>  # Do the Go vendoring
> -pushd "${base_name}" > /dev/null
> +pushd "${base_name}/${subdir}" > /dev/null
>
>  if [ ! -f go.mod ]; then
>      echo "ERROR: no vendor/ folder and no go.mod, aborting"
> --
> 2.34.1
>
>

Reviewed-by: Christian Stewart <christian@aperture.us>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/4] package/pkg-golang: support _SUBDIR

[Julien Olivain]

On 21/03/2025 14:32, yann.morin@orange.com wrote:
> From: "Yann E. MORIN" <yann.morin@orange.com>
> 
> Some packages have their actual source tree in a sub-directory (even if
> that is the only source in the repository); this is the case for 
> example
> with the Amazon ECR credential helper (to be packaged in a follow up
> commit):
>     https://github.com/awslabs/amazon-ecr-credential-helper
> 
> Do the build in _SUBDIR, and also do the vendoring in there.
> 
> We don't need the build to generate executables inside _SUBDIR, so we
> just keep using $(@D)/bin as a place to generate them (and install them
> from).
> 
> Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
> Cc: Christian Stewart <christian@aperture.us>

Series applied to master, thanks.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/4] package/amazon-ecr-credential-helper: new package

[Peter Korsgaard]

>>>>>   <yann.morin@orange.com> writes:

Hi Yann,

 > From: "Yann E. MORIN" <yann.morin@orange.com>
 > Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
 > Cc: Christian Stewart <christian@aperture.us>

This is causing some build failures, E.G.:

https://autobuild.buildroot.org/results/3281c05ff5b98ab6381093076e4a8cfb5f9ff8b0/

I noticed that you had forgotten to add yourself in DEVELOPERS for these
packages so you are not notified. Care to send a patch to update
DEVELOPERS?

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot