rpm/osinfo-db
SHA256
1
0
Fork 0
forked from pool/osinfo-db
Code Pull Requests Activity

- bsc#974580 - modify volume id for some windows iso files

Browse Source 
First, use "X64FREE?" instead of "X64FRE". 
  Second, add "IR1_SSS_X64FREV_EN-US_DV5".
  modify-volume-id-for-windows.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/osinfo-db?expand=0&rev=54
This commit is contained in:
Charles Arnold 2018-04-05 16:58:00 +00:00 committed by Git OBS Bridge
parent 154d8fa4d9
commit 04c7f594a4
3 changed files with 154 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
modify-volume-id-for-windows.patch Normal file
View File

@ -0,0 +1,144 @@
diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-10.xml osinfo-db-20180311/os/microsoft.com/win-10.xml
--- osinfo-db-20180311-org/os/microsoft.com/win-10.xml 2018-04-04 17:46:41.451731061 -0400
+++ osinfo-db-20180311/os/microsoft.com/win-10.xml 2018-04-04 17:40:50.358930629 -0400
@@ -68,7 +68,7 @@
<media arch="x86_64">
<variant id="education"/>
<iso>
- <volume-id>(J_)?CEDN?A_X64FRE_</volume-id>
+ <volume-id>(J_)?CEDN?A_X64FREE?_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
</iso>
@@ -120,7 +120,7 @@
</media>
<media arch="x86_64">
<iso>
- <volume-id>(J_)?(CCSN?A|CCOMA)_X64FRE_</volume-id>
+ <volume-id>(J_)?(CCSN?A|CCOMA)_X64FREE?_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
</iso>
diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-2k12r2.xml osinfo-db-20180311/os/microsoft.com/win-2k12r2.xml
--- osinfo-db-20180311-org/os/microsoft.com/win-2k12r2.xml 2018-04-04 17:46:41.451731061 -0400
+++ osinfo-db-20180311/os/microsoft.com/win-2k12r2.xml 2018-04-04 17:48:15.943930299 -0400
@@ -68,7 +68,7 @@
<media arch="x86_64">
<iso>
- <volume-id>(IRM_SSS_X64FRE|IRM_SSS_X64CHK|IR3_SSS_X64FRE|IR5_SSS_X64FRE)_</volume-id>
+ <volume-id>(IRM_SSS_X64FREE?|IRM_SSS_X64CHK|IR3_SSS_X64FREE?|IR5_SSS_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
</iso>
@@ -76,7 +76,7 @@
<media arch="x86_64">
<variant id="essentials"/>
<iso>
- <volume-id>(IRM_SSSO_X64CHK|IR5_SSSO_X64FRE|IRM_SSSO_X64FRE)_</volume-id>
+ <volume-id>(IRM_SSSO_X64CHK|IR5_SSSO_X64FREE?|IRM_SSSO_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
</iso>
@@ -84,7 +84,7 @@
<media arch="x86_64">
<variant id="hyperv"/>
<iso>
- <volume-id>(IRM_SHV_X64CHK|IRM_SHV_X64FRE)_</volume-id>
+ <volume-id>(IRM_SHV_X64CHK|IRM_SHV_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
</iso>
@@ -92,7 +92,7 @@
<media arch="x86_64">
<variant id="volume-licence"/>
<iso>
- <volume-id>(IR5_SSS_X64FREV|IR2_SSS_X64FREV)_</volume-id>
+ <volume-id>(IR5_SSS_X64FREV|IR2_SSS_X64FREV|IR1_SSS_X64FREV)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
</iso>
diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-2k12.xml osinfo-db-20180311/os/microsoft.com/win-2k12.xml
--- osinfo-db-20180311-org/os/microsoft.com/win-2k12.xml 2018-04-04 17:46:41.451731061 -0400
+++ osinfo-db-20180311/os/microsoft.com/win-2k12.xml 2018-04-04 17:41:43.167048199 -0400
@@ -68,7 +68,7 @@
<media arch="x86_64">
<iso>
- <volume-id>(HRM_SSS_X64CHK|HRM_SSS_X64FRE)_</volume-id>
+ <volume-id>(HRM_SSS_X64CHK|HRM_SSS_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
</iso>
@@ -77,7 +77,7 @@
<media arch="x86_64">
<variant id="essentials"/>
<iso>
- <volume-id>(HRM_SSSO_X64FRE)_</volume-id>
+ <volume-id>(HRM_SSSO_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
</iso>
@@ -85,7 +85,7 @@
<media arch="x86_64">
<variant id="hyperv"/>
<iso>
- <volume-id>(HRM_SHV_X64CHK|HRM_SHV_X64FRE)_</volume-id>
+ <volume-id>(HRM_SHV_X64CHK|HRM_SHV_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
</iso>
diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-2k16.xml osinfo-db-20180311/os/microsoft.com/win-2k16.xml
--- osinfo-db-20180311-org/os/microsoft.com/win-2k16.xml 2018-04-04 17:46:41.451731061 -0400
+++ osinfo-db-20180311/os/microsoft.com/win-2k16.xml 2018-04-04 17:39:19.718809457 -0400
@@ -28,7 +28,7 @@
<media arch="x86_64">
<iso>
- <volume-id>^(SSS_X64CHK|SSS_X64FRE|SSS_X64FREE)_</volume-id>
+ <volume-id>^(SSS_X64CHK|SSS_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
</iso>
@@ -36,7 +36,7 @@
<media arch="x86_64">
<variant id="essentials"/>
<iso>
- <volume-id>^(SESS_X64FRE)_</volume-id>
+ <volume-id>^(SESS_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
</iso>
@@ -44,7 +44,7 @@
<media arch="x86_64">
<variant id="hyperv"/>
<iso>
- <volume-id>^(SHV_X64CHK|SHV_X64FRE)_</volume-id>
+ <volume-id>^(SHV_X64CHK|SHV_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
</iso>
diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-8.1.xml osinfo-db-20180311/os/microsoft.com/win-8.1.xml
--- osinfo-db-20180311-org/os/microsoft.com/win-8.1.xml 2018-04-04 17:46:41.451731061 -0400
+++ osinfo-db-20180311/os/microsoft.com/win-8.1.xml 2018-04-04 17:39:44.510843045 -0400
@@ -148,7 +148,7 @@
</media>
<media arch="x86_64">
<iso>
- <volume-id>(IR[M35]_CCSN?A_X64FRE)_</volume-id>
+ <volume-id>(IR[M35]_CCSN?A_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
</iso>
diff -ruN osinfo-db-20180311-org/os/microsoft.com/win-8.xml osinfo-db-20180311/os/microsoft.com/win-8.xml
--- osinfo-db-20180311-org/os/microsoft.com/win-8.xml 2018-04-04 17:46:41.451731061 -0400
+++ osinfo-db-20180311/os/microsoft.com/win-8.xml 2018-04-04 17:42:28.079156558 -0400
@@ -78,7 +78,7 @@
</media>
<media installer-reboots="2" arch="x86_64">
<iso>
- <volume-id>(HB1_CCPA_X64FRE|HRM_CCSN?A_X64FRE)_</volume-id>
+ <volume-id>(HB1_CCPA_X64FREE?|HRM_CCSN?A_X64FREE?)_</volume-id>
<publisher-id>MICROSOFT CORPORATION</publisher-id>
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
</iso>

8
osinfo-db.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Apr 4 22:15:01 UTC 2018 - lyan@suse.com
- bsc#974580 - modify volume id for some windows iso files
First, use "X64FREE?" instead of "X64FRE".
Second, add "IR1_SSS_X64FREV_EN-US_DV5".
modify-volume-id-for-windows.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 23 13:51:30 MDT 2018 - carnold@suse.com Fri Mar 23 13:51:30 MDT 2018 - carnold@suse.com

2
osinfo-db.spec
View File

@ -29,6 +29,7 @@ Patch20: add-caasp-support.patch
Patch21: add-opensuse-leap-15-support.patch Patch21: add-opensuse-leap-15-support.patch
Patch22: add-sle15-support.patch Patch22: add-sle15-support.patch
Patch23: add-oes-support.patch Patch23: add-oes-support.patch
Patch24: modify-volume-id-for-windows.patch
BuildRequires: intltool BuildRequires: intltool
BuildRequires: osinfo-db-tools BuildRequires: osinfo-db-tools
@ -43,6 +44,7 @@ provisioning of new virtual machines
%patch21 -p1 %patch21 -p1
%patch22 -p1 %patch22 -p1
%patch23 -p1 %patch23 -p1
%patch24 -p1
%build %build
cd %{_builddir} cd %{_builddir}