rpms/tog-pegasus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use Experimental DMTF CIM schema version 2.38.0

Browse Source
This commit is contained in:
Vitezslav Crhonek 2013-09-05 15:45:19 +02:00
parent 1bcc4182fc
commit 9de78f7204
3 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
pegasus-2.12.0-schema-version-and-includes.patch
View File

@ -1,19 +1,19 @@
diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status
--- pegasus/env_var_Linux.status.orig 2013-09-02 16:41:54.550820261 +0200
+++ pegasus/env_var_Linux.status 2013-09-02 16:41:54.579820363 +0200
--- pegasus/env_var_Linux.status.orig 2013-09-05 15:12:45.728086855 +0200
+++ pegasus/env_var_Linux.status 2013-09-05 15:12:45.750086927 +0200
@@ -28,7 +28,7 @@ PEGASUS_PAM_AUTHENTICATION=true
PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
PEGASUS_USE_RELEASE_DIRS=true
PEGASUS_USE_SYSLOGS=true
-PEGASUS_CIM_SCHEMA=CIM236
+PEGASUS_CIM_SCHEMA=CIM237
+PEGASUS_CIM_SCHEMA=CIM238
PEGASUS_USE_NET_SNMP=true
PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false
diff -up pegasus/Schemas/CIM237/CIM_Core.mof.orig pegasus/Schemas/CIM237/CIM_Core.mof
--- pegasus/Schemas/CIM237/CIM_Core.mof.orig 2013-09-02 16:41:54.533820202 +0200
+++ pegasus/Schemas/CIM237/CIM_Core.mof 2013-09-02 16:41:54.579820363 +0200
@@ -144,11 +144,14 @@
diff -up pegasus/Schemas/CIM238/CIM_Core.mof.orig pegasus/Schemas/CIM238/CIM_Core.mof
--- pegasus/Schemas/CIM238/CIM_Core.mof.orig 2013-09-05 15:12:45.713086805 +0200
+++ pegasus/Schemas/CIM238/CIM_Core.mof 2013-09-05 15:12:45.750086927 +0200
@@ -146,11 +146,14 @@
#pragma include ("DMTF/Core/CIM_SpareGroup.mof")
#pragma include ("DMTF/Core/CIM_StatusCollection.mof")
#pragma include ("DMTF/Core/CIM_StorageAllocationSettingData.mof")
@ -28,7 +28,7 @@ diff -up pegasus/Schemas/CIM237/CIM_Core.mof.orig pegasus/Schemas/CIM237/CIM_Cor
#pragma include ("DMTF/Core/CIM_VirtualEthernetSwitchSettingData.mof")
#pragma include ("DMTF/Core/CIM_VirtualSystemManagementCapabilities.mof")
#pragma include ("DMTF/Core/CIM_VirtualSystemSnapshotCapabilities.mof")
@@ -183,6 +186,8 @@
@@ -185,6 +188,8 @@
#pragma include ("DMTF/Core/CIM_ScopedSetting.mof")
#pragma include ("DMTF/Core/CIM_StatisticsCollection.mof")
#pragma include ("DMTF/Core/CIM_StorageRedundancySet.mof")
@ -37,7 +37,7 @@ diff -up pegasus/Schemas/CIM237/CIM_Core.mof.orig pegasus/Schemas/CIM237/CIM_Cor
#pragma include ("DMTF/Core/CIM_ConcreteJob.mof")
#pragma include ("DMTF/Core/CIM_DefaultSetting.mof")
#pragma include ("DMTF/Core/CIM_EnabledLogicalElement.mof")
@@ -211,6 +216,7 @@
@@ -214,6 +219,7 @@
#pragma include ("DMTF/Core/CIM_AdminDomain.mof")
#pragma include ("DMTF/Core/CIM_BasedOn.mof")
#pragma include ("DMTF/Core/CIM_BasicExecutionService.mof")
@ -45,7 +45,7 @@ diff -up pegasus/Schemas/CIM237/CIM_Core.mof.orig pegasus/Schemas/CIM237/CIM_Cor
#pragma include ("DMTF/Core/CIM_ComputerSystemElementSettingData.mof")
#pragma include ("DMTF/Core/CIM_ConfigurationForSystem.mof")
#pragma include ("DMTF/Core/CIM_ContainedDomain.mof")
@@ -242,6 +248,8 @@
@@ -245,6 +251,8 @@
#pragma include ("DMTF/Core/CIM_SettingForSystem.mof")
#pragma include ("DMTF/Core/CIM_SoftwareIdentityResource.mof")
#pragma include ("DMTF/Core/CIM_SystemDeviceView.mof")
@ -54,7 +54,7 @@ diff -up pegasus/Schemas/CIM237/CIM_Core.mof.orig pegasus/Schemas/CIM237/CIM_Cor
#pragma include ("DMTF/Core/CIM_SystemSCSIProtocolController.mof")
#pragma include ("DMTF/Core/CIM_VirtualSystemManagementService.mof")
#pragma include ("DMTF/Core/CIM_VirtualSystemSnapshotService.mof")
@@ -255,6 +263,13 @@
@@ -258,6 +266,13 @@
#pragma include ("DMTF/Core/CIM_ProtocolService.mof")
#pragma include ("DMTF/Core/CIM_ProvidesEndpoint.mof")
#pragma include ("DMTF/Core/CIM_RemotePort.mof")
@ -68,9 +68,9 @@ diff -up pegasus/Schemas/CIM237/CIM_Core.mof.orig pegasus/Schemas/CIM237/CIM_Cor
+#pragma include ("DMTF/Device/CIM_FCPort.mof")
#pragma include ("DMTF/Core/CIM_SystemFCPort.mof")
diff -up pegasus/Schemas/CIM237/CIM_Event.mof.orig pegasus/Schemas/CIM237/CIM_Event.mof
--- pegasus/Schemas/CIM237/CIM_Event.mof.orig 2013-09-02 16:41:54.535820209 +0200
+++ pegasus/Schemas/CIM237/CIM_Event.mof 2013-09-02 16:41:54.579820363 +0200
diff -up pegasus/Schemas/CIM238/CIM_Event.mof.orig pegasus/Schemas/CIM238/CIM_Event.mof
--- pegasus/Schemas/CIM238/CIM_Event.mof.orig 2013-09-05 15:12:45.716086815 +0200
+++ pegasus/Schemas/CIM238/CIM_Event.mof 2013-09-05 15:12:45.750086927 +0200
@@ -73,5 +73,6 @@
#pragma include ("DMTF/Event/CIM_IPNetworkSecurityIndication.mof")
#pragma include ("DMTF/Event/CIM_IPPacketFilterIndication.mof")
@ -78,10 +78,10 @@ diff -up pegasus/Schemas/CIM237/CIM_Event.mof.orig pegasus/Schemas/CIM237/CIM_Ev
+#pragma include ("DMTF/System/CIM_Log.mof")
#pragma include ("DMTF/Event/CIM_LogOfIndication.mof")
diff -up pegasus/Schemas/CIM237/CIM_Interop.mof.orig pegasus/Schemas/CIM237/CIM_Interop.mof
--- pegasus/Schemas/CIM237/CIM_Interop.mof.orig 2013-09-02 16:41:54.537820216 +0200
+++ pegasus/Schemas/CIM237/CIM_Interop.mof 2013-09-02 16:41:54.579820363 +0200
@@ -56,6 +56,7 @@
diff -up pegasus/Schemas/CIM238/CIM_Interop.mof.orig pegasus/Schemas/CIM238/CIM_Interop.mof
--- pegasus/Schemas/CIM238/CIM_Interop.mof.orig 2013-09-05 15:12:45.718086822 +0200
+++ pegasus/Schemas/CIM238/CIM_Interop.mof 2013-09-05 15:12:45.750086927 +0200
@@ -57,6 +57,7 @@
#pragma include ("DMTF/Interop/CIM_ElementConformsToProfile.mof")
#pragma include ("DMTF/Interop/CIM_ReferencedProfile.mof")
#pragma include ("DMTF/Interop/CIM_SubProfileRequiresProfile.mof")
@ -89,10 +89,10 @@ diff -up pegasus/Schemas/CIM237/CIM_Interop.mof.orig pegasus/Schemas/CIM237/CIM_
#pragma include ("DMTF/Interop/CIM_WBEMProtocolServiceCapabilities.mof")
#pragma include ("DMTF/Interop/CIM_WSManagementCapabilities.mof")
#pragma include ("DMTF/Interop/CIM_CIMXMLCapabilities.mof")
diff -up pegasus/Schemas/CIM237/CIM_System.mof.orig pegasus/Schemas/CIM237/CIM_System.mof
--- pegasus/Schemas/CIM237/CIM_System.mof.orig 2013-09-02 16:41:54.542820234 +0200
+++ pegasus/Schemas/CIM237/CIM_System.mof 2013-09-02 16:48:02.744613226 +0200
@@ -65,6 +65,7 @@
diff -up pegasus/Schemas/CIM238/CIM_System.mof.orig pegasus/Schemas/CIM238/CIM_System.mof
--- pegasus/Schemas/CIM238/CIM_System.mof.orig 2013-09-05 15:12:45.722086835 +0200
+++ pegasus/Schemas/CIM238/CIM_System.mof 2013-09-05 15:31:32.383754011 +0200
@@ -67,6 +67,7 @@
#pragma include ("DMTF/System/CIM_VirtualSystemSettingData.mof")
#pragma include ("DMTF/System/CIM_AttachedElement.mof")
#pragma include ("DMTF/System/CIM_BatchJobGroup.mof")
@ -100,25 +100,31 @@ diff -up pegasus/Schemas/CIM237/CIM_System.mof.orig pegasus/Schemas/CIM237/CIM_S
#pragma include ("DMTF/System/CIM_BIOSServiceCapabilities.mof")
#pragma include ("DMTF/System/CIM_BootServiceCapabilities.mof")
#pragma include ("DMTF/System/CIM_ComputerSystemNodeCapabilities.mof")
@@ -84,6 +85,7 @@
@@ -86,8 +87,10 @@
#pragma include ("DMTF/System/CIM_FileImportCapabilities.mof")
#pragma include ("DMTF/System/CIM_FileSystemConfigurationCapabilities.mof")
#pragma include ("DMTF/System/CIM_FileSystemSettingData.mof")
+#pragma include ("DMTF/Device/CIM_StatisticsCapabilities.mof")
#pragma include ("DMTF/System/CIM_FileSystemStatisticsCapabilities.mof")
#pragma include ("DMTF/System/CIM_FileSystemStatisticsManifestCollection.mof")
+#pragma include ("DMTF/User/CIM_Privilege.mof")
#pragma include ("DMTF/System/CIM_ImportedFileShareSetting.mof")
#pragma include ("DMTF/System/CIM_ImportedShareRoot.mof")
#pragma include ("DMTF/System/CIM_LogEntry.mof")
@@ -142,6 +144,7 @@
@@ -147,8 +150,10 @@
#pragma include ("DMTF/System/CIM_ExportedFileShareCapabilities.mof")
#pragma include ("DMTF/System/CIM_FCHBADiagnosticTest.mof")
#pragma include ("DMTF/System/CIM_FileSystem.mof")
+#pragma include ("DMTF/Device/CIM_StorageSetting.mof")
#pragma include ("DMTF/System/CIM_FileSystemCapabilities.mof")
#pragma include ("DMTF/System/CIM_FileSystemConfigurationService.mof")
+#pragma include ("DMTF/Device/CIM_StatisticsService.mof")
#pragma include ("DMTF/System/CIM_FileSystemStatisticsService.mof")
#pragma include ("DMTF/System/CIM_HelpService.mof")
diff -up pegasus/Schemas/CIM237/DMTF/qualifiers.mof.orig pegasus/Schemas/CIM237/DMTF/qualifiers.mof
--- pegasus/Schemas/CIM237/DMTF/qualifiers.mof.orig 2013-05-09 16:56:30.000000000 +0200
+++ pegasus/Schemas/CIM237/DMTF/qualifiers.mof 2013-09-02 16:41:54.580820366 +0200
#pragma include ("DMTF/System/CIM_HelpServiceAvailableToFile.mof")
diff -up pegasus/Schemas/CIM238/DMTF/qualifiers.mof.orig pegasus/Schemas/CIM238/DMTF/qualifiers.mof
--- pegasus/Schemas/CIM238/DMTF/qualifiers.mof.orig 2013-08-12 11:34:14.000000000 +0200
+++ pegasus/Schemas/CIM238/DMTF/qualifiers.mof 2013-09-05 15:12:45.751086931 +0200
@@ -152,8 +152,8 @@ Qualifier PUnit : string = null,
Qualifier Read : boolean = true,
Scope(property);

