From 48b40a1bfb917bdbb8434e8b1fa16c5d26e69ef9 Mon Sep 17 00:00:00 2001
From: hongjinghao <hongjinghao@huawei.com>
Date: Sat, 24 Dec 2022 15:31:38 +0800
Subject: [PATCH] sync by master

(cherry picked from commit 57e7c8345608ea573f06ca71c5168ffb4722d5d3)
---
 openeuler-22.03.xml | 70 +++++++++++++++++++++++++++++++++++++++++++++
 osinfo-db.spec      | 26 +++++++++++++++--
 sel-2.0.xml         | 70 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 164 insertions(+), 2 deletions(-)
 create mode 100644 openeuler-22.03.xml
 create mode 100644 sel-2.0.xml

diff --git a/openeuler-22.03.xml b/openeuler-22.03.xml
new file mode 100644
index 0000000..b28f336
--- /dev/null
+++ b/openeuler-22.03.xml
@@ -0,0 +1,70 @@
+<?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://openeuler.org/openeuler/22.03">
+    <short-id>openeuler22.03</short-id>
+    <name>openEuler 22.03</name>
+    <name xml:lang="uk">openEuler 22.03</name>
+    <name xml:lang="tr">openEuler 22.03</name>
+    <name xml:lang="pt_BR">openEuler 22.03</name>
+    <name xml:lang="pl">openEuler 22.03</name>
+    <name xml:lang="it">openEuler 22.03</name>
+    <name xml:lang="id">openEuler 22.03</name>
+    <version>2.0</version>
+    <vendor>openEuler</vendor>
+    <vendor xml:lang="uk">openEuler</vendor>
+    <vendor xml:lang="tr">openEuler</vendor>
+    <vendor xml:lang="pt_BR">openEuler</vendor>
+    <vendor xml:lang="pl">openEuler</vendor>
+    <vendor xml:lang="it">openEuler</vendor>
+    <vendor xml:lang="id">openEuler</vendor>
+    <vendor xml:lang="fr">openEuler</vendor>
+    <vendor xml:lang="es">openEuler</vendor>
+    <vendor xml:lang="ca">openEuler</vendor>
+    <family>linux</family>
+    <distro>openEuler</distro>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>openEuler-22.03-LTS-x86_64</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="aarch64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>openEuler-22.03-LTS-aarch64</volume-id>
+      </iso>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+    </media>
+    <tree arch="x86_64">
+      <treeinfo>
+        <family>openEuler</family>
+        <version>2.0</version>
+        <arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="aarch64">
+      <treeinfo>
+        <family>openEuler</family>
+        <version>2.0</version>
+        <arch>aarch64</arch>
+      </treeinfo>
+    </tree>
+    <resources arch="all">
+      <minimum>
+        <cpu>500000000</cpu>
+        <ram>536870912</ram>
+        <storage>1074151424</storage>
+      </minimum>
+      <recommended>
+        <cpu>2400000000</cpu>
+        <ram>1073741824</ram>
+        <storage>17179869184</storage>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
diff --git a/osinfo-db.spec b/osinfo-db.spec
index 684bea2..bef0699 100644
--- a/osinfo-db.spec
+++ b/osinfo-db.spec
@@ -1,11 +1,15 @@
+%global debug_package %{nil}
+
 Name: osinfo-db
 Version: 20220214
 Summary: osinfo database files
-Release: 1
+Release: 3
 License: LGPLv2+
 URL: http://libosinfo.org/
 Source0: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz
 Source1: https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.xz.asc
+Source2: openeuler-22.03.xml
+Source3: sel-2.0.xml
 
 BuildRequires: intltool osinfo-db-tools
 Requires: hwdata
@@ -15,8 +19,19 @@ osinfo-db provides the database files for use with the libosinfo
 library. It provides information about guest operating systems for
 use with virtualization provisioning tools.
 
+%prep
+%setup -q
+
+%build
+cd %{_builddir}
+mkdir -p %{_builddir}/osinfo-db-%{version}/os/openeuler.org/
+mkdir -p %{_builddir}/osinfo-db-%{version}/os/suseeuler.net/
+cp %{SOURCE2}  %{_builddir}/osinfo-db-%{version}/os/openeuler.org/
+cp %{SOURCE3}  %{_builddir}/osinfo-db-%{version}/os/suseeuler.net/
+tar -cJf x.tar.xz osinfo-db-%{version}
+
 %install
-osinfo-db-import  --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0}
+osinfo-db-import  --root %{buildroot} --dir %{_datadir}/osinfo "%{_builddir}/x.tar.xz"
 
 %files
 %{_datadir}/osinfo/datamap
@@ -29,6 +44,13 @@ osinfo-db-import  --root %{buildroot} --dir %{_datadir}/osinfo %{SOURCE0}
 %{_datadir}/osinfo/LICENSE
 
 %changelog
+* Mon Jun 20 2022 Chenxi Mao <chenxi.mao@suse.com> - 20220214-3
+- Fix openEuler incorrect string
+- Support SUSE Euler product
+
+* Tue May 31 2022 Chenxi Mao <chenxi.mao@suse.com> - 20220214-2
+- Support openEuler
+
 * Thu Mar 3 2022 panxiaohe <panxh.life@foxmail.com> - 20220214-1
 - update version to 20220214
 
diff --git a/sel-2.0.xml b/sel-2.0.xml
new file mode 100644
index 0000000..0fbdeb2
--- /dev/null
+++ b/sel-2.0.xml
@@ -0,0 +1,70 @@
+<?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://suseeuler.net/sel-2.0">
+    <short-id>sel 2.0</short-id>
+    <name>SUSE Euler Linux 2.0</name>
+    <name xml:lang="uk">SUSE Euler Linux 2.0</name>
+    <name xml:lang="tr">SUSE Euler Linux 2.0</name>
+    <name xml:lang="pt_BR">SUSE Euler Linux 2.0</name>
+    <name xml:lang="pl">SUSE Euler Linux 2.0</name>
+    <name xml:lang="it">SUSE Euler Linux 2.0</name>
+    <name xml:lang="id">SUSE Euler Linux 2.0</name>
+    <version>2.0</version>
+    <vendor>SUSE</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="ca">SUSE</vendor>
+    <family>linux</family>
+    <distro>sel</distro>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SUSE-Euler-Linux-2.0-x86_64</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="aarch64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>SUSE-Euler-Linux-2.0-aarch64</volume-id>
+      </iso>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
+    </media>
+    <tree arch="x86_64">
+      <treeinfo>
+        <family>SUSE Euler Linux</family>
+        <version>2.0</version>
+        <arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+    <tree arch="aarch64">
+      <treeinfo>
+        <family>SUSE Euler Linux</family>
+        <version>2.0</version>
+        <arch>aarch64</arch>
+      </treeinfo>
+    </tree>
+    <resources arch="all">
+      <minimum>
+        <cpu>500000000</cpu>
+        <ram>536870912</ram>
+        <storage>1074151424</storage>
+      </minimum>
+      <recommended>
+        <cpu>2400000000</cpu>
+        <ram>1073741824</ram>
+        <storage>17179869184</storage>
+      </recommended>
+    </resources>
+  </os>
+</libosinfo>
-- 
Gitee