[PATCH] Add interop and cimv2 ns registrations to spec
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1232577959 28800 # Node ID 29c0ffe73355b4461eff24a3ba5263bea61e0e7a # Parent 818470c2d36f7f573491be79cb8b414cc638da61 Add interop and cimv2 ns registrations to spec. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 818470c2d36f -r 29c0ffe73355 libvirt-cim.spec.in --- a/libvirt-cim.spec.in Tue Jan 20 08:06:05 2009 -0800 +++ b/libvirt-cim.spec.in Wed Jan 21 14:45:59 2009 -0800 @@ -51,6 +51,12 @@ %define REGISTRATION %{_datadir}/%{name}/*.registration %define SCHEMA %{_datadir}/%{name}/*.mof +%define INTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.registration +%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.mof + +%define CIMV2_REG %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,RegisteredProfile,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.registration +%define CIMV2_MOF %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,RegisteredProfile,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.mof + %{_datadir}/%{name}/provider-register.sh -d -t pegasus \ -n @CIM_VIRT_NS@ \ -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true @@ -65,6 +71,15 @@ %{_datadir}/%{name}/provider-register.sh -t pegasus \ -n @CIM_VIRT_NS@ \ -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true +%{_datadir}/%{name}/provider-register.sh -t pegasus \ + -n @CIM_VIRT_NS@ \ + -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true +%{_datadir}/%{name}/provider-register.sh -t pegasus \ + -n root/interop \ + -r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true +%{_datadir}/%{name}/provider-register.sh -t pegasus \ + -n root/cimv2\ + -r %{CIMV2_REG} -m %{CIMV2_MOF} -v >/dev/null 2>&1 || true %preun %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
INTEROP_MOF variable misses some values when compared to the INTEROP_MOFS variable in Makefile.am. Follows the correct variable assignment: %define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,DiskPool,MemoryPool,NetPool,ProcessorPool,VSMigrationService,ElementConformsToProfile,ReferencedProfile}.mof Variable CIMV2_REG also has different values from the CIMV2_REGS from Makefile.am. This time, the .spec variable includes a value which is not included by the Makefile.am variable .spec {HostedResourcePool,ElementCapabilities,HostedService,HostedDependency, ---->RegisteredProfile<------,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.registration Makefile.am CIMV2_REGS = \ schema/HostedResourcePool.registration \ schema/ElementCapabilities.registration \ schema/HostedService.registration \ schema/HostedDependency.registration \ schema/ElementConformsToProfile.registration \ schema/HostedAccessPoint.registration Since the values of CIMV2_MOFS (Makefile.am) and CIMV2_MOF (.spec) are equal, the RegisteredProfile value should be included in the CIMV2_REGS (Makefile.am) too. Kaitlin Rupert wrote:
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1232577959 28800 # Node ID 29c0ffe73355b4461eff24a3ba5263bea61e0e7a # Parent 818470c2d36f7f573491be79cb8b414cc638da61 Add interop and cimv2 ns registrations to spec.
Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com>
diff -r 818470c2d36f -r 29c0ffe73355 libvirt-cim.spec.in --- a/libvirt-cim.spec.in Tue Jan 20 08:06:05 2009 -0800 +++ b/libvirt-cim.spec.in Wed Jan 21 14:45:59 2009 -0800 @@ -51,6 +51,12 @@ %define REGISTRATION %{_datadir}/%{name}/*.registration %define SCHEMA %{_datadir}/%{name}/*.mof
+%define INTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.registration +%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.mof + +%define CIMV2_REG %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,RegisteredProfile,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.registration +%define CIMV2_MOF %{_datadir}/%{name}/{HostedResourcePool,ElementCapabilities,HostedService,HostedDependency,RegisteredProfile,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.mof + %{_datadir}/%{name}/provider-register.sh -d -t pegasus \ -n @CIM_VIRT_NS@ \ -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true @@ -65,6 +71,15 @@ %{_datadir}/%{name}/provider-register.sh -t pegasus \ -n @CIM_VIRT_NS@ \ -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true +%{_datadir}/%{name}/provider-register.sh -t pegasus \ + -n @CIM_VIRT_NS@ \ + -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true +%{_datadir}/%{name}/provider-register.sh -t pegasus \ + -n root/interop \ + -r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true +%{_datadir}/%{name}/provider-register.sh -t pegasus \ + -n root/cimv2\ + -r %{CIMV2_REG} -m %{CIMV2_MOF} -v >/dev/null 2>&1 || true
%preun %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim
-- Richard Maciel, MSc IBM Linux Technology Center rmaciel@linux.vnet.ibm.com
Richard Maciel wrote:
INTEROP_MOF variable misses some values when compared to the INTEROP_MOFS variable in Makefile.am. Follows the correct variable assignment:
%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,DiskPool,MemoryPool,NetPool,ProcessorPool,VSMigrationService,ElementConformsToProfile,ReferencedProfile}.mof
Variable CIMV2_REG also has different values from the CIMV2_REGS from Makefile.am. This time, the .spec variable includes a value which is not included by the Makefile.am variable
.spec {HostedResourcePool,ElementCapabilities,HostedService,HostedDependency, ---->RegisteredProfile<------,ComputerSystem,ElementConformsToProfile,HostedAccessPoint}.registration
My mistake here - RegisteredProfile and ComputerSystem shouldn't be in the CIMV2_REG list. The list in Makefile.am is correct. -- Kaitlin Rupert IBM Linux Technology Center kaitlin@linux.vnet.ibm.com
participants (2)
-
Kaitlin Rupert -
Richard Maciel