Sync from SUSE:SLFO:Main osinfo-db revision 06f0080ee53fe10a55a1e17d44c27bd3

This commit is contained in:
Adrian Schröter 2024-10-03 18:33:44 +02:00
parent 5883c4d7af
commit ab611e0348
11 changed files with 319 additions and 40 deletions

View File

@ -1,8 +1,8 @@
Index: osinfo-db-20220727/os/opensuse.org/opensuse-15.6.xml
Index: osinfo-db-20240701/os/opensuse.org/opensuse-15.6.xml
===================================================================
--- /dev/null
+++ osinfo-db-20220727/os/opensuse.org/opensuse-15.6.xml
@@ -0,0 +1,246 @@
+++ osinfo-db-20240701/os/opensuse.org/opensuse-15.6.xml
@@ -0,0 +1,247 @@
+<?xml version="1.0"?>
+<libosinfo version="0.0.1">
+ <!-- Licensed under the GNU General Public License version 2 or later.
@ -35,7 +35,7 @@ Index: osinfo-db-20220727/os/opensuse.org/opensuse-15.6.xml
+ <distro>opensuse</distro>
+ <upgrades id="http://opensuse.org/opensuse/15.5"/>
+ <derives-from id="http://opensuse.org/opensuse/15.5"/>
+ <release-status>prerelease</release-status>
+ <release-date>2024-06-12</release-date>
+ <variant id="netinst">
+ <name>openSUSE Leap 15.6</name>
+ <name xml:lang="ko">&#xC624;&#xD508;&#xC218;&#xC138; &#xB9BD; 15.6</name>
@ -239,12 +239,13 @@ Index: osinfo-db-20220727/os/opensuse.org/opensuse-15.6.xml
+ <cpu>1600000000</cpu>
+ <n-cpus>1</n-cpus>
+ <ram>1073741824</ram>
+ <storage>3221225472</storage>
+ <storage>10737418240</storage>
+ </minimum>
+ <recommended>
+ <cpu>2400000000</cpu>
+ <ram>2147483648</ram>
+ <storage>17179869184</storage>
+ <n-cpus>4</n-cpus>
+ <ram>4294967296</ram>
+ <storage>42949672960</storage>
+ </recommended>
+ </resources>
+ </os>

View File

@ -1,6 +1,8 @@
Index: osinfo-db-20240701/os/suse.com/sle-15.6.xml
===================================================================
--- /dev/null
+++ b/os/suse.com/sle-15.6.xml
@@ -0,0 +1,104 @@
+++ osinfo-db-20240701/os/suse.com/sle-15.6.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<libosinfo version="0.0.1">
+ <!-- Licensed under the GNU General Public License version 2 or later.
@ -30,7 +32,7 @@
+ <distro>sle</distro>
+ <upgrades id="http://suse.com/sle/15.5"/>
+ <derives-from id="http://suse.com/sle/15.5"/>
+ <release-status>prerelease</release-status>
+ <release-date>2024-06-26</release-date>
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
@ -94,13 +96,14 @@
+ <resources arch="all">
+ <minimum>
+ <cpu>500000000</cpu>
+ <ram>536870912</ram>
+ <storage>1074151424</storage>
+ <ram>1073741824</ram>
+ <storage>2147483648</storage>
+ </minimum>
+ <recommended>
+ <cpu>2400000000</cpu>
+ <ram>1073741824</ram>
+ <storage>17179869184</storage>
+ <n-cpus>2</n-cpus>
+ <ram>4294967296</ram>
+ <storage>34359738368</storage>
+ </recommended>
+ </resources>
+ </os>

110
add-sle15sp7-support.patch Normal file
View File

