Dima Kuznetsov has uploaded a new change for review. Change subject: ppc64HardwareInfo: move into lib ......................................................................
ppc64HardwareInfo: move into lib Change-Id: I4bee7f8ea4262d162bec8887ed8c98a0759a5f8c Signed-off-by: Dima Kuznetsov <dkuzn...@redhat.com> --- M debian/vdsm-python.install M debian/vdsm.install M lib/vdsm/Makefile.am R lib/vdsm/ppc64HardwareInfo.py M vdsm.spec.in M vdsm/Makefile.am M vdsm/supervdsmServer 7 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/44737/1 diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install index cb39299..0cec230 100644 --- a/debian/vdsm-python.install +++ b/debian/vdsm-python.install @@ -21,6 +21,7 @@ ./usr/lib/python2.7/dist-packages/vdsm/netlink/monitor.py ./usr/lib/python2.7/dist-packages/vdsm/netlink/route.py ./usr/lib/python2.7/dist-packages/vdsm/password.py +./usr/lib/python2.7/dist-packages/vdsm/ppc64HardwareInfo.py ./usr/lib/python2.7/dist-packages/vdsm/profiling/__init__.py ./usr/lib/python2.7/dist-packages/vdsm/profiling/cpu.py ./usr/lib/python2.7/dist-packages/vdsm/profiling/errors.py diff --git a/debian/vdsm.install b/debian/vdsm.install index 0bfbcc3..24fb1aa 100644 --- a/debian/vdsm.install +++ b/debian/vdsm.install @@ -74,7 +74,6 @@ ./usr/share/vdsm/network/utils.py ./usr/share/vdsm/numaUtils.py ./usr/share/vdsm/parted_utils.py -./usr/share/vdsm/ppc64HardwareInfo.py ./usr/share/vdsm/protocoldetector.py ./usr/share/vdsm/rpc/__init__.py ./usr/share/vdsm/rpc/bindingjsonrpc.py diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index f23076c..bed64a9 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -36,6 +36,7 @@ netconfpersistence.py \ netinfo.py \ password.py \ + ppc64HardwareInfo.py \ pthread.py \ qemuimg.py \ response.py \ diff --git a/vdsm/ppc64HardwareInfo.py b/lib/vdsm/ppc64HardwareInfo.py similarity index 100% rename from vdsm/ppc64HardwareInfo.py rename to lib/vdsm/ppc64HardwareInfo.py diff --git a/vdsm.spec.in b/vdsm.spec.in index 6d7c026..20a74b7 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -802,7 +802,6 @@ %{_datadir}/%{vdsm_name}/parted_utils.py* %{_datadir}/%{vdsm_name}/mkimage.py* %{_datadir}/%{vdsm_name}/numaUtils.py* -%{_datadir}/%{vdsm_name}/ppc64HardwareInfo.py* %{_datadir}/%{vdsm_name}/protocoldetector.py* %{_datadir}/%{vdsm_name}/supervdsmServer %{_datadir}/%{vdsm_name}/v2v.py* @@ -1055,6 +1054,7 @@ %{python_sitelib}/%{vdsm_name}/netlink/monitor.py* %{python_sitelib}/%{vdsm_name}/netlink/route.py* %{python_sitelib}/%{vdsm_name}/password.py* +%{python_sitelib}/%{vdsm_name}/ppc64HardwareInfo.py* %{python_sitelib}/%{vdsm_name}/profiling/__init__.py* %{python_sitelib}/%{vdsm_name}/profiling/cpu.py* %{python_sitelib}/%{vdsm_name}/profiling/errors.py* diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index f6ca3ac..8a61635 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -38,7 +38,6 @@ momIF.py \ numaUtils.py \ parted_utils.py \ - ppc64HardwareInfo.py \ protocoldetector.py \ v2v.py \ vdsmDebugPlugin.py \ diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer index d5cfd58..97dc0b8 100755 --- a/vdsm/supervdsmServer +++ b/vdsm/supervdsmServer @@ -136,7 +136,7 @@ from vdsm.dmidecodeUtil import getHardwareInfoStructure return getHardwareInfoStructure() elif platform.machine() in Architecture.POWER: - from ppc64HardwareInfo import getHardwareInfoStructure + from vdsm.ppc64HardwareInfo import getHardwareInfoStructure return getHardwareInfoStructure() else: # not implemented over other architecture -- To view, visit https://gerrit.ovirt.org/44737 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4bee7f8ea4262d162bec8887ed8c98a0759a5f8c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov <dkuzn...@redhat.com> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches