* [meta-virtualization][PATCH 1/2] cloud-init: package nonarch_libdir
@ 2022-09-29 21:42 Dan McGregor
2022-09-29 21:42 ` [meta-virtualization][PATCH 2/2] cloud-init: add Apache-2.0 as a LICENSE option Dan McGregor
2022-10-04 21:07 ` [meta-virtualization][PATCH 1/2] cloud-init: package nonarch_libdir Bruce Ashfield
0 siblings, 2 replies; 3+ messages in thread
From: Dan McGregor @ 2022-09-29 21:42 UTC (permalink / raw)
To: meta-virtualization; +Cc: Dan McGregor
From: Dan McGregor <dan.mcgregor@usask.ca>
cloud-init installs its data in nonarch_libdir, not libdir, so package
that. On non-multilib builds this wouldn't be noticed.
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
---
recipes-extended/cloud-init/cloud-init_21.4.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-extended/cloud-init/cloud-init_21.4.bb b/recipes-extended/cloud-init/cloud-init_21.4.bb
index 5cb62272c23..9c9b56f18e3 100644
--- a/recipes-extended/cloud-init/cloud-init_21.4.bb
+++ b/recipes-extended/cloud-init/cloud-init_21.4.bb
@@ -40,7 +40,8 @@ inherit python3native
PACKAGES += "${PN}-systemd"
FILES:${PN} += "${sysconfdir}/* \
- ${datadir}/*"
+ ${datadir}/* \
+ ${nonarch_libdir}/${BPN}/*"
FILES:${PN}-systemd += "${systemd_unitdir}/*"
RDEPENDS:${PN}-systemd += " ${PN}"
--
2.37.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* [meta-virtualization][PATCH 2/2] cloud-init: add Apache-2.0 as a LICENSE option
2022-09-29 21:42 [meta-virtualization][PATCH 1/2] cloud-init: package nonarch_libdir Dan McGregor
@ 2022-09-29 21:42 ` Dan McGregor
2022-10-04 21:07 ` [meta-virtualization][PATCH 1/2] cloud-init: package nonarch_libdir Bruce Ashfield
1 sibling, 0 replies; 3+ messages in thread
From: Dan McGregor @ 2022-09-29 21:42 UTC (permalink / raw)
To: meta-virtualization; +Cc: Dan McGregor
From: Dan McGregor <dan.mcgregor@usask.ca>
cloud-init has been dual licensed for a while. According to the
LICENSE file this package is dual-licensed Apache 2 and GPL 3. This has
been the case since commit b2a9f3361 in 2016. This has applied to every
release since 17.1.
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
---
recipes-extended/cloud-init/cloud-init_21.4.bb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/recipes-extended/cloud-init/cloud-init_21.4.bb b/recipes-extended/cloud-init/cloud-init_21.4.bb
index 9c9b56f18e3..e5f5b79e52e 100644
--- a/recipes-extended/cloud-init/cloud-init_21.4.bb
+++ b/recipes-extended/cloud-init/cloud-init_21.4.bb
@@ -1,8 +1,11 @@
DESCRIPTION = "Init scripts for use on cloud images"
HOMEPAGE = "https://github.com/canonical/cloud-init"
SECTION = "devel/python"
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c6dd79b6ec2130a3364f6fa9d6380408"
+LICENSE = "GPL-3.0-only | Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c6dd79b6ec2130a3364f6fa9d6380408 \
+ file://LICENSE-GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LICENSE-Apache2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+"
SRCREV = "a97fd062f7dbd4b824fd006edd08927ef9dbf24a"
SRC_URI = "git://github.com/canonical/cloud-init;branch=main;protocol=https \
--
2.37.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-virtualization][PATCH 1/2] cloud-init: package nonarch_libdir
2022-09-29 21:42 [meta-virtualization][PATCH 1/2] cloud-init: package nonarch_libdir Dan McGregor
2022-09-29 21:42 ` [meta-virtualization][PATCH 2/2] cloud-init: add Apache-2.0 as a LICENSE option Dan McGregor
@ 2022-10-04 21:07 ` Bruce Ashfield
1 sibling, 0 replies; 3+ messages in thread
From: Bruce Ashfield @ 2022-10-04 21:07 UTC (permalink / raw)
To: Dan McGregor; +Cc: meta-virtualization, Dan McGregor
both cloud-init patches are merged.
Bruce
In message: [meta-virtualization][PATCH 1/2] cloud-init: package nonarch_libdir
on 29/09/2022 Dan McGregor wrote:
> From: Dan McGregor <dan.mcgregor@usask.ca>
>
> cloud-init installs its data in nonarch_libdir, not libdir, so package
> that. On non-multilib builds this wouldn't be noticed.
>
> Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
> ---
> recipes-extended/cloud-init/cloud-init_21.4.bb | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/recipes-extended/cloud-init/cloud-init_21.4.bb b/recipes-extended/cloud-init/cloud-init_21.4.bb
> index 5cb62272c23..9c9b56f18e3 100644
> --- a/recipes-extended/cloud-init/cloud-init_21.4.bb
> +++ b/recipes-extended/cloud-init/cloud-init_21.4.bb
> @@ -40,7 +40,8 @@ inherit python3native
> PACKAGES += "${PN}-systemd"
>
> FILES:${PN} += "${sysconfdir}/* \
> - ${datadir}/*"
> + ${datadir}/* \
> + ${nonarch_libdir}/${BPN}/*"
>
> FILES:${PN}-systemd += "${systemd_unitdir}/*"
> RDEPENDS:${PN}-systemd += " ${PN}"
> --
> 2.37.3
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#7634): https://lists.yoctoproject.org/g/meta-virtualization/message/7634
> Mute This Topic: https://lists.yoctoproject.org/mt/94005025/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-04 21:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-29 21:42 [meta-virtualization][PATCH 1/2] cloud-init: package nonarch_libdir Dan McGregor
2022-09-29 21:42 ` [meta-virtualization][PATCH 2/2] cloud-init: add Apache-2.0 as a LICENSE option Dan McGregor
2022-10-04 21:07 ` [meta-virtualization][PATCH 1/2] cloud-init: package nonarch_libdir Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.