@ -0,0 +1,110 @@
Index: osinfo-db-20240701/os/suse.com/sle-15.7.xml
===================================================================
--- /dev/null
+++ osinfo-db-20240701/os/suse.com/sle-15.7.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<libosinfo version="0.0.1">
+ <!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://suse.com/sle/15.7">
+ <short-id>sle15sp7</short-id>
+ <name>SUSE Linux Enterprise 15 SP7</name>
+ <name xml:lang="ka">SUSE Linux Enterprise 15 SP7</name>
+ <name xml:lang="ko">&#xC218;&#xC138; &#xB9AC;&#xB205;&#xC2A4; &#xAE30;&#xC5C5;&#xC6A9; 15 SP7</name>
+ <name xml:lang="pl">SUSE Linux Enterprise 15 SP7</name>
+ <name xml:lang="it">SUSE Linux Enterprise 15 SP7</name>
+ <version>15.7</version>
+ <vendor>SUSE</vendor>
+ <vendor xml:lang="ka">SUSE</vendor>
+ <vendor xml:lang="ko">&#xC218;&#xC138;</vendor>
+ <vendor xml:lang="uk">SUSE</vendor>
+ <vendor xml:lang="tr">SUSE</vendor>
+ <vendor xml:lang="pt_BR">SUSE</vendor>
+ <vendor xml:lang="pl">SUSE</vendor>
+ <vendor xml:lang="it">SUSE</vendor>
+ <vendor xml:lang="id">SUSE</vendor>
+ <vendor xml:lang="fr">SUSE</vendor>
+ <vendor xml:lang="es">SUSE</vendor>
+ <vendor xml:lang="de">SUSE</vendor>
+ <vendor xml:lang="ca">SUSE</vendor>
+ <family>linux</family>
+ <distro>sle</distro>
+ <upgrades id="http://suse.com/sle/15.6"/>
+ <derives-from id="http://suse.com/sle/15.6"/>
+ <release-date>2024-11-28</release-date>
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-15-SP7.*-x86_64.*</volume-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+ <media arch="aarch64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-15-SP7.*-aarch64.*</volume-id>
+ </iso>
+ <kernel>boot/aarch64/linux</kernel>
+ <initrd>boot/aarch64/initrd</initrd>
+ </media>
+ <media arch="ppc64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-15-SP7.*-ppc64le.*</volume-id>
+ </iso>
+ <kernel>boot/ppc64le/linux</kernel>
+ <initrd>boot/ppc64le/initrd</initrd>
+ </media>
+ <media arch="s390x">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-15-SP7.*-s390x.*</volume-id>
+ </iso>
+ <kernel>boot/s390x/linux</kernel>
+ <initrd>boot/s390x/initrd</initrd>
+ </media>
+ <tree arch="x86_64">
+ <treeinfo>
+ <family>SUSE Linux Enterprise Server</family>
+ <version>15.7</version>
+ <arch>x86_64</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="aarch64">
+ <treeinfo>
+ <family>SUSE Linux Enterprise Server</family>
+ <version>15.7</version>
+ <arch>aarch64</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="ppc64le">
+ <treeinfo>
+ <family>SUSE Linux Enterprise Server</family>
+ <version>15.7</version>
+ <arch>ppc64le</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="s390x">
+ <treeinfo>
+ <family>SUSE Linux Enterprise Server</family>
+ <version>15.7</version>
+ <arch>s390x</arch>
+ </treeinfo>
+ </tree>
+ <resources arch="all">
+ <minimum>
+ <cpu>500000000</cpu>
+ <ram>1073741824</ram>
+ <storage>2147483648</storage>
+ </minimum>
+ <recommended>
+ <cpu>2400000000</cpu>
+ <n-cpus>2</n-cpus>
+ <ram>4294967296</ram>
+ <storage>34359738368</storage>
+ </recommended>
+ </resources>
+ </os>
+</libosinfo>

View File

