Hello community, here is the log from the commit of package cloud-init for openSUSE:Factory checked in at 2014-08-13 08:49:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cloud-init (Old) and /work/SRC/openSUSE:Factory/.cloud-init.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cloud-init" Changes: -------- --- /work/SRC/openSUSE:Factory/cloud-init/cloud-init.changes 2014-07-10 14:55:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cloud-init.new/cloud-init.changes 2014-08-13 08:49:16.000000000 +0200 @@ -1,0 +2,26 @@ +Sat Aug 9 12:35:16 UTC 2014 - [email protected] + +- Make package Arch dependent otherwise package is not installable + on arcoitectures where dmidecode is not available. + +- Avoid to run dmidecode on PowerPC as well + cloud-init-no-dmidecode-on-ppc64.patch + +------------------------------------------------------------------- +Mon Jul 28 15:54:32 UTC 2014 - [email protected] + +- declare rsyslog.d only for distros where it is created + fixes build error on SLE 11 + +------------------------------------------------------------------- +Mon Jul 28 15:14:02 UTC 2014 - [email protected] + +- add dmidecode (pmtools SLE 11) as dependency (bnc #888345) + +------------------------------------------------------------------- +Tue Jul 22 22:31:17 UTC 2014 - [email protected] + +- fix typo in cloud.cfg (gowpart -> growpart) +- add cloudinit-datasources.patch: Fixes datasource list + +------------------------------------------------------------------- New: ---- cloud-init-no-dmidecode-on-ppc64.patch cloudinit-datasources.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cloud-init.spec ++++++ --- /var/tmp/diff_new_pack.bFDbx6/_old 2014-08-13 08:49:17.000000000 +0200 +++ /var/tmp/diff_new_pack.bFDbx6/_new 2014-08-13 08:49:17.000000000 +0200 @@ -37,6 +37,8 @@ Patch6: dynamicInitCmd.diff # FIXME suseSetInitCmd.patch send upstream once the SUSE handlers are accepted Patch7: suseSetInitCmd.patch +Patch8: cloudinit-datasources.patch +Patch9: cloud-init-no-dmidecode-on-ppc64.patch BuildRequires: fdupes BuildRequires: filesystem BuildRequires: python-devel @@ -63,8 +65,11 @@ %define docdir %{_defaultdocdir}/%{name} %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +Requires: pmtools %else -BuildArch: noarch +%ifarch %ix86 x86_64 +Requires: dmidecode +%endif %endif %if 0%{?suse_version} && 0%{?suse_version} <= 1210 %define initsys sysvinit_suse @@ -124,6 +129,8 @@ %patch5 %patch6 %patch7 +%patch8 -p1 +%patch9 -p1 %if 0%{?suse_version} <= 1130 # disable ecdsa for SLE 11 (not available) @@ -223,11 +230,12 @@ %{systemd_prefix}/systemd/system/cloud-final.service %endif %if 0%{?suse_version} && 0%{?suse_version} > 1110 +%dir %{_sysconfdir}/rsyslog.d %{_sysconfdir}/rsyslog.d/21-cloudinit.conf %endif %dir %attr(0755, root, root) %{_localstatedir}/lib/cloud %dir %{docdir} -%dir %{_sysconfdir}/rsyslog.d + %files doc %defattr(-,root,root) ++++++ cloud-init-no-dmidecode-on-ppc64.patch ++++++ Index: cloud-init-0.7.5/cloudinit/sources/DataSourceAltCloud.py =================================================================== --- cloud-init-0.7.5.orig/cloudinit/sources/DataSourceAltCloud.py +++ cloud-init-0.7.5/cloudinit/sources/DataSourceAltCloud.py @@ -116,7 +116,7 @@ class DataSourceAltCloud(sources.DataSou ''' uname_arch = os.uname()[4] - if uname_arch.startswith("arm") or uname_arch == "aarch64": + if uname_arch.startswith("arm") or uname_arch == "aarch64" or uname_arch.startswith("ppc"): # Disabling because dmidecode in CMD_DMI_SYSTEM crashes kvm process LOG.debug("Disabling AltCloud datasource on arm (LP: #1243287)") return 'UNKNOWN' Index: cloud-init-0.7.5/cloudinit/sources/DataSourceSmartOS.py =================================================================== --- cloud-init-0.7.5.orig/cloudinit/sources/DataSourceSmartOS.py +++ cloud-init-0.7.5/cloudinit/sources/DataSourceSmartOS.py @@ -175,7 +175,7 @@ class DataSourceSmartOS(sources.DataSour return False uname_arch = os.uname()[4] - if uname_arch.startswith("arm") or uname_arch == "aarch64": + if uname_arch.startswith("arm") or uname_arch == "aarch64" uname_arch.startswith("ppc"): # Disabling because dmidcode in dmi_data() crashes kvm process LOG.debug("Disabling SmartOS datasource on arm (LP: #1243287)") return False ++++++ cloud.cfg.suse ++++++ --- /var/tmp/diff_new_pack.bFDbx6/_old 2014-08-13 08:49:17.000000000 +0200 +++ /var/tmp/diff_new_pack.bFDbx6/_new 2014-08-13 08:49:17.000000000 +0200 @@ -13,7 +13,7 @@ - migrator - bootcmd - write-files - - gowpart + - growpart - resizefs - set_hostname - update_hostname ++++++ cloudinit-datasources.patch ++++++ Index: cloud-init-0.7.5/cloudinit/settings.py =================================================================== --- cloud-init-0.7.5.orig/cloudinit/settings.py +++ cloud-init-0.7.5/cloudinit/settings.py @@ -37,7 +37,7 @@ CFG_BUILTIN = { 'OVF', 'MAAS', 'GCE', - 'OpenStack' + 'OpenStack', 'Ec2', 'CloudSigma', 'CloudStack', -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
