[virt-tools-list] [libosinfo 8/8] win: Add lang-regex tags

Christophe Fergeau cfergeau at redhat.com
Mon Dec 3 11:23:37 UTC 2012


Now that libosinfo knows how to use the lang-regex OsinfoDB attribute,
we can add this data to the various Windows <media> definitions in
the database.
---
 data/oses/windows.xml.in | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
index e8c29f9..1d798d8 100644
--- a/data/oses/windows.xml.in
+++ b/data/oses/windows.xml.in
@@ -288,6 +288,7 @@
     <media arch="i386">
       <iso>
           <volume-id>(W2AFPP|SP1AFPP|SP2AFPP|YRMAFPP|ZRMAFPP|W2AOEM|SP1AOEM|SP2AOEM|YRMAOEM|ZRMAOEM|W2ASEL|SP2ASEL|W2SFPP|SP1SFPP|SP2SFPP|YRMSFPP|ZRMSFPP|W2SOEM|W2SOEM|SP1SOEM|SP2SOEM|YRMSOEM|ZRMSOEM|W2SSEL|SP2SSEL|W2PFPP|SP1PFPP|SP2PFPP|YRMPFPP|ZRMPFPP|W2POEM|SP1POEM|SP2POEM|YRMPOEM|ZRMPOEM|W2PSEL|SP2PSEL|W2PCCP|WIN2000|W2K_SP4)</volume-id>
+          <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
 
@@ -332,6 +333,7 @@
       <iso>
         <volume-id>(WXPFPP|WXHFPP|WXPCCP|WXHCCP|WXPOEM|WXHOEM|WXPVOL|WXPEVL|XRMPFPP|XRMHFPP|XRMPCCP|XRMHCCP|XRMPOEM|XRMHOEM|XRMPVOL|XRMSD2|X1APFPP|X1AHFPP|X1APCCP|X1APCCP|X1AHCCP|X1APOEM|X1AHOEM|X1APVOL|VRMPFPP|VRMHFPP|VRMPCCP|VRMHCCP|VRMPOEM|VRMHOEM|VRMPVOL|VRMSD2|VX2PFPP|VX2HFPP|VX2PCCP|VX2HCCP|VX2POEM|VX2HOEM|VX2PRMFPP|VX2PVOL|GRTMUPD|GRTMPFPP|GRTMPRMFPP|GRTMHFPP|GRTMHKFPP|GRTMHKNFPP|GRTMHRMFPP|GRTMPOEM|GRTMHOEM|GRTMPVOL|GRTMPKNVOL|GRTMPKVOL|GRTMPRMVOL|MX2PFPP|MRMSD2)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
 
@@ -339,6 +341,7 @@
       <iso>
         <volume-id>(ARMPXFPP|ARMPXCCP|ARMPXOEM|ARMPXVOL|AX2PXCFPP|AX2PXFPP)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
 
@@ -397,18 +400,21 @@
       <iso>
         <volume-id>(ARMECHK|ARMEVOL|ARMSVOL|ARMWVOL|ARMEEVL|ARMSEVL|ARMWEVL|ARMEOEM|ARMDOEM|ARMSOEM|ARMWOEM|ARMEFPP|ARMDFPP|ARMSFPP|ARMWFPP|NRMECHK|NRMEVOL|NRMSVOL|NRMWVOL|NRMEEVL|NRMSEVL|NRMWEVL|NRMEOEM|NRMDOEM|NRMSOEM|NRMWOEM|NRMEFPP|NRMDFPP|NRMSFPP|NRMSFPP|CRMSVOL|CRMSXVOL|BRMEVOL|BX2DVOL|ARMEEVL|BRMEEVL|CR0SP2)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
     <media arch="x86_64">
       <iso>
         <volume-id>(ARMEICHK|ARMEIFPP|ARMEIEVL|ARMEIOEM|ARMDIOEM|ARMEXFPP|ARMDFPP|ARMSXFPP|CR0SPX2|NRMEICHK|NRMEIFPP|NRMDIFPP|NRMEIOEM|NRMDIOEM|NRMEIVOL|NRMEIEVL|BRMEXVOL|BX2DXVOL)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
     <media arch="ia64">
       <iso>
         <volume-id>(ARMEIFPP|CR0SPI2)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
 
@@ -465,12 +471,14 @@
       <iso>
         <volume-id>(CRMEFPP|CRMSFPP|CR0SCD2|CR0ECD2|BX2SFPP|BX2EFPP|BRMECD2FRE|BRMSCD2FRE)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
     <media arch="x86_64">
       <iso>
         <volume-id>(CRMEXFPP|CRMSXFPP|CR0SCD2X|CR0ECD2X|BX2SXFPP|BX2EXFPP|BRMECD2XFRE|BRMSCD2XFRE)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
 
@@ -527,12 +535,14 @@
       <iso>
         <volume-id>(KRTMSVOL|KRTMSCHK|KRMWVOL|KRMSVOL)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
     <media arch="x86_64">
       <iso>
         <volume-id>(KRTMSXVOL|KRTMSXCHK|KRMWXVOL|KRMSXVOL)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
 
@@ -589,12 +599,14 @@
       <iso>
         <volume-id>(GRMSXVOL|GRMSXFRER|GRMSHXVOL)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
     <media arch="ia64">
       <iso>
         <volume-id>(GRMSIAIVOL|SRVHPCR2)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
 
@@ -636,12 +648,14 @@
       <iso>
         <volume-id>(FB1EVOL|LRMCFRE|FRTMBVOL|FRMBVOL|FRMEVOL)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
     <media arch="x86_64">
       <iso>
         <volume-id>(FB1EXVOL|LRMCXFRE|FRTMBXVOL|FRMBXVOL|FRMEXVOL)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
 
@@ -682,13 +696,14 @@
       <iso>
         <volume-id>(GRMCULFRER|GSP1RMCNPRFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GSP1RMCPRFRER|GRMCENVOL|GRMCNENVOL|GRMCPRFRER|GSP1RMCPRVOL)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
-
+        <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
     <media arch="x86_64" installer-reboots="2">
       <iso>
         <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GSP1RMCNHPXFRER|GRMCHPXFRER|GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER|GSP1RMCPRXVOL)_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
+        <lang-regex>[[:upper:][:digit:]]*_([[:upper:]]*)</lang-regex>
       </iso>
     </media>
 
-- 
1.8.0.1




More information about the virt-tools-list mailing list