1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
|
diff --git a/Makefile.am b/Makefile.am
index 240485e..a0aa67c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = osinfo test tools docs po examples
+SUBDIRS = osinfo test tools po examples
INTLTOOL_FILES = \
intltool-extract.in \
diff --git a/Makefile.in b/Makefile.in
index 915463a..2af13d1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -428,7 +428,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = osinfo test tools docs po examples
+SUBDIRS = osinfo test tools po examples
INTLTOOL_FILES = \
intltool-extract.in \
intltool-merge.in \
diff --git a/configure b/configure
index b17c129..d1916af 100755
--- a/configure
+++ b/configure
@@ -15549,7 +15549,7 @@ fi
GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h tools/Makefile test/Makefile docs/Makefile docs/reference/Makefile examples/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h tools/Makefile test/Makefile examples/Makefile po/Makefile.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -16638,8 +16638,6 @@ do
"osinfo/osinfo_version.h") CONFIG_FILES="$CONFIG_FILES osinfo/osinfo_version.h" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
- "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
- "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;;
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
diff --git a/configure.ac b/configure.ac
index f002cab..fab8d04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,8 +285,6 @@ AC_CONFIG_FILES([
osinfo/osinfo_version.h
tools/Makefile
test/Makefile
- docs/Makefile
- docs/reference/Makefile
examples/Makefile
po/Makefile.in
])
diff --git a/examples/demo.js b/examples/demo.js
index 28cf805..0f668bc 100755
--- a/examples/demo.js
+++ b/examples/demo.js
@@ -32,7 +32,7 @@ for (idx in osnames) {
print (" OS short id " + name)
}
-var osid = "http://fedoraproject.org/fedora-11"
+var osid = "https://wiki.parabola.nu/Get_Parabola"
var hvid = "http://qemu.org/qemu-kvm-0.11.0"
var drvclass = "net"
//var drvclass = "audio"
diff --git a/examples/libosinfo-dummy-data.xml b/examples/libosinfo-dummy-data.xml
index 65d23b7..8df9f37 100644
--- a/examples/libosinfo-dummy-data.xml
+++ b/examples/libosinfo-dummy-data.xml
@@ -64,87 +64,11 @@
</devices>
</platform>
-<os id="http://fedoraproject.org/fedora-11">
- <upgrades id="http://fedoraproject.org/fedora-10" />
- <short-id>fedora11</short-id>
- <name>Fedora 11</name>
- <version>11</version>
- <vendor>Fedora Project</vendor>
- <x-fruit>apples</x-fruit>
- <x-animal>marmot</x-animal>
- <x-animal>aardvark</x-animal>
-
- <!-- Device support for unspecified platform -->
- <devices>
- <device id="http://pci-ids.ucw.cz/read/PC/1002/4382">
- <driver>es1391</driver>
- </device>
- <device id="http://pci-ids.ucw.cz/read/PC/1274/5000">
- <driver>ac97+</driver>
- </device>
- </devices>
-</os>
-
-<os id="http://fedoraproject.org/fedora-10">
- <short-id>fedora10</short-id>
- <name>Fedora 10</name>
- <version>10</version>
- <vendor>Fedora Project</vendor>
-
- <!-- Device support for unspecified platform -->
- <devices>
- <device id="http://pci-ids.ucw.cz/read/PC/1274/5000">
- <driver>ac97</driver>
- </device>
- <device id="http://pci-ids.ucw.cz/read/PC/1002/4382">
- <driver>es1391</driver>
- </device>
- </devices>
-</os>
-
-<os id="http://software.opensuse.org/112">
- <short-id>opensuse11.2</short-id>
- <name>OpenSuse 11.2</name>
- <version>11.2</version>
- <vendor>OpenSuse Project</vendor>
+<os id="https://wiki.parabola.nu/Get_Parabola">
+ <short-id>parabola</short-id>
+ <name>Parabola GNU/Linux-libre</name>
+ <vendor>Parabola Project</vendor>
</os>
-<deployment id="http://fedoraproject.org/fedora-10?kvm-0.11.0">
- <platform id="http://qemu.org/qemu-kvm-0.11.0" />
- <os id="http://fedoraproject.org/fedora-10" />
-
- <devices>
- <device id="http://pci-ids.ucw.cz/read/PC/1002/4382">
- <driver>ac97</driver>
- </device>
- <device id="http://pci-ids.ucw.cz/read/PC/1274/5000">
- <driver>ES1370</driver>
- </device>
- <device id="http://pci-ids.ucw.cz/read/PC/a727/0013">
- <driver>3com</driver>
- </device>
- </devices>
-</deployment>
-
-<deployment id="http://fedoraproject.org/fedora-11?kvm-0.11.0">
- <platform id="http://qemu.org/qemu-kvm-0.11.0" />
- <os id="http://fedoraproject.org/fedora-11" />
-
- <devices>
- <device id="http://pci-ids.ucw.cz/read/PC/1274/5000">
- <driver>es1370</driver>
- </device>
- <device id="http://pci-ids.ucw.cz/read/PC/1002/4382">
- <driver>ac97</driver>
- </device>
- <device id="http://pci-ids.ucw.cz/read/PC/1274/1371/80864541">
- <driver>es1371</driver>
- </device>
- <device id="http://pci-ids.ucw.cz/read/PC/a727/0013">
- <driver>3com</driver>
- </device>
- </devices>
-</deployment>
-
<!-- End of backing data -->
</libosinfo>
diff --git b/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 0000000..c867203
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1,8 @@
+data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in
+data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in
+data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in
+data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in
+data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in
+data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in
+data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in
+data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in
diff --git a/test/test-isodetect.c b/test/test-isodetect.c
index 64d0e9a..fa3ef27 100644
--- a/test/test-isodetect.c
+++ b/test/test-isodetect.c
@@ -366,90 +366,6 @@ static void test_one(const gchar *vendor)
g_object_unref(loader);
}
-START_TEST(test_fedora)
-{
- test_one("fedora");
-}
-END_TEST
-
-START_TEST(test_rhel)
-{
- test_one("rhel");
-}
-END_TEST
-
-START_TEST(test_ubuntu)
-{
- test_one("ubuntu");
-}
-END_TEST
-
-START_TEST(test_debian)
-{
- test_one("debian");
-}
-END_TEST
-
-START_TEST(test_windows)
-{
- test_one("windows");
-}
-END_TEST
-
-START_TEST(test_freebsd)
-{
- test_one("freebsd");
-}
-END_TEST
-
-START_TEST(test_openbsd)
-{
- test_one("openbsd");
-}
-END_TEST
-
-START_TEST(test_opensuse)
-{
- test_one("opensuse");
-}
-END_TEST
-
-START_TEST(test_centos)
-{
- test_one("centos");
-}
-END_TEST
-
-START_TEST(test_gnome)
-{
- test_one("gnome");
-}
-END_TEST
-
-START_TEST(test_altlinux)
-{
- test_one("altlinux");
-}
-END_TEST
-
-START_TEST(test_mageia)
-{
- test_one("mageia");
-}
-END_TEST
-
-START_TEST(test_sles)
-{
- test_one("sles");
-}
-END_TEST
-
-START_TEST(test_sled)
-{
- test_one("sled");
-}
-END_TEST
-
static Suite *
list_suite(void)
{
@@ -457,20 +373,6 @@ list_suite(void)
TCase *tc = tcase_create("Core");
tcase_set_timeout(tc, 20);
- tcase_add_test(tc, test_fedora);
- tcase_add_test(tc, test_rhel);
- tcase_add_test(tc, test_ubuntu);
- tcase_add_test(tc, test_debian);
- tcase_add_test(tc, test_windows);
- tcase_add_test(tc, test_freebsd);
- tcase_add_test(tc, test_openbsd);
- tcase_add_test(tc, test_opensuse);
- tcase_add_test(tc, test_centos);
- tcase_add_test(tc, test_gnome);
- tcase_add_test(tc, test_altlinux);
- tcase_add_test(tc, test_mageia);
- tcase_add_test(tc, test_sles);
- tcase_add_test(tc, test_sled);
suite_add_tcase(s, tc);
return s;
}
|