@ -1,6 +1,8 @@
--- /dev/null 2023-08-07 05:04:54.296175996 -0600
+++ osinfo-db-20230719/os/suse.com/slem-5.5.xml 2023-08-07 10:58:08.228681018 -0600
@@ -0,0 +1,75 @@
Index: osinfo-db-20240701/os/suse.com/slem-5.5.xml
===================================================================
--- /dev/null
+++ osinfo-db-20240701/os/suse.com/slem-5.5.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<libosinfo version="0.0.1">
+ <!-- Licensed under the GNU General Public License version 2 or later.
@ -29,7 +31,8 @@
+ <family>linux</family>
+ <distro>slem</distro>
+ <derives-from id="http://suse.com/slem/5.4"/>
+ <release-status>prerelease</release-status>
+ <release-date>2023-10-12</release-date>
+ <eol-date>2027-10-31</eol-date>
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>

View File

@ -1,17 +1,19 @@
--- /dev/null 2023-08-07 05:04:54.296175996 -0600
+++ osinfo-db-20230719/os/suse.com/slm-6.0.xml 2023-08-07 10:58:08.228681018 -0600
Index: osinfo-db-20240701/os/suse.com/slem-6.0.xml
===================================================================
--- /dev/null
+++ osinfo-db-20240701/os/suse.com/slem-6.0.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<libosinfo version="0.0.1">
+ <!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://suse.com/slm/6.0">
+ <short-id>slm6.0</short-id>
+ <name>SUSE Linux Micro 6.0</name>
+ <name xml:lang="ka">SUSE Linux Micro 6.0</name>
+ <os id="http://suse.com/slem/6.0">
+ <short-id>slem6.0</short-id>
+ <name>SUSE Linux Enterprise Micro 6.0</name>
+ <name xml:lang="ka">SUSE Linux Enterprise Micro 6.0</name>
+ <name xml:lang="ko">&#xC218;&#xC138; &#xB9AC;&#xB205;&#xC2A4; &#xAE30;&#xC5C5;&#xC6A9; &#xB9C8;&#xC774;&#xD06C;&#xB85C; 6.0</name>
+ <name xml:lang="pl">SUSE Linux Micro 6.0</name>
+ <name xml:lang="it">SUSE Linux Micro 6.0</name>
+ <name xml:lang="pl">SUSE Linux Enterprise Micro 6.0</name>
+ <name xml:lang="it">SUSE Linux Enterprise Micro 6.0</name>
+ <version>6.0</version>
+ <vendor>SUSE</vendor>
+ <vendor xml:lang="ka">SUSE</vendor>
@ -27,13 +29,13 @@
+ <vendor xml:lang="de">SUSE</vendor>
+ <vendor xml:lang="ca">SUSE</vendor>
+ <family>linux</family>
+ <distro>slm</distro>
+ <distro>slem</distro>
+ <derives-from id="http://suse.com/slem/5.5"/>
+ <release-status>prerelease</release-status>
+ <release-date>2024-06-08</release-date>
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SL-Micro-6.0-Packages-x86_64.*</volume-id>
+ <volume-id>SLE-Micro-6.0-DVD-x86_64.*</volume-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
@ -41,7 +43,7 @@
+ <media arch="aarch64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SL-Micro-6.0-Packages-aarch64.*</volume-id>
+ <volume-id>SLE-Micro-6.0-DVD-aarch64.*</volume-id>
+ </iso>
+ <kernel>boot/aarch64/linux</kernel>
+ <initrd>boot/aarch64/initrd</initrd>
@ -49,7 +51,7 @@
+ <media arch="ppc64le">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SL-Micro-6.0-Packages-ppc64le.*</volume-id>
+ <volume-id>SLE-Micro-6.0-DVD-ppc64le.*</volume-id>
+ </iso>
+ <kernel>boot/ppc64le/linux</kernel>
+ <initrd>boot/ppc64le/initrd</initrd>
@ -57,7 +59,7 @@
+ <media arch="s390x">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SL-Micro-6.0-Packages-s390x.*</volume-id>
+ <volume-id>SLE-Micro-6.0-DVD-s390x.*</volume-id>
+ </iso>
+ <kernel>boot/s390x/linux</kernel>
+ <initrd>boot/s390x/initrd</initrd>

80
add-slem6.1-support.patch Normal file
View File

