The database directory name matches the object name, except in
the case of the platform object, where the directory is named
"hypevisors". Change the dir name to "platforms" to be consistent.
Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
configure.ac | 2 +-
data/Makefile.am | 2 +-
data/{hypervisors => platforms}/Makefile.am | 0
data/{hypervisors => platforms}/kvm.xml.in | 0
data/{hypervisors => platforms}/qemu.xml.in | 0
data/{hypervisors => platforms}/rhel-xen.xml.in | 0
data/{hypervisors => platforms}/xen.xml.in | 0
libosinfo.spec.in | 2 +-
mingw-libosinfo.spec.in | 4 ++--
po/POTFILES.in | 8 ++++----
test/test-xml-validate | 2 +-
11 files changed, 10 insertions(+), 10 deletions(-)
rename data/{hypervisors => platforms}/Makefile.am (100%)
rename data/{hypervisors => platforms}/kvm.xml.in (100%)
rename data/{hypervisors => platforms}/qemu.xml.in (100%)
rename data/{hypervisors => platforms}/rhel-xen.xml.in (100%)
rename data/{hypervisors => platforms}/xen.xml.in (100%)
diff --git a/configure.ac b/configure.ac
index 7e7e956..e328f3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,7 +169,7 @@ AC_CONFIG_FILES([
data/Makefile
data/datamaps/Makefile
data/devices/Makefile
- data/hypervisors/Makefile
+ data/platforms/Makefile
data/install-scripts/Makefile
data/oses/Makefile
data/schemas/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 407cc28..a29fde1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
INSTALL_DATA_HOOK_DEPS =
-SUBDIRS = datamaps devices oses hypervisors install-scripts schemas
+SUBDIRS = datamaps devices oses platforms install-scripts schemas
EXTRA_DIST = usb.ids pci.ids
CLEANFILES = usb.ids pci.ids
diff --git a/data/hypervisors/Makefile.am b/data/platforms/Makefile.am
similarity index 100%
rename from data/hypervisors/Makefile.am
rename to data/platforms/Makefile.am
diff --git a/data/hypervisors/kvm.xml.in b/data/platforms/kvm.xml.in
similarity index 100%
rename from data/hypervisors/kvm.xml.in
rename to data/platforms/kvm.xml.in
diff --git a/data/hypervisors/qemu.xml.in b/data/platforms/qemu.xml.in
similarity index 100%
rename from data/hypervisors/qemu.xml.in
rename to data/platforms/qemu.xml.in
diff --git a/data/hypervisors/rhel-xen.xml.in b/data/platforms/rhel-xen.xml.in
similarity index 100%
rename from data/hypervisors/rhel-xen.xml.in
rename to data/platforms/rhel-xen.xml.in
diff --git a/data/hypervisors/xen.xml.in b/data/platforms/xen.xml.in
similarity index 100%
rename from data/hypervisors/xen.xml.in
rename to data/platforms/xen.xml.in
diff --git a/libosinfo.spec.in b/libosinfo.spec.in
index 68e1da4..c9f7e2c 100644
--- a/libosinfo.spec.in
+++ b/libosinfo.spec.in
@@ -112,7 +112,7 @@ rm -fr %{buildroot}
%{_datadir}/libosinfo/db/datamaps
%{_datadir}/libosinfo/db/devices
%{_datadir}/libosinfo/db/oses
-%{_datadir}/libosinfo/db/hypervisors
+%{_datadir}/libosinfo/db/platforms
%{_datadir}/libosinfo/db/install-scripts
%{_datadir}/libosinfo/schemas/libosinfo.rng
%{_mandir}/man1/osinfo-db-validate.1*
diff --git a/mingw-libosinfo.spec.in b/mingw-libosinfo.spec.in
index 377d7ba..a678c3f 100644
--- a/mingw-libosinfo.spec.in
+++ b/mingw-libosinfo.spec.in
@@ -108,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
%{mingw32_datadir}/libosinfo/db/datamaps
%{mingw32_datadir}/libosinfo/db/devices
%{mingw32_datadir}/libosinfo/db/oses
-%{mingw32_datadir}/libosinfo/db/hypervisors
+%{mingw32_datadir}/libosinfo/db/platforms
%{mingw32_datadir}/libosinfo/db/install-scripts
%{mingw32_datadir}/libosinfo/schemas/libosinfo.rng
%{mingw32_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
@@ -133,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc
%{mingw64_datadir}/libosinfo/db/datamaps
%{mingw64_datadir}/libosinfo/db/devices
%{mingw64_datadir}/libosinfo/db/oses
-%{mingw64_datadir}/libosinfo/db/hypervisors
+%{mingw64_datadir}/libosinfo/db/platforms
%{mingw64_datadir}/libosinfo/db/install-scripts
%{mingw64_datadir}/libosinfo/schemas/libosinfo.rng
%{mingw64_datadir}/locale/*/LC_MESSAGES/libosinfo.mo
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a1a551f..ed5a7b5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,10 +23,10 @@ data/devices/qemu-ps2.xml.in
data/devices/qemu-pci.xml.in
data/devices/virtio-pci.xml.in
data/devices/qemu-usb.xml.in
-data/hypervisors/kvm.xml.in
-data/hypervisors/qemu.xml.in
-data/hypervisors/rhel-xen.xml.in
-data/hypervisors/xen.xml.in
+data/platforms/kvm.xml.in
+data/platforms/qemu.xml.in
+data/platforms/rhel-xen.xml.in
+data/platforms/xen.xml.in
osinfo/osinfo_avatar_format.c
osinfo/osinfo_deployment.c
osinfo/osinfo_devicelink.c
diff --git a/test/test-xml-validate b/test/test-xml-validate
index a2d20b4..e3cb1a0 100755
--- a/test/test-xml-validate
+++ b/test/test-xml-validate
@@ -42,7 +42,7 @@ exit $ret
: ${srcdir=.}
. $srcdir/test-lib.sh
-DIRS="datamaps oses hypervisors devices install-scripts"
+DIRS="datamaps oses platforms devices install-scripts"
SCHEMA="libosinfo.rng"
check_schema "$DIRS" "$SCHEMA"
--
2.4.3
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