2
sources
View File

@ -1,2 +1,2 @@
b8ece4ab1e2d9223a6f96b6e03aef81b pegasus-2.13.0.tar.gz
e1b630e43d09360064f73c2fc8d4a6eb cim_schema_2.37.0Experimental-MOFs.zip
e5cad2e960f80dda4390bf422dd7f164 cim_schema_2.38.0Experimental-MOFs.zip

9
tog-pegasus.spec
View File

@ -8,7 +8,7 @@
Name: tog-pegasus
Version: %{major_ver}.0
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: 2
Summary: OpenPegasus WBEM Services for Linux
@ -33,7 +33,7 @@ Source7: cimprovagt-wrapper.sh
# 8: Example wrapper confining Operating System Provider from sblim-cmpi-base package
Source8: cmpiOSBase_OperatingSystemProvider-cimprovagt.example
# 9: DMTF CIM schema
Source9: cim_schema_2.37.0Experimental-MOFs.zip
Source9: cim_schema_2.38.0Experimental-MOFs.zip
# 1: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5011
# Removing insecure -rpath
@ -190,7 +190,7 @@ The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
%setup -q -n %{srcname}
# convert DMTF schema for Pegasus
export PEGASUS_ROOT=%PEGASUS_RPM_ROOT
yes | mak/CreateDmtfSchema 237 %{SOURCE9} cim_schema_2.37.0
yes | mak/CreateDmtfSchema 238 %{SOURCE9} cim_schema_2.38.0
%patch1 -p1 -b .no-rpath
%patch2 -p1 -b .PIE
%patch3 -p1 -b .redhat-config
@ -476,6 +476,9 @@ fi
%changelog
* Thu Sep 05 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.13.0-2
- Use Experimental DMTF CIM schema version 2.38.0
* Tue Sep 03 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.13.0-1
- Update to upstream version 2.13.0