Hello community, here is the log from the commit of package openlmi-providers for openSUSE:Factory checked in at 2015-03-18 13:05:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openlmi-providers (Old) and /work/SRC/openSUSE:Factory/.openlmi-providers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openlmi-providers" Changes: -------- --- /work/SRC/openSUSE:Factory/openlmi-providers/openlmi-providers.changes 2014-05-21 16:20:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openlmi-providers.new/openlmi-providers.changes 2015-03-18 13:05:41.000000000 +0100 @@ -1,0 +2,89 @@ +Mon Mar 16 13:13:10 UTC 2015 - [email protected] + +- disable realmd (bsc#916766, bsc#916767) + +------------------------------------------------------------------- +Tue Mar 3 13:25:27 UTC 2015 - [email protected] + +- require openlmi-pegasus-compat on SUSE. + +------------------------------------------------------------------- +Mon Mar 2 14:05:05 UTC 2015 - [email protected] + +- prefer sblim-sfcb as cim-server on SUSE. + +------------------------------------------------------------------- +Mon Feb 23 10:23:31 UTC 2015 - [email protected] + +- disable openlmi-devassistant on SUSE. + +------------------------------------------------------------------- +Sat Feb 21 13:42:43 UTC 2015 - [email protected] + +- don't require openlmi-storage or -networking on SUSE. + +------------------------------------------------------------------- +Fri Feb 13 08:43:15 UTC 2015 - [email protected] + +- fix tog-pegasus dependency for openlmi and scripts + +------------------------------------------------------------------- +Wed Jan 21 16:11:31 UTC 2015 - [email protected] + +- Dropped openlmi-providers-rpmlintrc builds fine without it + And its presence was blocking acceptance to openSUSE:Factory + +------------------------------------------------------------------- +Wed Dec 10 10:23:01 UTC 2014 - [email protected] + +- Update to 0.6.0 + * New provider: SELinux. + * Software provider rewritten in C using PackageKit. + * Documentation reworked to have same look&feel for all OpenLMI + providers. + * Instantiable services support in Service provider. + * Hardware provider capabilities extended (battery and bios + information). + * timedated support in Locale provider. + * Bugfixes and minor improvements. + +- Renamed patches + 0001-No-libexec-in-SUSE.patch renamed to + 0001-cimprovagt-is-under-usr-sbin-on-SUSE.patch + 0003-Run-dmidecode-with-full-path.patch to + 0002-Run-dmidecode-with-full-path.patch + 0006-Default-SystemCreationClassName-to-Linux_ComputerSys.patch to + 0005-Default-SystemCreationClassName-to-Linux_ComputerSys.patch + +- Upstreamed patches, dropped + 0001-jobmgr-added-explicit-casts.patch + +------------------------------------------------------------------- +Tue Oct 28 08:23:48 UTC 2014 - [email protected] + +- Fix 32bit build, add 0001-jobmgr-added-explicit-casts.patch + +------------------------------------------------------------------- +Tue Oct 7 11:32:37 UTC 2014 - [email protected] + +- Update to 0.5.0 + * SSSD provider + * Locale provider + * developer assistant support + * indsender - library simplifying indication creation and sending + * jobmanager - library for easy job management + * support for python 2.6 + * various bugfixes and enhancements + +- New patches + 0003-Install-cimprovagt-scripts-into-usr-share-Pegasus-sc.patch + 0004-Install-service-scripts-to-usr-share-openlmi-provide.patch + +- 0004-journald-no-libexec-in-SUSE.patch merged into 0001-No-libexec-in-SUSE.patch + +- Upstreamed patches, dropped + 0002-udev_device_new_from_device_id-is-unsupported-in-SLE.patch + 0005-Catch-exception-if-socket.gethostbyaddr-fails.patch + 0007-fstack-protector-strong-unknown-to-SUSE-gcc.patch + +------------------------------------------------------------------- Old: ---- 0001-No-libexec-in-SUSE.patch 0002-udev_device_new_from_device_id-is-unsupported-in-SLE.patch 0003-Run-dmidecode-with-full-path.patch 0004-journald-no-libexec-in-SUSE.patch 0005-Catch-exception-if-socket.gethostbyaddr-fails.patch 0006-Default-SystemCreationClassName-to-Linux_ComputerSys.patch 0007-fstack-protector-strong-unknown-to-SUSE-gcc.patch openlmi-providers-0.4.2.tar.gz openlmi-providers.rpmlintrc New: ---- 0001-cimprovagt-is-under-usr-sbin-on-SUSE.patch 0002-Run-dmidecode-with-full-path.patch 0003-Install-cimprovagt-scripts-into-usr-share-Pegasus-sc.patch 0004-Install-service-scripts-to-usr-share-openlmi-provide.patch 0005-Default-SystemCreationClassName-to-Linux_ComputerSys.patch objects.inv openlmi-providers-0.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openlmi-providers.spec ++++++ ++++ 1736 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/openlmi-providers/openlmi-providers.spec ++++ and /work/SRC/openSUSE:Factory/.openlmi-providers.new/openlmi-providers.spec ++++++ 0001-cimprovagt-is-under-usr-sbin-on-SUSE.patch ++++++ >From 1b7f5dba73b2746d86d53b280cd1de6fd71958b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 7 Oct 2014 14:13:40 +0200 Subject: [PATCH 01/11] cimprovagt is under /usr/sbin on SUSE /usr/libexec/pegasus/cimprovagt -> /usr/sbin/cimprovagt --- src/account/cmpiLMI_Account-cimprovagt | 2 +- src/fan/cmpiLMI_Fan-cimprovagt | 2 +- src/hardware/cmpiLMI_Hardware-cimprovagt | 2 +- src/journald/cmpiLMI_Journald-cimprovagt | 2 +- src/locale/cmpiLMI_Locale-cimprovagt | 2 +- src/logicalfile/cmpiLMI_LogicalFile-cimprovagt | 2 +- src/power/cmpiLMI_PowerManagement-cimprovagt | 2 +- src/realmd/cmpiLMI_Realmd-cimprovagt | 2 +- src/selinux/cmpiLMI_SELinux-cimprovagt | 2 +- src/service-dbus/cmpiLMI_Service-cimprovagt | 2 +- src/service/cmpiLMI_Service-cimprovagt | 2 +- src/software-dbus/cmpiLMI_Software-cimprovagt | 2 +- src/software/pycmpiLMI_Software-cimprovagt | 2 +- src/sssd/cmpiLMI_SSSD-cimprovagt | 2 +- .../files/crt/c/openlmi/src/cmpiLMI_{{PROJECT_NAME}}-cimprovagt | 2 +- .../files/crt/python/openlmi/pycmpi{{PROJECT_NAME}}-cimprovagt | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/account/cmpiLMI_Account-cimprovagt b/src/account/cmpiLMI_Account-cimprovagt index 3f9c577c60a2..262f796523b9 100644 --- a/src/account/cmpiLMI_Account-cimprovagt +++ b/src/account/cmpiLMI_Account-cimprovagt @@ -20,4 +20,4 @@ # -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" diff --git a/src/fan/cmpiLMI_Fan-cimprovagt b/src/fan/cmpiLMI_Fan-cimprovagt index 3f9c577c60a2..262f796523b9 100644 --- a/src/fan/cmpiLMI_Fan-cimprovagt +++ b/src/fan/cmpiLMI_Fan-cimprovagt @@ -20,4 +20,4 @@ # -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" diff --git a/src/hardware/cmpiLMI_Hardware-cimprovagt b/src/hardware/cmpiLMI_Hardware-cimprovagt index 51d0c99bf688..3c5c9b221cde 100755 --- a/src/hardware/cmpiLMI_Hardware-cimprovagt +++ b/src/hardware/cmpiLMI_Hardware-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Peter Schiffer <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" diff --git a/src/journald/cmpiLMI_Journald-cimprovagt b/src/journald/cmpiLMI_Journald-cimprovagt index 0e8e0f0390d1..c2f5d1ff76c1 100755 --- a/src/journald/cmpiLMI_Journald-cimprovagt +++ b/src/journald/cmpiLMI_Journald-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Tomas Bzatek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" diff --git a/src/locale/cmpiLMI_Locale-cimprovagt b/src/locale/cmpiLMI_Locale-cimprovagt index 1f1de47d276a..5522fc2d9e59 100755 --- a/src/locale/cmpiLMI_Locale-cimprovagt +++ b/src/locale/cmpiLMI_Locale-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Jan Synacek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" diff --git a/src/logicalfile/cmpiLMI_LogicalFile-cimprovagt b/src/logicalfile/cmpiLMI_LogicalFile-cimprovagt index 1f1de47d276a..5522fc2d9e59 100755 --- a/src/logicalfile/cmpiLMI_LogicalFile-cimprovagt +++ b/src/logicalfile/cmpiLMI_LogicalFile-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Jan Synacek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" diff --git a/src/power/cmpiLMI_PowerManagement-cimprovagt b/src/power/cmpiLMI_PowerManagement-cimprovagt index 3f9c577c60a2..262f796523b9 100644 --- a/src/power/cmpiLMI_PowerManagement-cimprovagt +++ b/src/power/cmpiLMI_PowerManagement-cimprovagt @@ -20,4 +20,4 @@ # -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" diff --git a/src/realmd/cmpiLMI_Realmd-cimprovagt b/src/realmd/cmpiLMI_Realmd-cimprovagt index 1f1de47d276a..5522fc2d9e59 100755 --- a/src/realmd/cmpiLMI_Realmd-cimprovagt +++ b/src/realmd/cmpiLMI_Realmd-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Jan Synacek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" diff --git a/src/selinux/cmpiLMI_SELinux-cimprovagt b/src/selinux/cmpiLMI_SELinux-cimprovagt index d8056ef00349..f7f5b0be7479 100755 --- a/src/selinux/cmpiLMI_SELinux-cimprovagt +++ b/src/selinux/cmpiLMI_SELinux-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Jan Synacek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" diff --git a/src/service-dbus/cmpiLMI_Service-cimprovagt b/src/service-dbus/cmpiLMI_Service-cimprovagt index 1f1de47d276a..5522fc2d9e59 100755 --- a/src/service-dbus/cmpiLMI_Service-cimprovagt +++ b/src/service-dbus/cmpiLMI_Service-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Jan Synacek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" diff --git a/src/service/cmpiLMI_Service-cimprovagt b/src/service/cmpiLMI_Service-cimprovagt index f6c88424e34b..7c018f16793a 100644 --- a/src/service/cmpiLMI_Service-cimprovagt +++ b/src/service/cmpiLMI_Service-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Jan Synacek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" diff --git a/src/software-dbus/cmpiLMI_Software-cimprovagt b/src/software-dbus/cmpiLMI_Software-cimprovagt index 51d0c99bf688..3c5c9b221cde 100755 --- a/src/software-dbus/cmpiLMI_Software-cimprovagt +++ b/src/software-dbus/cmpiLMI_Software-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Peter Schiffer <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" diff --git a/src/software/pycmpiLMI_Software-cimprovagt b/src/software/pycmpiLMI_Software-cimprovagt index a635067e4857..6a5460b7d58c 100755 --- a/src/software/pycmpiLMI_Software-cimprovagt +++ b/src/software/pycmpiLMI_Software-cimprovagt @@ -21,4 +21,4 @@ # provider in Fedora linux. See README.RedHat.Security in tog-pegasus package # for details how it's supposed to work. -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" diff --git a/src/sssd/cmpiLMI_SSSD-cimprovagt b/src/sssd/cmpiLMI_SSSD-cimprovagt index 1f1de47d276a..5522fc2d9e59 100755 --- a/src/sssd/cmpiLMI_SSSD-cimprovagt +++ b/src/sssd/cmpiLMI_SSSD-cimprovagt @@ -18,4 +18,4 @@ # # Authors: Jan Synacek <[email protected]> -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" diff --git a/tools/devassistant/files/crt/c/openlmi/src/cmpiLMI_{{PROJECT_NAME}}-cimprovagt b/tools/devassistant/files/crt/c/openlmi/src/cmpiLMI_{{PROJECT_NAME}}-cimprovagt index 0098f3bcbb89..387d77b2b936 100755 --- a/tools/devassistant/files/crt/c/openlmi/src/cmpiLMI_{{PROJECT_NAME}}-cimprovagt +++ b/tools/devassistant/files/crt/c/openlmi/src/cmpiLMI_{{PROJECT_NAME}}-cimprovagt @@ -20,4 +20,4 @@ # -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" diff --git a/tools/devassistant/files/crt/python/openlmi/pycmpi{{PROJECT_NAME}}-cimprovagt b/tools/devassistant/files/crt/python/openlmi/pycmpi{{PROJECT_NAME}}-cimprovagt index 267447e284c7..4edb10ebc616 100755 --- a/tools/devassistant/files/crt/python/openlmi/pycmpi{{PROJECT_NAME}}-cimprovagt +++ b/tools/devassistant/files/crt/python/openlmi/pycmpi{{PROJECT_NAME}}-cimprovagt @@ -22,4 +22,4 @@ # provider in Fedora linux. See README.RedHat.Security in tog-pegasus package # for details how it's supposed to work. -/usr/libexec/pegasus/cimprovagt "$@" +/usr/sbin/cimprovagt "$@" -- 2.1.2 ++++++ 0003-Run-dmidecode-with-full-path.patch -> 0002-Run-dmidecode-with-full-path.patch ++++++ --- /work/SRC/openSUSE:Factory/openlmi-providers/0003-Run-dmidecode-with-full-path.patch 2014-05-17 21:46:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openlmi-providers.new/0002-Run-dmidecode-with-full-path.patch 2015-03-18 13:05:40.000000000 +0100 @@ -1,18 +1,18 @@ -From 496f46fd37e189e08721b2b7297510d9e071dc11 Mon Sep 17 00:00:00 2001 +From 2c3f4189ffe69fd29b47d160a441732de9f585c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> -Date: Thu, 17 Oct 2013 14:55:40 +0200 -Subject: [PATCH 3/7] Run dmidecode with full path +Date: Tue, 7 Oct 2014 14:18:16 +0200 +Subject: [PATCH 02/11] Run dmidecode with full path --- src/hardware/dmidecode.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/hardware/dmidecode.c b/src/hardware/dmidecode.c -index c241ceaef91d..1e262adaf82e 100644 +index a80391a0eae0..1b5b2db5281d 100644 --- a/src/hardware/dmidecode.c +++ b/src/hardware/dmidecode.c -@@ -149,7 +149,7 @@ short dmi_get_processors(DmiProcessor **cpus, unsigned *cpus_nb) - dmi_free_processors(cpus, cpus_nb); +@@ -156,7 +156,7 @@ short dmi_get_processors(DmiProcessor **cpus, unsigned *cpus_nb) + } /* get dmidecode output */ - if (run_command("dmidecode -t 4", &buffer, &buffer_size) != 0) { @@ -20,7 +20,7 @@ goto done; } -@@ -521,7 +521,7 @@ short dmi_get_cpu_caches(DmiCpuCache **caches, unsigned *caches_nb) +@@ -531,7 +531,7 @@ short dmi_get_cpu_caches(DmiCpuCache **caches, unsigned *caches_nb) dmi_free_cpu_caches(caches, caches_nb); /* get dmidecode output */ @@ -29,8 +29,8 @@ goto done; } -@@ -812,7 +812,7 @@ short dmi_get_memory(DmiMemory *memory) - init_dmi_memory_struct(memory); +@@ -830,7 +830,7 @@ short dmi_get_memory(DmiMemory *memory) + } /* get dmidecode output for memory modules */ - if (run_command("dmidecode -t 17", &buffer, &buffer_size) != 0) { @@ -38,16 +38,16 @@ goto done; } -@@ -979,7 +979,7 @@ short dmi_get_memory(DmiMemory *memory) - free_2d_buffer(&buffer, &buffer_size); +@@ -996,7 +996,7 @@ short dmi_get_memory(DmiMemory *memory) /* get additional dmidecode output for memory modules */ -- if (run_command("dmidecode -t 6", &buffer, &buffer_size) != 0) { -+ if (run_command("/usr/sbin/dmidecode -t 6", &buffer, &buffer_size) != 0) { - goto done; + if (!skip_slots) { +- if (run_command("dmidecode -t 6", &buffer, &buffer_size) != 0) { ++ if (run_command("/usr/sbin/dmidecode -t 6", &buffer, &buffer_size) != 0) { + goto done; + } } - -@@ -1036,7 +1036,7 @@ short dmi_get_memory(DmiMemory *memory) +@@ -1057,7 +1057,7 @@ short dmi_get_memory(DmiMemory *memory) free_2d_buffer(&buffer, &buffer_size); /* get dmidecode output for memory array */ @@ -56,7 +56,7 @@ goto done; } -@@ -1225,7 +1225,7 @@ short dmi_get_chassis(DmiChassis *chassis) +@@ -1245,7 +1245,7 @@ short dmi_get_chassis(DmiChassis *chassis) init_dmi_chassis_struct(chassis); /* get dmidecode output for chassis */ @@ -65,7 +65,7 @@ goto done; } -@@ -1304,7 +1304,7 @@ short dmi_get_chassis(DmiChassis *chassis) +@@ -1324,7 +1324,7 @@ short dmi_get_chassis(DmiChassis *chassis) free_2d_buffer(&buffer, &buffer_size); /* get additional dmidecode output for chassis */ @@ -74,7 +74,7 @@ && buffer_size > 4) { for (i = 0; i < buffer_size; i++) { /* Model */ -@@ -1457,7 +1457,7 @@ short dmi_get_baseboard(DmiBaseboard *baseboard) +@@ -1477,7 +1477,7 @@ short dmi_get_baseboard(DmiBaseboard *baseboard) init_dmi_baseboard_struct(baseboard); /* get dmidecode output for baseboard */ @@ -83,7 +83,7 @@ goto done; } -@@ -1593,7 +1593,7 @@ short dmi_get_ports(DmiPort **ports, unsigned *ports_nb) +@@ -1613,7 +1613,7 @@ short dmi_get_ports(DmiPort **ports, unsigned *ports_nb) dmi_free_ports(ports, ports_nb); /* get dmidecode output */ @@ -92,7 +92,7 @@ goto done; } -@@ -1755,7 +1755,7 @@ short dmi_get_system_slots(DmiSystemSlot **slots, unsigned *slots_nb) +@@ -1775,7 +1775,7 @@ short dmi_get_system_slots(DmiSystemSlot **slots, unsigned *slots_nb) dmi_free_system_slots(slots, slots_nb); /* get dmidecode output */ @@ -101,7 +101,7 @@ goto done; } -@@ -1943,7 +1943,7 @@ short dmi_get_pointing_devices(DmiPointingDevice **devices, unsigned *devices_nb +@@ -1963,7 +1963,7 @@ short dmi_get_pointing_devices(DmiPointingDevice **devices, unsigned *devices_nb dmi_free_pointing_devices(devices, devices_nb); /* get dmidecode output */ @@ -110,7 +110,7 @@ goto done; } -@@ -2118,7 +2118,7 @@ short dmi_get_batteries(DmiBattery **batteries, unsigned *batteries_nb) +@@ -2138,7 +2138,7 @@ short dmi_get_batteries(DmiBattery **batteries, unsigned *batteries_nb) dmi_free_batteries(batteries, batteries_nb); /* get dmidecode output */ @@ -120,5 +120,5 @@ } -- -1.8.4 +2.1.2 ++++++ 0003-Install-cimprovagt-scripts-into-usr-share-Pegasus-sc.patch ++++++ >From c01bc9efc86e140f2ca81a5873a0bf010bb84a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 7 Oct 2014 14:24:43 +0200 Subject: [PATCH 03/11] Install cimprovagt scripts into /usr/share/Pegasus/scripts --- src/account/CMakeLists.txt | 2 +- src/fan/CMakeLists.txt | 2 +- src/hardware/CMakeLists.txt | 2 +- src/journald/CMakeLists.txt | 2 +- src/locale/CMakeLists.txt | 2 +- src/logicalfile/CMakeLists.txt | 2 +- src/power/CMakeLists.txt | 2 +- src/realmd/CMakeLists.txt | 2 +- src/selinux/CMakeLists.txt | 2 +- src/service-dbus/CMakeLists.txt | 2 +- src/service/CMakeLists.txt | 2 +- src/software-dbus/CMakeLists.txt | 2 +- src/sssd/CMakeLists.txt | 2 +- tools/devassistant/files/crt/c/openlmi/src/CMakeLists.txt.tpl | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/account/CMakeLists.txt b/src/account/CMakeLists.txt index 9d416c9a28b6..fdf4cbca5e7b 100644 --- a/src/account/CMakeLists.txt +++ b/src/account/CMakeLists.txt @@ -52,5 +52,5 @@ target_link_libraries(${LIBRARY_NAME} openlmicommon ${KONKRETCMPI_LIBRARIES} ${G cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers "${TARGET_MOF}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/) -install(PROGRAMS ${ACCOUNT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${ACCOUNT_SCRIPT} DESTINATION share/Pegasus/scripts) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/fan/CMakeLists.txt b/src/fan/CMakeLists.txt index f2464ef7904a..9777c377132a 100644 --- a/src/fan/CMakeLists.txt +++ b/src/fan/CMakeLists.txt @@ -35,4 +35,4 @@ cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) -install(PROGRAMS ${FAN_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${FAN_SCRIPT} DESTINATION share/Pegasus/scripts) diff --git a/src/hardware/CMakeLists.txt b/src/hardware/CMakeLists.txt index 92a9ea6fc1a1..6e6699a5a255 100644 --- a/src/hardware/CMakeLists.txt +++ b/src/hardware/CMakeLists.txt @@ -43,6 +43,6 @@ set(TARGET_MOFS "${TARGET_MOF}" "${TARGET_MOF_DMTF}") cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers "${TARGET_MOFS}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/Pegasus/scripts) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) install(FILES ${TARGET_MOF_DMTF} DESTINATION share/openlmi-providers/) diff --git a/src/journald/CMakeLists.txt b/src/journald/CMakeLists.txt index 63a52462b999..ceb491b59ae1 100644 --- a/src/journald/CMakeLists.txt +++ b/src/journald/CMakeLists.txt @@ -55,5 +55,5 @@ profile_mof_generate("90_LMI_Journald_Profile.mof.skel" "${TARGET_MOF}" "${CIM_P cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers "${TARGET_MOF}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/Pegasus/scripts) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/locale/CMakeLists.txt b/src/locale/CMakeLists.txt index c32d8c9286cc..fb3499339205 100644 --- a/src/locale/CMakeLists.txt +++ b/src/locale/CMakeLists.txt @@ -38,5 +38,5 @@ profile_mof_generate("90_LMI_Locale_Profile.mof.skel" "${TARGET_MOF}" "LMI_Local cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers "${TARGET_MOF}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/Pegasus/scripts) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/logicalfile/CMakeLists.txt b/src/logicalfile/CMakeLists.txt index 755fe596f0b6..870bfa036289 100644 --- a/src/logicalfile/CMakeLists.txt +++ b/src/logicalfile/CMakeLists.txt @@ -37,6 +37,6 @@ profile_mof_generate("90_LMI_LogicalFile_Profile.mof.skel" "${TARGET_MOF}" "${CI cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers "${TARGET_MOF}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/Pegasus/scripts) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) install(FILES ${CONFIG} DESTINATION ${SYSCONF_INSTALL_DIR}/openlmi/logicalfile/) diff --git a/src/power/CMakeLists.txt b/src/power/CMakeLists.txt index 05d5bbfd71ac..118faa707a3a 100644 --- a/src/power/CMakeLists.txt +++ b/src/power/CMakeLists.txt @@ -49,5 +49,5 @@ target_link_libraries(${LIBRARY_NAME} openlmicommon ${KONKRETCMPI_LIBRARIES} ${G cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers "${TARGET_MOF}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/) -install(PROGRAMS ${POWERMANAGEMENT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${POWERMANAGEMENT_SCRIPT} DESTINATION share/Pegasus/scripts) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/realmd/CMakeLists.txt b/src/realmd/CMakeLists.txt index 961c7b1111ac..c8101ae79cb3 100644 --- a/src/realmd/CMakeLists.txt +++ b/src/realmd/CMakeLists.txt @@ -50,5 +50,5 @@ cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/Pegasus/scripts) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/selinux/CMakeLists.txt b/src/selinux/CMakeLists.txt index 5885af56ceed..67b74661bccb 100644 --- a/src/selinux/CMakeLists.txt +++ b/src/selinux/CMakeLists.txt @@ -52,7 +52,7 @@ profile_mof_generate("90_LMI_SELinux_Profile.mof.skel" "${TARGET_MOF}" "${CIM_CL cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers "${TARGET_MOF}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/Pegasus/scripts) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) # install(FILES ${CONFIG} DESTINATION ${SYSCONF_INSTALL_DIR}/openlmi/selinux/) install(FILES DESTINATION ${SYSCONF_INSTALL_DIR}/openlmi/selinux/) diff --git a/src/service-dbus/CMakeLists.txt b/src/service-dbus/CMakeLists.txt index 02500f9ac361..b48cf5d6ae62 100644 --- a/src/service-dbus/CMakeLists.txt +++ b/src/service-dbus/CMakeLists.txt @@ -41,5 +41,5 @@ cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/Pegasus/scripts) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt index 99f2cac5d2bd..a8e0f12e88c8 100644 --- a/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt @@ -31,6 +31,6 @@ cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} "60_LMI_Service.mof" share/ope install(PROGRAMS util/servicedisc.sh util/serviceutil.sh DESTINATION libexec) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/Pegasus/scripts) install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/software-dbus/CMakeLists.txt b/src/software-dbus/CMakeLists.txt index f8768605cf50..d14a13e87771 100644 --- a/src/software-dbus/CMakeLists.txt +++ b/src/software-dbus/CMakeLists.txt @@ -50,5 +50,5 @@ cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/Pegasus/scripts) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/sssd/CMakeLists.txt b/src/sssd/CMakeLists.txt index 5a884e8ffc7f..bf58cf141bef 100644 --- a/src/sssd/CMakeLists.txt +++ b/src/sssd/CMakeLists.txt @@ -38,6 +38,6 @@ cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers set(TARGET_MOF "${CMAKE_BINARY_DIR}/mof/90_LMI_SSSD_Profile.mof") profile_mof_generate("90_LMI_SSSD_Profile.mof.skel" "${TARGET_MOF}" "LMI_SSSD") -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/Pegasus/scripts) install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/tools/devassistant/files/crt/c/openlmi/src/CMakeLists.txt.tpl b/tools/devassistant/files/crt/c/openlmi/src/CMakeLists.txt.tpl index 37aac2f00093..30541106f9ee 100644 --- a/tools/devassistant/files/crt/c/openlmi/src/CMakeLists.txt.tpl +++ b/tools/devassistant/files/crt/c/openlmi/src/CMakeLists.txt.tpl @@ -44,5 +44,5 @@ profile_mof_generate("90_LMI_{{ PROJECT_NAME }}_Profile.mof.skel" "${TARGET_MOF} cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers "${TARGET_MOF}") install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/) -install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/Pegasus/scripts) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) -- 2.1.2 ++++++ 0004-Install-service-scripts-to-usr-share-openlmi-provide.patch ++++++ >From b6e0adc07e94d35aa5d80092fed71a37c2dc9b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 7 Oct 2014 14:33:33 +0200 Subject: [PATCH 04/11] Install service scripts to /usr/share/openlmi-providers --- src/service/CMakeLists.txt | 2 +- src/service/util/serviceutil.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt index a8e0f12e88c8..9180b66a03ff 100644 --- a/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt @@ -30,7 +30,7 @@ profile_mof_generate("90_LMI_Service_Profile.mof.skel" "${TARGET_MOF}" "LMI_Serv cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} "60_LMI_Service.mof" share/openlmi-providers "${TARGET_MOF}") -install(PROGRAMS util/servicedisc.sh util/serviceutil.sh DESTINATION libexec) +install(PROGRAMS util/servicedisc.sh util/serviceutil.sh DESTINATION share/openlmi-providers) install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION share/Pegasus/scripts) install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) install(FILES ${TARGET_MOF} DESTINATION share/openlmi-providers/) diff --git a/src/service/util/serviceutil.c b/src/service/util/serviceutil.c index 522c78e16079..80a743830a01 100644 --- a/src/service/util/serviceutil.c +++ b/src/service/util/serviceutil.c @@ -31,8 +31,8 @@ #define MAX_SLIST_CNT 1000 -char *suscript = "/usr/libexec/serviceutil.sh"; -char *sdscript = "/usr/libexec/servicedisc.sh"; +char *suscript = "/usr/share/openlmi-providers/serviceutil.sh"; +char *sdscript = "/usr/share/openlmi-providers/servicedisc.sh"; const char *provider_name = "service"; const ConfigEntry *provider_config_defaults = NULL; -- 2.1.2 ++++++ 0006-Default-SystemCreationClassName-to-Linux_ComputerSys.patch -> 0005-Default-SystemCreationClassName-to-Linux_ComputerSys.patch ++++++ --- /work/SRC/openSUSE:Factory/openlmi-providers/0006-Default-SystemCreationClassName-to-Linux_ComputerSys.patch 2014-05-17 21:46:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openlmi-providers.new/0005-Default-SystemCreationClassName-to-Linux_ComputerSys.patch 2015-03-18 13:05:40.000000000 +0100 @@ -1,16 +1,16 @@ -From 1d033ed19449958e13db3d07c1e31a3092602f08 Mon Sep 17 00:00:00 2001 +From 9bc55aca4913343ff2a02a61e7f4331f1c34fc9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> -Date: Thu, 28 Nov 2013 10:16:30 +0100 -Subject: [PATCH 6/7] Default SystemCreationClassName to Linux_ComputerSystem +Date: Tue, 7 Oct 2014 14:37:12 +0200 +Subject: [PATCH 05/11] Default SystemCreationClassName to Linux_ComputerSystem --- - src/openlmi.conf | 2 +- + src/libs/libopenlmi/openlmi.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/openlmi.conf b/src/openlmi.conf -index 64684a86ef05..8cef27b3af2f 100644 ---- a/src/openlmi.conf -+++ b/src/openlmi.conf +diff --git a/src/libs/libopenlmi/openlmi.conf b/src/libs/libopenlmi/openlmi.conf +index 43fc336e49f2..b8d161f8bbcd 100644 +--- a/src/libs/libopenlmi/openlmi.conf ++++ b/src/libs/libopenlmi/openlmi.conf @@ -6,7 +6,7 @@ # To change the CIM class of ComputerSystem, which is associated to many @@ -21,5 +21,5 @@ [Log] # These options modify logging configuration of the main process spawned -- -1.8.4 +2.1.2 ++++++ openlmi-providers-0.4.2.tar.gz -> openlmi-providers-0.6.0.tar.gz ++++++ ++++ 103743 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