@ -0,0 +1,80 @@
Index: osinfo-db-20240701/os/suse.com/slem-6.1.xml
===================================================================
--- /dev/null
+++ osinfo-db-20240701/os/suse.com/slem-6.1.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<libosinfo version="0.0.1">
+ <!-- Licensed under the GNU General Public License version 2 or later.
+ See http://www.gnu.org/licenses/ for a copy of the license text -->
+ <os id="http://suse.com/slem/6.1">
+ <short-id>slem6.1</short-id>
+ <name>SUSE Linux Enterprise Micro 6.1</name>
+ <name xml:lang="ka">SUSE Linux Enterprise Micro 6.1</name>
+ <name xml:lang="ko">&#xC218;&#xC138; &#xB9AC;&#xB205;&#xC2A4; &#xAE30;&#xC5C5;&#xC6A9; &#xB9C8;&#xC774;&#xD06C;&#xB85C; 6.1</name>
+ <name xml:lang="pl">SUSE Linux Enterprise Micro 6.1</name>
+ <name xml:lang="it">SUSE Linux Enterprise Micro 6.1</name>
+ <version>6.1</version>
+ <vendor>SUSE</vendor>
+ <vendor xml:lang="ka">SUSE</vendor>
+ <vendor xml:lang="ko">&#xC218;&#xC138;</vendor>
+ <vendor xml:lang="uk">SUSE</vendor>
+ <vendor xml:lang="tr">SUSE</vendor>
+ <vendor xml:lang="pt_BR">SUSE</vendor>
+ <vendor xml:lang="pl">SUSE</vendor>
+ <vendor xml:lang="it">SUSE</vendor>
+ <vendor xml:lang="id">SUSE</vendor>
+ <vendor xml:lang="fr">SUSE</vendor>
+ <vendor xml:lang="es">SUSE</vendor>
+ <vendor xml:lang="de">SUSE</vendor>
+ <vendor xml:lang="ca">SUSE</vendor>
+ <family>linux</family>
+ <distro>slem</distro>
+ <derives-from id="http://suse.com/slem/6.0"/>
+ <release-date>2024-08-22</release-date>
+ <media arch="x86_64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-Micro-6.1-DVD-x86_64.*</volume-id>
+ </iso>
+ <kernel>boot/x86_64/loader/linux</kernel>
+ <initrd>boot/x86_64/loader/initrd</initrd>
+ </media>
+ <media arch="aarch64">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-Micro-6.1-DVD-aarch64.*</volume-id>
+ </iso>
+ <kernel>boot/aarch64/linux</kernel>
+ <initrd>boot/aarch64/initrd</initrd>
+ </media>
+ <media arch="ppc64le">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-Micro-6.1-DVD-ppc64le.*</volume-id>
+ </iso>
+ <kernel>boot/ppc64le/linux</kernel>
+ <initrd>boot/ppc64le/initrd</initrd>
+ </media>
+ <media arch="s390x">
+ <iso>
+ <system-id>LINUX</system-id>
+ <volume-id>SLE-Micro-6.1-DVD-s390x.*</volume-id>
+ </iso>
+ <kernel>boot/s390x/linux</kernel>
+ <initrd>boot/s390x/initrd</initrd>
+ </media>
+ <resources arch="all">
+ <minimum>
+ <cpu>500000000</cpu>
+ <ram>1073741824</ram>
+ <storage>12884901888</storage>
+ </minimum>
+ <recommended>
+ <cpu>2400000000</cpu>
+ <ram>4294967296</ram>
+ <storage>64424509440</storage>
+ </recommended>
+ </resources>
+ </os>
+</libosinfo>

View File

