* [Buildroot] [PATCH 1/8] package/pkg-cargo: don't expand license info when empty
2023-11-02 16:09 [Buildroot] [PATCH 0/8] package/skopeo: new package yann.morin
@ 2023-11-02 16:09 ` yann.morin
2023-11-08 21:14 ` Peter Korsgaard
2023-11-02 16:09 ` [Buildroot] [PATCH 2/8] package/pkg-cargo: handle licensing terms for host-only packages yann.morin
` (6 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: yann.morin @ 2023-11-02 16:09 UTC (permalink / raw)
To: buildroot; +Cc: yann.morin
From: "Yann E. MORIN" <yann.morin@orange.com>
The cargo infrastructure automatically expands the list of licenses with
a little blurb that the licenses for vendored dependencies might be
missing in the list.
However, when a package does not define a license, the resulting text is
sub-optimal, resulting in a manifest that contains (with a leading
comma, yes):
, vendored dependencies licenses probably not listed
In that case, pointing out some unkown licensing terms may be part of
unkonwn licensing terms is superfluous.
Instead, just let the legal infra do its job, and report an "unkown"
license altogether.
Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
---
package/pkg-cargo.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk
index 264bf5a1ae..7802c3a883 100644
--- a/package/pkg-cargo.mk
+++ b/package/pkg-cargo.mk
@@ -96,8 +96,12 @@ $(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml
endif
# Due to vendoring, it is pretty likely that not all licenses are
-# listed in <pkg>_LICENSE.
+# listed in <pkg>_LICENSE. If the license is unset, it is "unknown"
+# so adding unknowns to some unknown is still some other unkown,
+# so don't append the blurb in that case.
+ifneq ($$($(2)_LICENSE),)
$(2)_LICENSE += , vendored dependencies licenses probably not listed
+endif
# Note: in all the steps below, we "cd" into the build directory to
# execute the "cargo" tool instead of passing $(@D)/Cargo.toml as the
--
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
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [Buildroot] [PATCH 1/8] package/pkg-cargo: don't expand license info when empty
2023-11-02 16:09 ` [Buildroot] [PATCH 1/8] package/pkg-cargo: don't expand license info when empty yann.morin
@ 2023-11-08 21:14 ` Peter Korsgaard
0 siblings, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2023-11-08 21:14 UTC (permalink / raw)
To: yann.morin; +Cc: buildroot
>>>>> <yann.morin@orange.com> writes:
> From: "Yann E. MORIN" <yann.morin@orange.com>
> The cargo infrastructure automatically expands the list of licenses with
> a little blurb that the licenses for vendored dependencies might be
> missing in the list.
> However, when a package does not define a license, the resulting text is
> sub-optimal, resulting in a manifest that contains (with a leading
> comma, yes):
> , vendored dependencies licenses probably not listed
> In that case, pointing out some unkown licensing terms may be part of
> unkonwn licensing terms is superfluous.
> Instead, just let the legal infra do its job, and report an "unkown"
> license altogether.
> Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
Committed to 2023.02.x and 2023.08.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 2/8] package/pkg-cargo: handle licensing terms for host-only packages
2023-11-02 16:09 [Buildroot] [PATCH 0/8] package/skopeo: new package yann.morin
2023-11-02 16:09 ` [Buildroot] [PATCH 1/8] package/pkg-cargo: don't expand license info when empty yann.morin
@ 2023-11-02 16:09 ` yann.morin
2023-11-02 16:09 ` [Buildroot] [PATCH 3/8] package/pkg-golang: don't expand license info when empty yann.morin
` (5 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: yann.morin @ 2023-11-02 16:09 UTC (permalink / raw)
To: buildroot; +Cc: yann.morin
From: "Yann E. MORIN" <yann.morin@orange.com>
The licensing terms are inherited from the target variant to the host
variant: when the host _LICENSE is empty, then the value of the target
_LICENSE is used.
However, for the cargo infra, we want to append a little blurb about
vendored depndencies. If the package is a host-only, then it would
inherit the target _LICENSE, i.e. the variable without the leading
HOST_. If that is defined, this is inherited in the generic-package part
of the infra, but in the cargo infra, we saw an empty variable, and so
we would not add the vendoring blurb.
We can't move the condition appending that blurb, after we called into
the generic-package infra, otherwise in that case, we'd have the
opposite issue for packages that are both target and host packages,
where the blurb would be duplicated for host packages...
Instead, we workaround the issue by duplicating the heuristic to inherit
the target value, from the generic- into the cargo-package infra.
Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
---
package/pkg-cargo.mk | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk
index 7802c3a883..2c277f7079 100644
--- a/package/pkg-cargo.mk
+++ b/package/pkg-cargo.mk
@@ -95,6 +95,15 @@ ifneq ($$($(2)_SUBDIR),)
$(2)_DL_ENV += BR_CARGO_MANIFEST_PATH=$$($(2)_SUBDIR)/Cargo.toml
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
+ifndef $(2)_LICENSE
+ ifdef $(3)_LICENSE
+ $(2)_LICENSE = $$($(3)_LICENSE)
+ endif
+endif
+
# Due to vendoring, it is pretty likely that not all licenses are
# listed in <pkg>_LICENSE. If the license is unset, it is "unknown"
# so adding unknowns to some unknown is still some other unkown,
--
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
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 3/8] package/pkg-golang: don't expand license info when empty
2023-11-02 16:09 [Buildroot] [PATCH 0/8] package/skopeo: new package yann.morin
2023-11-02 16:09 ` [Buildroot] [PATCH 1/8] package/pkg-cargo: don't expand license info when empty yann.morin
2023-11-02 16:09 ` [Buildroot] [PATCH 2/8] package/pkg-cargo: handle licensing terms for host-only packages yann.morin
@ 2023-11-02 16:09 ` yann.morin
2023-11-02 16:09 ` [Buildroot] [PATCH 4/8] package/pkg-golang: handle licensing terms for host-only packages yann.morin
` (4 subsequent siblings)
7 siblings, 0 replies; 15+ messages in thread
From: yann.morin @ 2023-11-02 16:09 UTC (permalink / raw)
To: buildroot; +Cc: yann.morin
From: "Yann E. MORIN" <yann.morin@orange.com>
The o infrastructure automatically expands the list of licenses with a
little blurb that the licenses for vendored dependencies might be
missing in the list.
However, when a package does not define a license, the resulting text is
sub-optimal, resulting in a manifest that contains (with a leading
comma, yes):
, vendored dependencies licenses probably not listed
In that case, pointing out some unkown licensing terms may be part of
unkonwn licensing terms is superfluous.
Instead, just let the legal infra do its job, and report an "unkown"
license altogether.
Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
---
package/pkg-golang.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk
index 7ba82284f3..1fa0b001e0 100644
--- a/package/pkg-golang.mk
+++ b/package/pkg-golang.mk
@@ -92,8 +92,12 @@ $(2)_DL_ENV += \
$$($(2)_GO_ENV)
# Due to vendoring, it is pretty likely that not all licenses are
-# listed in <pkg>_LICENSE.
+# listed in <pkg>_LICENSE. If the license is unset, it is "unknown"
+# so adding unknowns to some unknown is still some other unkown,
+# so don't append the blurb in that case.
+ifneq ($$($(2)_LICENSE),)
$(2)_LICENSE += , vendored dependencies licenses probably not listed
+endif
# Build step. Only define it if not already defined by the package .mk
# file.
--
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
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 4/8] package/pkg-golang: handle licensing terms for host-only packages
2023-11-02 16:09 [Buildroot] [PATCH 0/8] package/skopeo: new package yann.morin
` (2 preceding siblings ...)
2023-11-02 16:09 ` [Buildroot] [PATCH 3/8] package/pkg-golang: don't expand license info when empty yann.morin
@ 2023-11-02 16:09 ` yann.morin
2023-11-04 16:54 ` Arnout Vandecappelle via buildroot
2023-11-02 16:09 ` [Buildroot] [PATCH 5/8] package/libgpg-error: enable host-variant yann.morin
` (3 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: yann.morin @ 2023-11-02 16:09 UTC (permalink / raw)
To: buildroot; +Cc: yann.morin
From: "Yann E. MORIN" <yann.morin@orange.com>
The licensing terms are inherited from the target variant to the host
variant: when the host _LICENSE is empty, then the value of the target
_LICENSE is used.
However, for the golang infra, we want to append a little blurb about
vendored depndencies. If the package is a host-only, then it would
inherit the target _LICENSE, i.e. the variable without the leading
HOST_. If that is defined, this is inherited in the generic-package part
of the infra, but in the golang infra, we saw an empty variable, and so
we would not add the vendoring blurb.
We can't move the condition appending that blurb, after we called into
the generic-package infra, otherwise in that case, we'd have the
opposite issue for packages that are both target and host packages,
where the blurb would be duplicated for host packages...
Instead, we workaround the issue by duplicating the heuristic to inherit
the target value, from the generic- into the golang-package infra.
Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
---
package/pkg-golang.mk | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk
index 1fa0b001e0..8e27602d41 100644
--- a/package/pkg-golang.mk
+++ b/package/pkg-golang.mk
@@ -91,6 +91,15 @@ $(2)_DL_ENV += \
GOPROXY=direct \
$$($(2)_GO_ENV)
+# 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
+ifndef $(2)_LICENSE
+ ifdef $(3)_LICENSE
+ $(2)_LICENSE = $$($(3)_LICENSE)
+ endif
+endif
+
# Due to vendoring, it is pretty likely that not all licenses are
# listed in <pkg>_LICENSE. If the license is unset, it is "unknown"
# so adding unknowns to some unknown is still some other unkown,
--
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
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [Buildroot] [PATCH 4/8] package/pkg-golang: handle licensing terms for host-only packages
2023-11-02 16:09 ` [Buildroot] [PATCH 4/8] package/pkg-golang: handle licensing terms for host-only packages yann.morin
@ 2023-11-04 16:54 ` Arnout Vandecappelle via buildroot
0 siblings, 0 replies; 15+ messages in thread
From: Arnout Vandecappelle via buildroot @ 2023-11-04 16:54 UTC (permalink / raw)
To: yann.morin, buildroot; +Cc: Yann E. MORIN
On 02/11/2023 17:09, yann.morin@orange.com wrote:
> From: "Yann E. MORIN" <yann.morin@orange.com>
>
> The licensing terms are inherited from the target variant to the host
> variant: when the host _LICENSE is empty, then the value of the target
> _LICENSE is used.
>
> However, for the golang infra, we want to append a little blurb about
> vendored depndencies. If the package is a host-only, then it would
> inherit the target _LICENSE, i.e. the variable without the leading
> HOST_. If that is defined, this is inherited in the generic-package part
> of the infra, but in the golang infra, we saw an empty variable, and so
> we would not add the vendoring blurb.
>
> We can't move the condition appending that blurb, after we called into
> the generic-package infra, otherwise in that case, we'd have the
> opposite issue for packages that are both target and host packages,
> where the blurb would be duplicated for host packages...
>
> Instead, we workaround the issue by duplicating the heuristic to inherit
> the target value, from the generic- into the golang-package infra.
>
> Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
> ---
> package/pkg-golang.mk | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk
> index 1fa0b001e0..8e27602d41 100644
> --- a/package/pkg-golang.mk
> +++ b/package/pkg-golang.mk
> @@ -91,6 +91,15 @@ $(2)_DL_ENV += \
> GOPROXY=direct \
> $$($(2)_GO_ENV)
>
> +# 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
> +ifndef $(2)_LICENSE
> + ifdef $(3)_LICENSE
> + $(2)_LICENSE = $$($(3)_LICENSE)
> + endif
> +endif
This isn't a very elegant solution, but I can't think of anything better.
Applied the first 4 patches of this series to master, thanks.
Regards,
Arnout
> +
> # Due to vendoring, it is pretty likely that not all licenses are
> # listed in <pkg>_LICENSE. If the license is unset, it is "unknown"
> # so adding unknowns to some unknown is still some other unkown,
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 5/8] package/libgpg-error: enable host-variant
2023-11-02 16:09 [Buildroot] [PATCH 0/8] package/skopeo: new package yann.morin
` (3 preceding siblings ...)
2023-11-02 16:09 ` [Buildroot] [PATCH 4/8] package/pkg-golang: handle licensing terms for host-only packages yann.morin
@ 2023-11-02 16:09 ` yann.morin
2024-07-13 14:19 ` Thomas Petazzoni via buildroot
2023-11-02 16:09 ` [Buildroot] [PATCH 6/8] package/libassuan: add host variant yann.morin
` (2 subsequent siblings)
7 siblings, 1 reply; 15+ messages in thread
From: yann.morin @ 2023-11-02 16:09 UTC (permalink / raw)
To: buildroot; +Cc: yann.morin
From: "Yann E. MORIN" <yann.morin@orange.com>
libgpg-error is needed by libassuan and libgpgme, the latter
being needed for skopeo (to come in a followup patch).
Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
---
package/libgpg-error/libgpg-error.mk | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk
index 60e3da9de1..88dbdf2259 100644
--- a/package/libgpg-error/libgpg-error.mk
+++ b/package/libgpg-error/libgpg-error.mk
@@ -26,4 +26,10 @@ else
LIBGPG_ERROR_CONF_OPTS += --disable-threads
endif
+HOST_LIBGPG_ERROR_CONF_OPTS = \
+ --enable-threads \
+ --enable-install-gpg-error-config \
+ --disable-tests
+
$(eval $(autotools-package))
+$(eval $(host-autotools-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
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 6/8] package/libassuan: add host variant
2023-11-02 16:09 [Buildroot] [PATCH 0/8] package/skopeo: new package yann.morin
` (4 preceding siblings ...)
2023-11-02 16:09 ` [Buildroot] [PATCH 5/8] package/libgpg-error: enable host-variant yann.morin
@ 2023-11-02 16:09 ` yann.morin
2024-07-13 14:19 ` Thomas Petazzoni via buildroot
2023-11-02 16:09 ` [Buildroot] [PATCH 7/8] package/libgpgme: " yann.morin
2023-11-02 16:09 ` [Buildroot] [PATCH 8/8] package/skopeo: new host package yann.morin
7 siblings, 1 reply; 15+ messages in thread
From: yann.morin @ 2023-11-02 16:09 UTC (permalink / raw)
To: buildroot; +Cc: yann.morin
From: "Yann E. MORIN" <yann.morin@orange.com>
libassuan is needed by libgpgme, which is needed for skopeo
(to come in a followup patch);
Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
---
package/libassuan/libassuan.mk | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/package/libassuan/libassuan.mk b/package/libassuan/libassuan.mk
index fb95a6fd67..cec214f636 100644
--- a/package/libassuan/libassuan.mk
+++ b/package/libassuan/libassuan.mk
@@ -15,8 +15,14 @@ LIBASSUAN_CONF_OPTS = \
--with-gpg-error-prefix=$(STAGING_DIR)/usr
LIBASSUAN_CONFIG_SCRIPTS = libassuan-config
+HOST_LIBASSUAN_DEPENDENCIES = host-libgpg-error
+HOST_LIBASSUAN_CONFIG_SCRIPTS = libassuan-config
+HOST_LIBASSUAN_CONF_OPTS = --with-gpg-error-prefix=$(HOST_DIR)
+
# Force the path to "gpgrt-config" (from the libgpg-error package) to
# avoid using the one on host, if present.
LIBASSUAN_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config
+HOST_LIBASSUAN_CONF_ENV += GPGRT_CONFIG=$(HOST_DIR)/bin/gpgrt-config
$(eval $(autotools-package))
+$(eval $(host-autotools-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
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 7/8] package/libgpgme: add host variant
2023-11-02 16:09 [Buildroot] [PATCH 0/8] package/skopeo: new package yann.morin
` (5 preceding siblings ...)
2023-11-02 16:09 ` [Buildroot] [PATCH 6/8] package/libassuan: add host variant yann.morin
@ 2023-11-02 16:09 ` yann.morin
2024-07-13 14:19 ` Thomas Petazzoni via buildroot
2023-11-02 16:09 ` [Buildroot] [PATCH 8/8] package/skopeo: new host package yann.morin
7 siblings, 1 reply; 15+ messages in thread
From: yann.morin @ 2023-11-02 16:09 UTC (permalink / raw)
To: buildroot; +Cc: yann.morin
From: "Yann E. MORIN" <yann.morin@orange.com>
libgpgme is needed by skopeo (to come in a followup patch).
Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
---
package/libgpgme/libgpgme.mk | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk
index 036103b7fc..55710430e7 100644
--- a/package/libgpgme/libgpgme.mk
+++ b/package/libgpgme/libgpgme.mk
@@ -47,4 +47,23 @@ ifeq ($(BR2_MIPS_NABI64)x$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10),yx)
LIBGPGME_CONF_OPTS += --disable-linux-getdents
endif
+HOST_LIBGPGME_DEPENDENCIES = host-libassuan host-libgpg-error
+HOST_LIBGPGME_CONFIG_SCRIPTS = gpgme-config
+
+# C++ bindings require a C++11 capable gcc, and -Wsuggest-override support
+# Let's assume the host toolchain always has C++
+HOST_LIBGPGME_LANGUAGE_BINDINGS = \
+ cl \
+ $(if $(BR2_HOST_GCC_AT_LEAST_5),cpp)
+
+HOST_LIBGPGME_CONF_OPTS = \
+ --with-gpg-error-prefix=$(HOST_DIR) \
+ --with-libassuan-prefix=$(HOST_DIR) \
+ --disable-gpgsm-test \
+ --disable-gpgconf-test \
+ --disable-g13-test \
+ --disable-gpg-test \
+ --enable-languages=$(subst $(space),$(comma),$(HOST_LIBGPGME_LANGUAGE_BINDINGS))
+
$(eval $(autotools-package))
+$(eval $(host-autotools-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
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 8/8] package/skopeo: new host package
2023-11-02 16:09 [Buildroot] [PATCH 0/8] package/skopeo: new package yann.morin
` (6 preceding siblings ...)
2023-11-02 16:09 ` [Buildroot] [PATCH 7/8] package/libgpgme: " yann.morin
@ 2023-11-02 16:09 ` yann.morin
2024-07-13 14:20 ` Thomas Petazzoni via buildroot
7 siblings, 1 reply; 15+ messages in thread
From: yann.morin @ 2023-11-02 16:09 UTC (permalink / raw)
To: buildroot; +Cc: yann.morin
From: "Yann E. MORIN" <yann.morin@orange.com>
skopeo is a command line utility that performs various operations on
container images and image repositories.
We introduce it as a host-only package, as the expected usage is to
transform an OCI image into a docker image, or to help in uploading an
OCI image to a (local) docker daemon or to a docker registry, for
example, in a post-build script.
As such, it needs a prompt in the host packages section.
Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
---
package/Config.in.host | 1 +
package/skopeo/Config.in.host | 7 +++++++
package/skopeo/skopeo.hash | 2 ++
package/skopeo/skopeo.mk | 22 ++++++++++++++++++++++
4 files changed, 32 insertions(+)
create mode 100644 package/skopeo/Config.in.host
create mode 100644 package/skopeo/skopeo.hash
create mode 100644 package/skopeo/skopeo.mk
diff --git a/package/Config.in.host b/package/Config.in.host
index c80842c33a..52ea32d18f 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -103,6 +103,7 @@ menu "Host utilities"
source "package/sdbus-cpp/Config.in.host"
source "package/sdbusplus/Config.in.host"
source "package/sentry-cli/Config.in.host"
+ source "package/skopeo/Config.in.host"
source "package/sloci-image/Config.in.host"
source "package/squashfs/Config.in.host"
source "package/sunxi-tools/Config.in.host"
diff --git a/package/skopeo/Config.in.host b/package/skopeo/Config.in.host
new file mode 100644
index 0000000000..4a63a0829c
--- /dev/null
+++ b/package/skopeo/Config.in.host
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_HOST_SKOPEO
+ bool "host skopeo"
+ help
+ skopeo is a command line utility that performs various
+ operations on container images and image repositories.
+
+ https://github.com/containers/skopeo
diff --git a/package/skopeo/skopeo.hash b/package/skopeo/skopeo.hash
new file mode 100644
index 0000000000..25b0d92fd7
--- /dev/null
+++ b/package/skopeo/skopeo.hash
@@ -0,0 +1,2 @@
+sha256 0b788fc5725ac79327f7c29797821a2bafc1c3c87bbfcb2998c2a1be949e314d skopeo-1.13.3.tar.gz
+sha256 716a8b80635c394681e652823e1e42e411ad2d254e1f202403422d74f4b0b106 LICENSE
diff --git a/package/skopeo/skopeo.mk b/package/skopeo/skopeo.mk
new file mode 100644
index 0000000000..98b0e7ed0a
--- /dev/null
+++ b/package/skopeo/skopeo.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# skopeo
+#
+################################################################################
+
+SKOPEO_VERSION = 1.13.3
+SKOPEO_SITE = $(call github,containers,skopeo,v$(SKOPEO_VERSION))
+
+SKOPEO_LICENSE = Apache-2.0
+SKOPEO_LICENSE_FILES = LICENSE
+
+HOST_SKOPEO_DEPENDENCIES = \
+ host-btrfs-progs \
+ host-libgpgme \
+ host-lvm2 \
+ host-pkgconf
+
+HOST_SKOPEO_GO_ENV = PKG_CONFIG_PATH=$(HOST_DIR)/lib/pkgconfig
+HOST_SKOPEO_BUILD_TARGETS = cmd/skopeo
+
+$(eval $(host-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
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [Buildroot] [PATCH 8/8] package/skopeo: new host package
2023-11-02 16:09 ` [Buildroot] [PATCH 8/8] package/skopeo: new host package yann.morin
@ 2024-07-13 14:20 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 15+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-13 14:20 UTC (permalink / raw)
To: yann.morin; +Cc: buildroot
Hello Yann,
On Thu, 2 Nov 2023 17:09:27 +0100
<yann.morin@orange.com> wrote:
> From: "Yann E. MORIN" <yann.morin@orange.com>
>
> skopeo is a command line utility that performs various operations on
> container images and image repositories.
>
> We introduce it as a host-only package, as the expected usage is to
> transform an OCI image into a docker image, or to help in uploading an
> OCI image to a (local) docker daemon or to a docker registry, for
> example, in a post-build script.
>
> As such, it needs a prompt in the host packages section.
>
> Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
> ---
> package/Config.in.host | 1 +
> package/skopeo/Config.in.host | 7 +++++++
> package/skopeo/skopeo.hash | 2 ++
> package/skopeo/skopeo.mk | 22 ++++++++++++++++++++++
> 4 files changed, 32 insertions(+)
> create mode 100644 package/skopeo/Config.in.host
> create mode 100644 package/skopeo/skopeo.hash
> create mode 100644 package/skopeo/skopeo.mk
Entry in DEVELOPERS file was missing.
> diff --git a/package/skopeo/skopeo.hash b/package/skopeo/skopeo.hash
> new file mode 100644
> index 0000000000..25b0d92fd7
> --- /dev/null
> +++ b/package/skopeo/skopeo.hash
> @@ -0,0 +1,2 @@
Comment "# Locally calculated" was missing.
> +sha256 0b788fc5725ac79327f7c29797821a2bafc1c3c87bbfcb2998c2a1be949e314d skopeo-1.13.3.tar.gz
Had to add -go2 here, but not your fault, this was changed after you
sent this patch, by some other Yann :-)
Applied with those changes. Thanks!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 15+ messages in thread