From 10dce90a49b0f544fe53a5ee802d502776db92d2 Mon Sep 17 00:00:00 2001 From: MateuszMalisz Date: Thu, 17 Sep 2020 12:53:57 +0000 Subject: [PATCH 1/5] Add cloud-init-vmware-guestinfo package --- ...loud-init-vmware-guestinfo.signatures.json | 5 +++ .../cloud-init-vmware-guestinfo.spec | 40 +++++++++++++++++++ cgmanifest.json | 11 +++++ 3 files changed, 56 insertions(+) create mode 100644 SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.signatures.json create mode 100644 SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec diff --git a/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.signatures.json b/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.signatures.json new file mode 100644 index 00000000000..2ae9210b1a8 --- /dev/null +++ b/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "cloud-init-vmware-guestinfo-1.3.1.tar.gz": "1f6c74b75d3697d62f0b5b8613e0d66bc06b2fd962f9b7c827c459d8c72505b9" + } +} \ No newline at end of file diff --git a/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec b/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec new file mode 100644 index 00000000000..24c79807916 --- /dev/null +++ b/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec @@ -0,0 +1,40 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")} +Name: cloud-init-vmware-guestinfo +Version: 1.3.1 +Release: 1 +Summary: A cloud-init datasource for VMware +Group: System/Management +License: Apache-2.0 +Vendor: Microsoft Corporation +Distribution: Mariner +Url: https://github.com/vmware/cloud-init-vmware-guestinfo +BuildArch: noarch + +#Source0: https://github.com/vmware/%{name}/archive/v%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz +BuildRequires: python3 +Requires: cloud-init + +%description +Provides a cloud-init datasource for pulling meta, user, +and vendor data from VMware vSphere's GuestInfo interface. + +%prep +%setup -q + +%build + +%install +install -dm 0755 %{buildroot}%{_sysconfdir}/cloud/cloud.cfg.d +install -m 0644 99-DataSourceVMwareGuestInfo.cfg %{buildroot}%{_sysconfdir}/cloud/cloud.cfg.d/99-DataSourceVMwareGuestInfo.cfg +install -dm 0755 %{buildroot}%{python3_sitelib}/cloudinit/sources/ +install -m 0644 DataSourceVMwareGuestInfo.py %{buildroot}%{python3_sitelib}/cloudinit/sources/DataSourceVMwareGuestInfo.py + +%files +%config %{_sysconfdir}/cloud/cloud.cfg.d/99-DataSourceVMwareGuestInfo.cfg +%{python3_sitelib}/cloudinit/sources/DataSourceVMwareGuestInfo.py + +%changelog +* Thu Sep 17 2020 Mateusz Malisz 1.3.1-1 +- Initial CBL-Mariner packaging. +- License Verified diff --git a/cgmanifest.json b/cgmanifest.json index a6cd47def72..dad4a345658 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -490,6 +490,17 @@ } } }, + { + "component": { + "type": "other", + "other": { + "name": "cloud-init-vmware-guestinfo", + "version": "1.3.1", + "downloadUrl": "https://launchpad.net/cloud-init/trunk/19.1/+download/cloud-init-19.1.tar.gz" + } + } + }, + { "component": { "type": "other", From 95527da757a83a240588b4648dbed7f2c701f69d Mon Sep 17 00:00:00 2001 From: MateuszMalisz Date: Mon, 21 Sep 2020 13:38:09 +0000 Subject: [PATCH 2/5] Fix cgmanifest downloadURL for cloud-init-vmware-guestinfo --- cgmanifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgmanifest.json b/cgmanifest.json index dad4a345658..58ac7e8c9d1 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -496,7 +496,7 @@ "other": { "name": "cloud-init-vmware-guestinfo", "version": "1.3.1", - "downloadUrl": "https://launchpad.net/cloud-init/trunk/19.1/+download/cloud-init-19.1.tar.gz" + "downloadUrl": "https://github.com/vmware/cloud-init-vmware-guestinfo/archive/v1.3.1.tar.gz" } } }, From ae1afcd33ae3ac199e438fc7104f86eeb3179a1e Mon Sep 17 00:00:00 2001 From: MateuszMalisz Date: Mon, 21 Sep 2020 13:42:33 +0000 Subject: [PATCH 3/5] Add %license --- .../cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec b/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec index 24c79807916..a5fd621751a 100644 --- a/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec +++ b/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec @@ -31,6 +31,7 @@ install -dm 0755 %{buildroot}%{python3_sitelib}/cloudinit/sources/ install -m 0644 DataSourceVMwareGuestInfo.py %{buildroot}%{python3_sitelib}/cloudinit/sources/DataSourceVMwareGuestInfo.py %files +%license LICENSE %config %{_sysconfdir}/cloud/cloud.cfg.d/99-DataSourceVMwareGuestInfo.cfg %{python3_sitelib}/cloudinit/sources/DataSourceVMwareGuestInfo.py From bcf34711a66b1f71257e4f66847dbe3d1b97b49d Mon Sep 17 00:00:00 2001 From: MateuszMalisz Date: Mon, 21 Sep 2020 15:27:17 +0000 Subject: [PATCH 4/5] Change license to short name, change Url tak to uppercase --- .../cloud-init-vmware-guestinfo.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec b/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec index a5fd621751a..8651b74e190 100644 --- a/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec +++ b/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec @@ -4,10 +4,10 @@ Version: 1.3.1 Release: 1 Summary: A cloud-init datasource for VMware Group: System/Management -License: Apache-2.0 +License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner -Url: https://github.com/vmware/cloud-init-vmware-guestinfo +URL: https://github.com/vmware/cloud-init-vmware-guestinfo BuildArch: noarch #Source0: https://github.com/vmware/%{name}/archive/v%{version}.tar.gz From 11c25d59ad8d030eb44372b18f01940c119534d3 Mon Sep 17 00:00:00 2001 From: MateuszMalisz Date: Mon, 21 Sep 2020 18:05:15 +0000 Subject: [PATCH 5/5] Change original packaging note. Move fields around and align. --- .../cloud-init-vmware-guestinfo.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec b/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec index 8651b74e190..01a81e546ff 100644 --- a/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec +++ b/SPECS/cloud-init-vmware-guestinfo/cloud-init-vmware-guestinfo.spec @@ -8,12 +8,12 @@ License: ASL 2.0 Vendor: Microsoft Corporation Distribution: Mariner URL: https://github.com/vmware/cloud-init-vmware-guestinfo -BuildArch: noarch -#Source0: https://github.com/vmware/%{name}/archive/v%{version}.tar.gz +#Source0: https://github.com/vmware/%{name}/archive/v%{version}.tar.gz Source0: %{name}-%{version}.tar.gz BuildRequires: python3 Requires: cloud-init +BuildArch: noarch %description Provides a cloud-init datasource for pulling meta, user, @@ -37,5 +37,5 @@ install -m 0644 DataSourceVMwareGuestInfo.py %{buildroot}%{python3_sitelib}/clou %changelog * Thu Sep 17 2020 Mateusz Malisz 1.3.1-1 -- Initial CBL-Mariner packaging. +- Original version for CBL-Mariner. - License Verified