@ -0,0 +1,23 @@
--- osinfo-db-20240510/os/opensuse.org/opensuse-tumbleweed.xml.orig 2024-07-01 13:06:42.336848537 -0600
+++ osinfo-db-20240510/os/opensuse.org/opensuse-tumbleweed.xml 2024-07-01 13:06:58.400848920 -0600
@@ -134,14 +134,15 @@
<!-- http://en.opensuse.org/Hardware_requirements -->
<minimum>
<cpu>1600000000</cpu>
- <n-cpus>1</n-cpus>
- <ram>1073741824</ram>
- <storage>4294967296</storage>
+ <n-cpus>2</n-cpus>
+ <ram>2147483648</ram>
+ <storage>42949672960</storage>
</minimum>
<recommended>
<cpu>2400000000</cpu>
- <ram>2147483648</ram>
- <storage>21474836480</storage>
+ <n-cpus>4</n-cpus>
+ <ram>4294967296</ram>
+ <storage>64424509440</storage>
</recommended>
</resources>
<installer>

BIN
osinfo-db-20231215.tar.xz (Stored with Git LFS)

Binary file not shown.

BIN
osinfo-db-20240701.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,57 @@
-------------------------------------------------------------------
Tue Sep 17 07:21:53 MDT 2024 - carnold@suse.com
- Add support for SLE Micro 6.1 (jsc#PED-8910)
add-slem6.1-support.patch
- Drop support for Leap 15.7. Next major version is Leap 16
add-opensuse-leap-15.7-support.patch
- Adjust place holder release-date for sle15sp7
add-sle15sp7-support.patch
-------------------------------------------------------------------
Wed Sep 4 10:05:17 MDT 2024 - carnold@suse.com
- Add support for openSUSE Leap 15.7 (jsc#PED-8910)
add-opensuse-leap-15.7-support.patch
- Add support for SLE-15-SP7 (jsc#PED-8910) (bsc#1230160)
add-sle15sp7-support.patch
-------------------------------------------------------------------
Mon Jul 8 10:49:13 MDT 2024 - carnold@suse.com
- Update the release dates in the definitions for the following
products
openSUSE leap 15.6, SLE 15-SP6, SLEM 5.5, SLEM 6.0
-------------------------------------------------------------------
Tue Jul 2 14:41:58 MDT 2024 - carnold@suse.com
- Update to database version 20240701
osinfo-db-20240701.tar.xz
-------------------------------------------------------------------
Mon Jul 1 14:42:41 MDT 2024 - carnold@suse.com
- Adjust some default hardware requirements (bsc#1227231)
adjust-tumbleweed-hardware-requirements.patch
add-opensuse-leap-15.6-support.patch
add-sle15sp6-support.patch
-------------------------------------------------------------------
Fri Jun 28 14:05:03 MDT 2024 - carnold@suse.com
- bsc#1227116 - osinfo still uses deprecated SL-Micro name
Reverse prior decision to drop the use of "Enterprise" in the
name of the SUSE Linux Micro product.
add-slem6.0-support.patch
Drop add-slm6.0-support.patch
-------------------------------------------------------------------
Thu May 16 12:53:49 MDT 2024 - carnold@suse.com
- Update to database version 20240510
osinfo-db-20240510.tar.xz
-------------------------------------------------------------------
Tue May 7 10:59:39 MDT 2024 - carnold@suse.com

View File

@ -17,7 +17,7 @@
Name: osinfo-db
Version: 20231215
Version: 20240701
Release: 0
Summary: Osinfo database files
License: LGPL-2.1-or-later AND GPL-2.0-or-later
@ -28,10 +28,13 @@ Patch21: add-oes-support.patch
Patch22: add-caasp40-support.patch
Patch23: add-win-2k19-media-info.patch
Patch24: fix-tumbleweed-order.patch
Patch25: add-slem5.5-support.patch
Patch26: add-sle15sp6-support.patch
Patch27: add-opensuse-leap-15.6-support.patch
Patch28: add-slm6.0-support.patch
Patch25: adjust-tumbleweed-hardware-requirements.patch
Patch26: add-slem5.5-support.patch
Patch27: add-sle15sp6-support.patch
Patch28: add-sle15sp7-support.patch
Patch29: add-opensuse-leap-15.6-support.patch
Patch30: add-slem6.0-support.patch
Patch31: add-slem6.1-support.patch
BuildRequires: intltool
BuildRequires: osinfo-db-tools
BuildArch: noarch