rpm/cloud-init
SHA256
1
0
Fork 0
forked from pool/cloud-init
Code Pull Requests Activity

Accepting request 244060 from home:k0da:ppc

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/244060
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=23
This commit is contained in:
Robert Schweikert 2014-08-11 15:58:55 +00:00 committed by Git OBS Bridge
parent 3c9a48bda0
commit 9f75c2a543
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cloud-init-no-dmidecode-on-ppc64.patch Normal file
View File

@ -0,0 +1,26 @@
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

9
cloud-init.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sat Aug 9 12:35:16 UTC 2014 - dvlaeev@suse.com
- 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 - rschweikert@suse.com

5
cloud-init.spec
View File

@ -38,6 +38,7 @@ 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
@ -66,8 +67,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Requires: pmtools
%else
%ifarch %ix86 x86_64
Requires: dmidecode
BuildArch: noarch
%endif
%endif
%if 0%{?suse_version} && 0%{?suse_version} <= 1210
%define initsys sysvinit_suse
@ -128,6 +130,7 @@ Unit tests for the cloud-init tools
%patch6
%patch7
%patch8 -p1
%patch9 -p1
%if 0%{?suse_version} <= 1130
# disable ecdsa for SLE 11 (not available)