Open Build Service

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 40

_service:tar_scm_kernel_repo:oemaker.spec Added

@@ -0,0 +1,187 @@
+%ifarch aarch64
+%global efi_aa64 1
+%endif
+
+%ifarch x86_64
+%global efi_x64 1
+%endif
+
+Name:           oemaker
+Summary:        a duilding tool for DVD ISO making and ISO cutting
+License:        Mulan PSL v2
+Group:          System/Management
+Version:        2.0.0
+Release:        3
+BuildRoot:      %{_tmppath}/%{name}
+
+Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source1:        normal_aarch64.xml
+Source2:        normal_x86_64.xml
+Source3:        rpmlist.xml
+
+Requires:       createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2
+Requires:       lorax >= 19.6.78-1
+
+Patch0001:	0001-rename-source-iso.patch
+Patch0002:	0002-bugfix-I3QY98.patch
+
+%description
+a building tool for DVD ISO making and ISO cutting
+
+%package -n isocut
+Summary: a building tool for ISO cutting
+Requires: yum dnf-utils createrepo file util-linux genisoimage isomd5sum grep bash libselinux-utils libxml2
+BuildRequires: bash
+
+%description -n isocut
+a building tool for ISO cutting
+
+%prep
+%setup -c
+rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/aarch64/normal.xml
+cp %{SOURCE1} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/aarch64/normal.xml
+rm -rf  %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/normal.xml
+cp %{SOURCE2} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/normal.xml
+rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml
+cp %{SOURCE3} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml
+cd %{_builddir}/%{name}-%{version}/%{name}
+%autopatch -p1
+
+%install
+mkdir -p %{buildroot}/opt/
+mkdir -p %{buildroot}/opt/oemaker
+mkdir -p %{buildroot}/opt/oemaker/config
+mkdir -p %{buildroot}/opt/oemaker/config/x86_64
+mkdir -p %{buildroot}/opt/oemaker/config/aarch64
+mkdir -p %{buildroot}/opt/oemaker/docs
+mkdir -p %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}/%{_sysconfdir}/isocut
+chmod 750 %{buildroot}/%{_sysconfdir}/isocut
+
+install -m 700 %{name}/isomaker/oemaker.sh %{buildroot}/opt/oemaker/oemaker.sh
+install -m 700 %{name}/isomaker/oemaker.sh %{buildroot}/%{_bindir}/oemaker
+install -m 700 %{name}/isomaker/make_debug.sh %{buildroot}/opt/oemaker/make_debug.sh
+install -m 700 %{name}/isomaker/img_repo.sh %{buildroot}/opt/oemaker/img_repo.sh
+install -m 700 %{name}/isomaker/init.sh %{buildroot}/opt/oemaker/init.sh
+install -m 700 %{name}/isomaker/iso.sh %{buildroot}/opt/oemaker/iso.sh
+install -m 700 %{name}/isomaker/rpm.sh %{buildroot}/opt/oemaker/rpm.sh
+install -m 400 %{name}/isomaker/config/rpmlist.xml %{buildroot}/opt/oemaker/config/rpmlist.xml
+install -m 400 %{name}/isomaker/config/x86_64/* %{buildroot}/opt/oemaker/config/x86_64/
+install -m 400 %{name}/isomaker/config/aarch64/* %{buildroot}/opt/oemaker/config/aarch64/
+install -m 700 %{name}/isomaker/docs/* %{buildroot}/opt/oemaker/docs/
+cp -a %{name}/isomaker/80-openeuler %{buildroot}/opt/oemaker/
+
+
+install -m 550 %{name}/isocut/isocut.py %{buildroot}/%{_bindir}/isocut
+install -m 600 %{name}/isocut/config/repodata.template %{buildroot}/%{_sysconfdir}/isocut/
+
+%if 0%{?efi_aa64}
+    install -m 600 %{name}/isocut/config/aarch64/rpmlist %{buildroot}/%{_sysconfdir}/isocut/
+    install -m 600 %{name}/isocut/config/aarch64/anaconda-ks.cfg %{buildroot}/%{_sysconfdir}/isocut/
+%endif
+
+%if 0%{?efi_x64}
+    install -m 600 %{name}/isocut/config/x86_64/rpmlist %{buildroot}/%{_sysconfdir}/isocut/
+    install -m 600 %{name}/isocut/config/x86_64/anaconda-ks.cfg %{buildroot}/%{_sysconfdir}/isocut/
+%endif
+
+%pre
+
+%post
+
+%preun
+
+%postun
+
+%postun -n isocut
+if [ "$1" = "0" ]; then
+  rm -rf %{_sysconfdir}/isocut/*
+fi
+
+%files
+%defattr(-,root,root)
+%dir /opt
+%dir /opt/oemaker
+/opt/oemaker/*
+%{_bindir}/oemaker
+
+%files -n isocut
+%defattr(-,root,root)
+%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/repodata.template
+%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/rpmlist
+%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/anaconda-ks.cfg
+%{_bindir}/isocut
+%dir %{_sysconfdir}/isocut
+%{_sysconfdir}/isocut/*
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT/*
+rm -rf %{buildroot}
+rm -rf $RPM_BUILD_DIR/%{name}
+
+%changelog
+* Wed May 12 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-3
+- ID:NA
+- SUG:NA
+- DESC: bugfix I3QY98
+
+* Mon Apr 26 2021 lingsheng <lingsheng@huawei.com> - 2.0.0-2
+- ID:NA
+- SUG:NA
+- DESC: add openal-soft-devel to rpmlist exclude
+
+* Wed Apr 7 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-1
+- ID:NA
+- SUG:NA
+- DESC: change for issue I3DJJW
+
+* Wed Apr 7 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.2-6
+- ID:NA
+- SUG:NA
+- DESC: add rpms to rpmlist which will be deleted from iso
+
+* Sat Mar 13 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.2-5
+- ID:NA
+- SUG:NA
+- DESC: fix bug I3B7CH
+
+* Thu Mar 11 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.2-4
+- ID:NA
+- SUG:NA
+- DESC: delete stratovirt from xml file
+
+* Thu Mar 01 2021 Chen Qun <kuhn.chenqun@huawei.com> - 1.1.2-2
+- ID:NA
+- SUG:NA
+- DESC: change method of creating source iso
+
+* Thu Mar 01 2021 Chen Qun <kuhn.chenqun@huawei.com> - 1.1.2-2
+- ID:NA
+- SUG:NA
+- DESC: add stratovirt in virtualization-hypervisor group
+
+* Thu Feb 25 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.2-1
+- ID:NA
+- SUG:NA
+- DESC:upgrade version
+
+* Mon Feb 08 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.1-1
+- ID:NA
+- SUG:NA
+- DESC:upgrade version
+
+* Thu Oct 15 2020 zhuchunyi <zhuchunyi@huawei.com> - 1.0.1-1
+- ID:NA
+- SUG:NA
+- DESC:upgrade version
+
+* Tue Sep 29 2020 zhuchunyi <zhuchunyi@huawei.com> - 1.0.0-2
+- ID:NA
+- SUG:NA
+- DESC:change Source format to URL
+
+* Sat Jul 25 2020 zhuchunyi <zhuchunyi@huawei.com> - 1.0.0-1
+- ID:NA
+- SUG:NA
+- DESC:package init

oemaker.spec Deleted

@@ -1,187 +0,0 @@
-%ifarch aarch64
-%global efi_aa64 1
-%endif
-
-%ifarch x86_64
-%global efi_x64 1
-%endif
-
-Name:           oemaker
-Summary:        a duilding tool for DVD ISO making and ISO cutting
-License:        Mulan PSL v2
-Group:          System/Management
-Version:        2.0.0
-Release:        3
-BuildRoot:      %{_tmppath}/%{name}
-
-Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source1:        normal_aarch64.xml
-Source2:        normal_x86_64.xml
-Source3:        rpmlist.xml
-
-Requires:       createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2
-Requires:       lorax >= 19.6.78-1
-
-Patch0001:	0001-rename-source-iso.patch
-Patch0002:	0002-bugfix-I3QY98.patch
-
-%description
-a building tool for DVD ISO making and ISO cutting
-
-%package -n isocut
-Summary: a building tool for ISO cutting
-Requires: yum dnf-utils createrepo file util-linux genisoimage isomd5sum grep bash libselinux-utils libxml2
-BuildRequires: bash
-
-%description -n isocut
-a building tool for ISO cutting
-
-%prep
-%setup -c
-rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/aarch64/normal.xml
-cp %{SOURCE1} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/aarch64/normal.xml
-rm -rf  %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/normal.xml
-cp %{SOURCE2} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/normal.xml
-rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml
-cp %{SOURCE3} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml
-cd %{_builddir}/%{name}-%{version}/%{name}
-%autopatch -p1
-
-%install
-mkdir -p %{buildroot}/opt/
-mkdir -p %{buildroot}/opt/oemaker
-mkdir -p %{buildroot}/opt/oemaker/config
-mkdir -p %{buildroot}/opt/oemaker/config/x86_64
-mkdir -p %{buildroot}/opt/oemaker/config/aarch64
-mkdir -p %{buildroot}/opt/oemaker/docs
-mkdir -p %{buildroot}/%{_bindir}
-mkdir -p %{buildroot}/%{_sysconfdir}/isocut
-chmod 750 %{buildroot}/%{_sysconfdir}/isocut
-
-install -m 700 %{name}/isomaker/oemaker.sh %{buildroot}/opt/oemaker/oemaker.sh
-install -m 700 %{name}/isomaker/oemaker.sh %{buildroot}/%{_bindir}/oemaker
-install -m 700 %{name}/isomaker/make_debug.sh %{buildroot}/opt/oemaker/make_debug.sh
-install -m 700 %{name}/isomaker/img_repo.sh %{buildroot}/opt/oemaker/img_repo.sh
-install -m 700 %{name}/isomaker/init.sh %{buildroot}/opt/oemaker/init.sh
-install -m 700 %{name}/isomaker/iso.sh %{buildroot}/opt/oemaker/iso.sh
-install -m 700 %{name}/isomaker/rpm.sh %{buildroot}/opt/oemaker/rpm.sh
-install -m 400 %{name}/isomaker/config/rpmlist.xml %{buildroot}/opt/oemaker/config/rpmlist.xml
-install -m 400 %{name}/isomaker/config/x86_64/* %{buildroot}/opt/oemaker/config/x86_64/
-install -m 400 %{name}/isomaker/config/aarch64/* %{buildroot}/opt/oemaker/config/aarch64/
-install -m 700 %{name}/isomaker/docs/* %{buildroot}/opt/oemaker/docs/
-cp -a %{name}/isomaker/80-openeuler %{buildroot}/opt/oemaker/
-
-
-install -m 550 %{name}/isocut/isocut.py %{buildroot}/%{_bindir}/isocut
-install -m 600 %{name}/isocut/config/repodata.template %{buildroot}/%{_sysconfdir}/isocut/
-
-%if 0%{?efi_aa64}
-    install -m 600 %{name}/isocut/config/aarch64/rpmlist %{buildroot}/%{_sysconfdir}/isocut/
-    install -m 600 %{name}/isocut/config/aarch64/anaconda-ks.cfg %{buildroot}/%{_sysconfdir}/isocut/
-%endif
-
-%if 0%{?efi_x64}
-    install -m 600 %{name}/isocut/config/x86_64/rpmlist %{buildroot}/%{_sysconfdir}/isocut/
-    install -m 600 %{name}/isocut/config/x86_64/anaconda-ks.cfg %{buildroot}/%{_sysconfdir}/isocut/
-%endif
-
-%pre
-
-%post
-
-%preun
-
-%postun
-
-%postun -n isocut
-if [ "$1" = "0" ]; then
-  rm -rf %{_sysconfdir}/isocut/*
-fi
-
-%files
-%defattr(-,root,root)
-%dir /opt
-%dir /opt/oemaker
-/opt/oemaker/*
-%{_bindir}/oemaker
-
-%files -n isocut
-%defattr(-,root,root)
-%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/repodata.template
-%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/rpmlist
-%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/isocut/anaconda-ks.cfg
-%{_bindir}/isocut
-%dir %{_sysconfdir}/isocut
-%{_sysconfdir}/isocut/*
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT/*
-rm -rf %{buildroot}
-rm -rf $RPM_BUILD_DIR/%{name}
-
-%changelog
-* Wed May 12 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-3
-- ID:NA
-- SUG:NA
-- DESC: bugfix I3QY98
-
-* Mon Apr 26 2021 lingsheng <lingsheng@huawei.com> - 2.0.0-2
-- ID:NA
-- SUG:NA
-- DESC: add openal-soft-devel to rpmlist exclude
-
-* Wed Apr 7 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-1
-- ID:NA
-- SUG:NA
-- DESC: change for issue I3DJJW
-
-* Wed Apr 7 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.2-6
-- ID:NA
-- SUG:NA
-- DESC: add rpms to rpmlist which will be deleted from iso
-
-* Sat Mar 13 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.2-5
-- ID:NA
-- SUG:NA
-- DESC: fix bug I3B7CH
-
-* Thu Mar 11 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.2-4
-- ID:NA
-- SUG:NA
-- DESC: delete stratovirt from xml file
-
-* Thu Mar 01 2021 Chen Qun <kuhn.chenqun@huawei.com> - 1.1.2-2
-- ID:NA
-- SUG:NA
-- DESC: change method of creating source iso
-
-* Thu Mar 01 2021 Chen Qun <kuhn.chenqun@huawei.com> - 1.1.2-2
-- ID:NA
-- SUG:NA
-- DESC: add stratovirt in virtualization-hypervisor group
-
-* Thu Feb 25 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.2-1
-- ID:NA
-- SUG:NA
-- DESC:upgrade version
-
-* Mon Feb 08 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.1-1
-- ID:NA
-- SUG:NA
-- DESC:upgrade version
-
-* Thu Oct 15 2020 zhuchunyi <zhuchunyi@huawei.com> - 1.0.1-1
-- ID:NA
-- SUG:NA
-- DESC:upgrade version
-
-* Tue Sep 29 2020 zhuchunyi <zhuchunyi@huawei.com> - 1.0.0-2
-- ID:NA
-- SUG:NA
-- DESC:change Source format to URL
-
-* Sat Jul 25 2020 zhuchunyi <zhuchunyi@huawei.com> - 1.0.0-1
-- ID:NA
-- SUG:NA
-- DESC:package init

0001-rename-source-iso.patch Deleted

@@ -1,34 +0,0 @@
-From e11a1ff002fdc7aab81f40b99fcea2fc86eba85b Mon Sep 17 00:00:00 2001
-From: miao_kaibo <miaokaibo@outlook.com>
-Date: Fri, 2 Apr 2021 10:23:47 +0800
-Subject: [PATCH] rename source iso
-
----
- isomaker/init.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/isomaker/init.sh b/isomaker/init.sh
-index f708555..2603bfb 100755
---- a/isomaker/init.sh
-+++ b/isomaker/init.sh
-@@ -112,7 +112,7 @@ function global_var_init()
-         DBG_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-debug-${ARCH}-dvd.iso"
-         EVE_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-everything-${ARCH}-dvd.iso"
-         EVE_DEBUG_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-everything-debug-${ARCH}-dvd.iso"
--        EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-everything-source-dvd.iso"
-+        EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-source-dvd.iso"
-         NETINST_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-netinst-${ARCH}-dvd.iso"
-     else
-         RELEASE_NAME="${PRODUCT}-${VERSION}-${ARCH}"
-@@ -121,7 +121,7 @@ function global_var_init()
-         DBG_ISO_NAME="${PRODUCT}-${VERSION}-debug-${ARCH}-dvd.iso"
-         EVE_ISO_NAME="${PRODUCT}-${VERSION}-everything-${ARCH}-dvd.iso"
-         EVE_DEBUG_ISO_NAME="${PRODUCT}-${VERSION}-everything-debug-${ARCH}-dvd.iso"
--        EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-everything-source-dvd.iso"
-+        EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-source-dvd.iso"
-         NETINST_ISO_NAME="${PRODUCT}-${VERSION}-netinst-${ARCH}-dvd.iso"
-     fi
- 
--- 
-2.30.0
-

0002-bugfix-I3QY98.patch Deleted

@@ -1,44 +0,0 @@
-From 1907bdefd7fc8c4e1ef2db78d3e38dc3d6b6a32c Mon Sep 17 00:00:00 2001
-From: miao_kaibo <miaokaibo@outlook.com>
-Date: Wed, 12 May 2021 03:34:44 +0000
-Subject: [PATCH] bugfix I3QY98
-
----
- isomaker/rpm.sh | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh
-index e5fad1f..e3feaab 100755
---- a/isomaker/rpm.sh
-+++ b/isomaker/rpm.sh
-@@ -165,8 +165,11 @@ function get_everything_rpms()
-     if [ -s parsed_rpmlist_conflict ];then
-         for rpmname in $(cat parsed_rpmlist_conflict)
-         do
--            sed -i "/^${rpmname}\./d" ava_every_lst
--            echo "${rpmname}" >> conflict_list
-+            cat ava_every_lst | grep "^${rpmname}\."
-+            if [ $? -eq 0 ];then
-+                sed -i "/^${rpmname}\./d" ava_every_lst
-+                echo "${rpmname}" >> conflict_list
-+            fi
-         done
-     fi 
-     parse_rpmlist_xml "everything_conflict"
-@@ -174,8 +177,11 @@ function get_everything_rpms()
-     if [ -s parsed_rpmlist_everything_conflict ];then
-         for rpmname in $(cat parsed_rpmlist_everything_conflict)
-         do
--            sed -i "/^${rpmname}\./d" ava_every_lst
--            echo "${rpmname}" >> conflict_list
-+            cat ava_every_lst | grep "^${rpmname}\."
-+            if [ $? -eq 0 ];then
-+                sed -i "/^${rpmname}\./d" ava_every_lst
-+                echo "${rpmname}" >> conflict_list
-+            fi
-         done
-     fi 
- }
--- 
-1.8.3.1
-

_service:tar_scm_kernel_repo:0001-rename-source-iso.patch Added

@@ -0,0 +1,34 @@
+From e11a1ff002fdc7aab81f40b99fcea2fc86eba85b Mon Sep 17 00:00:00 2001
+From: miao_kaibo <miaokaibo@outlook.com>
+Date: Fri, 2 Apr 2021 10:23:47 +0800
+Subject: [PATCH] rename source iso
+
+---
+ isomaker/init.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/isomaker/init.sh b/isomaker/init.sh
+index f708555..2603bfb 100755
+--- a/isomaker/init.sh
++++ b/isomaker/init.sh
+@@ -112,7 +112,7 @@ function global_var_init()
+         DBG_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-debug-${ARCH}-dvd.iso"
+         EVE_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-everything-${ARCH}-dvd.iso"
+         EVE_DEBUG_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-everything-debug-${ARCH}-dvd.iso"
+-        EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-everything-source-dvd.iso"
++        EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-source-dvd.iso"
+         NETINST_ISO_NAME="${PRODUCT}-${VERSION}-${RELEASE}-netinst-${ARCH}-dvd.iso"
+     else
+         RELEASE_NAME="${PRODUCT}-${VERSION}-${ARCH}"
+@@ -121,7 +121,7 @@ function global_var_init()
+         DBG_ISO_NAME="${PRODUCT}-${VERSION}-debug-${ARCH}-dvd.iso"
+         EVE_ISO_NAME="${PRODUCT}-${VERSION}-everything-${ARCH}-dvd.iso"
+         EVE_DEBUG_ISO_NAME="${PRODUCT}-${VERSION}-everything-debug-${ARCH}-dvd.iso"
+-        EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-everything-source-dvd.iso"
++        EVE_SRC_ISO_NAME="${PRODUCT}-${VERSION}-source-dvd.iso"
+         NETINST_ISO_NAME="${PRODUCT}-${VERSION}-netinst-${ARCH}-dvd.iso"
+     fi
+ 
+-- 
+2.30.0
+

_service:tar_scm_kernel_repo:0002-bugfix-I3QY98.patch Added

@@ -0,0 +1,44 @@
+From 1907bdefd7fc8c4e1ef2db78d3e38dc3d6b6a32c Mon Sep 17 00:00:00 2001
+From: miao_kaibo <miaokaibo@outlook.com>
+Date: Wed, 12 May 2021 03:34:44 +0000
+Subject: [PATCH] bugfix I3QY98
+
+---
+ isomaker/rpm.sh | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh
+index e5fad1f..e3feaab 100755
+--- a/isomaker/rpm.sh
++++ b/isomaker/rpm.sh
+@@ -165,8 +165,11 @@ function get_everything_rpms()
+     if [ -s parsed_rpmlist_conflict ];then
+         for rpmname in $(cat parsed_rpmlist_conflict)
+         do
+-            sed -i "/^${rpmname}\./d" ava_every_lst
+-            echo "${rpmname}" >> conflict_list
++            cat ava_every_lst | grep "^${rpmname}\."
++            if [ $? -eq 0 ];then
++                sed -i "/^${rpmname}\./d" ava_every_lst
++                echo "${rpmname}" >> conflict_list
++            fi
+         done
+     fi 
+     parse_rpmlist_xml "everything_conflict"
+@@ -174,8 +177,11 @@ function get_everything_rpms()
+     if [ -s parsed_rpmlist_everything_conflict ];then
+         for rpmname in $(cat parsed_rpmlist_everything_conflict)
+         do
+-            sed -i "/^${rpmname}\./d" ava_every_lst
+-            echo "${rpmname}" >> conflict_list
++            cat ava_every_lst | grep "^${rpmname}\."
++            if [ $? -eq 0 ];then
++                sed -i "/^${rpmname}\./d" ava_every_lst
++                echo "${rpmname}" >> conflict_list
++            fi
+         done
+     fi 
+ }
+-- 
+1.8.3.1
+

README.en.md Deleted

@@ -1,40 +0,0 @@
-# oemaker
-
-#### Description
-
-`oemaker` is a building tool for making DVD iso, include standard iso, debug iso, source iso, everything iso, everything debug iso, everything source and netinst iso.
-`oemaker` uses local arch when building, did not support cross building.
-currently, `oemaker` support the arch of aarch64 and x86_64 for iso making.
-
-#### Installation
-
-To install `oemaker`, you can use `rpm` or `dnf` package manager command with openEuler repository.
-
-Install oemaker with dnf
-```sh
-dnf install -y oemaker
-```
-
-#### Instructions
-
-Generally, the disk space is more than 50g
-
-#### Contribution
-
-oemaker <font color=#0000FF >_[-h] [-t Type] [-p Product] [-v Version] [-r RELEASE] [-s REPOSITORY]_</font>
-
-    optional arguments:
-    -t Type
-       ISO Type include standard debug source everything everything_debug everything_src and netinst
-
-    -p Product
-       Product Name, such as: openEuler
-
-    -v Version
-       version identifier
-
-    -r RELEASE
-       release information
-
-    -s REPOSITORY
-       source dnf repository address link(may be listed multiple times)

README.md Deleted

_service Added

_service:tar_scm_kernel_repo:README.en.md Added

@@ -0,0 +1,40 @@
+# oemaker
+
+#### Description
+
+`oemaker` is a building tool for making DVD iso, include standard iso, debug iso, source iso, everything iso, everything debug iso, everything source and netinst iso.
+`oemaker` uses local arch when building, did not support cross building.
+currently, `oemaker` support the arch of aarch64 and x86_64 for iso making.
+
+#### Installation
+
+To install `oemaker`, you can use `rpm` or `dnf` package manager command with openEuler repository.
+
+Install oemaker with dnf
+```sh
+dnf install -y oemaker
+```
+
+#### Instructions
+
+Generally, the disk space is more than 50g
+
+#### Contribution
+
+oemaker <font color=#0000FF >_[-h] [-t Type] [-p Product] [-v Version] [-r RELEASE] [-s REPOSITORY]_</font>
+
+    optional arguments:
+    -t Type
+       ISO Type include standard debug source everything everything_debug everything_src and netinst
+
+    -p Product
+       Product Name, such as: openEuler
+
+    -v Version
+       version identifier
+
+    -r RELEASE
+       release information
+
+    -s REPOSITORY
+       source dnf repository address link(may be listed multiple times)

_service:tar_scm_kernel_repo:README.md Added

_service:tar_scm_kernel_repo:normal_aarch64.xml Added

@@ -0,0 +1,1668 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE comps
+  PUBLIC '-//openEuler//DTD Comps info//EN'
+  'comps.dtd'>
+<comps>
+  <group>
+    <id>additional-devel</id>
+    <name>Additional Development</name>
+    <name xml:lang="zh_CN">附加开发</name>
+    <description>Additional development headers and libraries for building open-source applications.</description>
+    <description xml:lang="zh_CN">用于构建开源应用程序的附加开发标头及程序可。</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">atlas-devel</packagereq>
+      <packagereq type="mandatory">audit-libs-devel</packagereq>
+      <packagereq type="mandatory">bzip2-devel</packagereq>
+      <packagereq type="mandatory">c-ares-devel</packagereq>
+      <packagereq type="mandatory">cyrus-sasl-devel</packagereq>
+      <packagereq type="mandatory">e2fsprogs-devel</packagereq>
+      <packagereq type="mandatory">elfutils-devel</packagereq>
+      <packagereq type="mandatory">elfutils-libelf-devel</packagereq>
+      <packagereq type="mandatory">expat-devel</packagereq>
+      <packagereq type="mandatory">fuse3-devel</packagereq>
+      <packagereq type="mandatory">gmp-devel</packagereq>
+      <packagereq type="mandatory">lksctp-tools-devel</packagereq>
+      <packagereq type="mandatory">iptables-devel</packagereq>
+      <packagereq type="mandatory">libacl-devel</packagereq>
+      <packagereq type="mandatory">libaio-devel</packagereq>
+      <packagereq type="mandatory">libattr-devel</packagereq>
+      <packagereq type="mandatory">libblkid-devel</packagereq>
+      <packagereq type="mandatory">libcap-devel</packagereq>
+      <packagereq type="mandatory">libcap-ng-devel</packagereq>
+      <packagereq type="mandatory">libcurl-devel</packagereq>
+      <packagereq type="mandatory">libffi-devel</packagereq>
+      <packagereq type="mandatory">libgcrypt-devel</packagereq>
+      <packagereq type="mandatory">libhugetlbfs-devel</packagereq>
+      <packagereq type="mandatory">libnl3-devel</packagereq>
+      <packagereq type="mandatory">libselinux-devel</packagereq>
+      <packagereq type="mandatory">libusbx-devel</packagereq>
+      <packagereq type="mandatory">libuuid-devel</packagereq>
+      <packagereq type="mandatory">lksctp-tools-devel</packagereq>
+      <packagereq type="mandatory">lz4</packagereq>
+      <packagereq type="mandatory">lz4-devel</packagereq>
+      <packagereq type="mandatory">lzo</packagereq>
+      <packagereq type="mandatory">lzo-devel</packagereq>
+      <packagereq type="mandatory">numactl-devel</packagereq>
+      <packagereq type="mandatory">pciutils-devel</packagereq>
+      <packagereq type="mandatory">pcre-devel</packagereq>
+      <packagereq type="mandatory">polkit-devel</packagereq>
+      <packagereq type="mandatory">popt-devel</packagereq>
+      <packagereq type="mandatory">rdma-core-devel</packagereq>
+      <packagereq type="mandatory">readline-devel</packagereq>
+      <packagereq type="mandatory">sqlite-devel</packagereq>
+      <packagereq type="mandatory">systemd-devel</packagereq>
+      <packagereq type="mandatory">tcl-devel</packagereq>
+      <packagereq type="mandatory">xfsprogs-devel</packagereq>
+      <packagereq type="mandatory">xz-devel</packagereq>
+      <packagereq type="mandatory">SDL-devel</packagereq>
+      <packagereq type="mandatory">alsa-lib-devel</packagereq>
+      <packagereq type="mandatory">binutils-devel</packagereq>
+      <packagereq type="mandatory">boost-devel</packagereq>
+      <packagereq type="mandatory">dbus-glib-devel</packagereq>
+      <packagereq type="mandatory">gd-devel</packagereq>
+      <packagereq type="mandatory">gnutls-devel</packagereq>
+      <packagereq type="mandatory">gpm-devel</packagereq>
+      <packagereq type="mandatory">gstreamer1-devel</packagereq>
+      <packagereq type="mandatory">gstreamer1-plugins-base-devel</packagereq>
+      <packagereq type="mandatory">gvfs-devel</packagereq>
+      <packagereq type="mandatory">hunspell-devel</packagereq>
+      <packagereq type="mandatory">java-1.8.0-openjdk-devel</packagereq>
+      <packagereq type="mandatory">libXau-devel</packagereq>
+      <packagereq type="mandatory">libXaw-devel</packagereq>
+      <packagereq type="mandatory">libXinerama-devel</packagereq>
+      <packagereq type="mandatory">libXmu-devel</packagereq>
+      <packagereq type="mandatory">libXrandr-devel</packagereq>
+      <packagereq type="mandatory">libcanberra-devel</packagereq>
+      <packagereq type="mandatory">libdrm-devel</packagereq>
+      <packagereq type="mandatory">libnotify-devel</packagereq>
+      <packagereq type="mandatory">libpfm-devel</packagereq>
+      <packagereq type="mandatory">libpq-devel</packagereq>
+      <packagereq type="mandatory">librsvg2-devel</packagereq>
+      <packagereq type="mandatory">libsoup-devel</packagereq>
+      <packagereq type="mandatory">libssh-devel</packagereq>
+      <packagereq type="mandatory">libtiff-devel</packagereq>
+      <packagereq type="mandatory">libxslt-devel</packagereq>
+      <packagereq type="mandatory">mariadb-devel</packagereq>
+      <packagereq type="mandatory">mpfr-devel</packagereq>
+      <packagereq type="mandatory">net-snmp-devel</packagereq>
+      <packagereq type="mandatory">newt-devel</packagereq>
+      <packagereq type="mandatory">openscap-devel</packagereq>
+      <packagereq type="mandatory">papi-devel</packagereq>
+      <packagereq type="mandatory">protobuf-c</packagereq>
+      <packagereq type="mandatory">sane-backends-devel</packagereq>
+      <packagereq type="mandatory">slang-devel</packagereq>
+      <packagereq type="mandatory">startup-notification-devel</packagereq>
+      <packagereq type="mandatory">tbb-devel</packagereq>
+      <packagereq type="mandatory">tk-devel</packagereq>
+      <packagereq type="mandatory">unixODBC-devel</packagereq>
+      <packagereq type="mandatory">xorg-x11-proto-devel</packagereq>
+      <packagereq type="optional">flatpak</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>anaconda-tools</id>
+    <name>Anaconda tools</name>
+    <name xml:lang="zh_CN">Anaconda 工具</name>
+    <description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">lorax</packagereq>
+      <packagereq type="mandatory">chrony</packagereq>
+      <packagereq type="mandatory">cryptsetup</packagereq>
+      <packagereq type="mandatory">device-mapper-multipath</packagereq>
+      <packagereq type="mandatory">dosfstools</packagereq>
+      <packagereq type="mandatory">dracut-network</packagereq>
+      <packagereq type="mandatory">e2fsprogs</packagereq>
+      <packagereq type="mandatory">efibootmgr</packagereq>
+      <packagereq type="mandatory">fcoe-utils</packagereq>
+      <packagereq type="mandatory">firewalld</packagereq>
+      <packagereq type="mandatory">gfs2-utils</packagereq>
+      <packagereq type="mandatory">glibc-all-langpacks</packagereq>
+      <packagereq type="mandatory">grub2-efi-aa64</packagereq>
+      <packagereq type="mandatory">grub2-efi-aa64-cdboot</packagereq>
+      <packagereq type="mandatory">grub2-tools</packagereq>
+      <packagereq type="mandatory">grub2-tools-extra</packagereq>
+      <packagereq type="mandatory">iscsi-initiator-utils</packagereq>
+      <packagereq type="mandatory">lvm2</packagereq>
+      <packagereq type="mandatory">mdadm</packagereq>
+      <packagereq type="mandatory">realmd</packagereq>
+      <packagereq type="mandatory">shim-aa64</packagereq>
+      <packagereq type="mandatory">teamd</packagereq>
+      <packagereq type="mandatory">tmux</packagereq>
+      <packagereq type="mandatory">xfsprogs</packagereq>
+      <packagereq type="mandatory">authselect-compat</packagereq>
+      <packagereq type="mandatory">kdump-anaconda-addon</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>base</id>
+    <name>Base</name>
+    <name xml:lang="zh_CN">基本</name>
+    <description>The standard installation.</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">acl</packagereq>
+      <packagereq type="mandatory">at</packagereq>
+      <packagereq type="mandatory">attr</packagereq>
+      <packagereq type="mandatory">bc</packagereq>
+      <packagereq type="mandatory">cpio</packagereq>
+      <packagereq type="mandatory">crontabs</packagereq>
+      <packagereq type="mandatory">cyrus-sasl-plain</packagereq>
+      <packagereq type="mandatory">dbus</packagereq>
+      <packagereq type="mandatory">ed</packagereq>
+      <packagereq type="mandatory">file</packagereq>
+      <packagereq type="mandatory">iptstate</packagereq>
+      <packagereq type="mandatory">irqbalance</packagereq>
+      <packagereq type="mandatory">kpatch</packagereq>
+      <packagereq type="mandatory">logrotate</packagereq>
+      <packagereq type="mandatory">lsof</packagereq>
+      <packagereq type="mandatory">net-tools</packagereq>
+      <packagereq type="mandatory">pciutils</packagereq>
+      <packagereq type="mandatory">psacct</packagereq>
+      <packagereq type="mandatory">quota</packagereq>
+      <packagereq type="mandatory">openEuler-release</packagereq>
+      <packagereq type="mandatory">openEuler-performance</packagereq>
+      <packagereq type="mandatory">openEuler-latest-release</packagereq>
+      <packagereq type="mandatory">sudo</packagereq>
+      <packagereq type="mandatory">symlinks</packagereq>
+      <packagereq type="mandatory">systemd-udev</packagereq>
+      <packagereq type="mandatory">tar</packagereq>
+      <packagereq type="mandatory">tree</packagereq>
+      <packagereq type="mandatory">util-linux-user</packagereq>
+      <packagereq type="default">bash-completion</packagereq>
+      <packagereq type="default">bpftool</packagereq>
+      <packagereq type="default">bzip2</packagereq>
+      <packagereq type="default">chrony</packagereq>
+      <packagereq type="default">cockpit</packagereq>
+      <packagereq type="default">cryptsetup</packagereq>
+      <packagereq type="default">dos2unix</packagereq>
+      <packagereq type="default">dosfstools</packagereq>
+      <packagereq type="default">ethtool</packagereq>
+      <packagereq type="default">gnupg2</packagereq>
+      <packagereq type="default">libstoragemgmt</packagereq>
+      <packagereq type="default">lvm2</packagereq>
+      <packagereq type="default">mailcap</packagereq>
+      <packagereq type="default">man-pages</packagereq>
+      <packagereq type="default">mdadm</packagereq>
+      <packagereq type="default">mlocate</packagereq>
+      <packagereq type="default">mtr</packagereq>
+      <packagereq type="default">nano</packagereq>
+      <packagereq type="default">realmd</packagereq>
+      <packagereq type="default">rng-tools</packagereq>
+      <packagereq type="default">rsync</packagereq>
+      <packagereq type="default">smartmontools</packagereq>
+      <packagereq type="default">sssd</packagereq>
+      <packagereq type="default">strace</packagereq>

_service:tar_scm_kernel_repo:normal_x86_64.xml Added

@@ -0,0 +1,1670 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE comps
+  PUBLIC '-//openEuler//DTD Comps info//EN'
+  'comps.dtd'>
+<comps>
+  <group>
+    <id>additional-devel</id>
+    <name>Additional Development</name>
+    <name xml:lang="zh_CN">附加开发</name>
+    <description>Additional development headers and libraries for building open-source applications.</description>
+    <description xml:lang="zh_CN">用于构建开源应用程序的附加开发标头及程序可。</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">atlas-devel</packagereq>
+      <packagereq type="mandatory">audit-libs-devel</packagereq>
+      <packagereq type="mandatory">bzip2-devel</packagereq>
+      <packagereq type="mandatory">c-ares-devel</packagereq>
+      <packagereq type="mandatory">cyrus-sasl-devel</packagereq>
+      <packagereq type="mandatory">e2fsprogs-devel</packagereq>
+      <packagereq type="mandatory">elfutils-devel</packagereq>
+      <packagereq type="mandatory">elfutils-libelf-devel</packagereq>
+      <packagereq type="mandatory">expat-devel</packagereq>
+      <packagereq type="mandatory">fuse3-devel</packagereq>
+      <packagereq type="mandatory">gmp-devel</packagereq>
+      <packagereq type="mandatory">lksctp-tools-devel</packagereq>
+      <packagereq type="mandatory">iptables-devel</packagereq>
+      <packagereq type="mandatory">libacl-devel</packagereq>
+      <packagereq type="mandatory">libaio-devel</packagereq>
+      <packagereq type="mandatory">libattr-devel</packagereq>
+      <packagereq type="mandatory">libblkid-devel</packagereq>
+      <packagereq type="mandatory">libcap-devel</packagereq>
+      <packagereq type="mandatory">libcap-ng-devel</packagereq>
+      <packagereq type="mandatory">libcurl-devel</packagereq>
+      <packagereq type="mandatory">libffi-devel</packagereq>
+      <packagereq type="mandatory">libgcrypt-devel</packagereq>
+      <packagereq type="mandatory">libhugetlbfs-devel</packagereq>
+      <packagereq type="mandatory">libnl3-devel</packagereq>
+      <packagereq type="mandatory">libselinux-devel</packagereq>
+      <packagereq type="mandatory">libusbx-devel</packagereq>
+      <packagereq type="mandatory">libuuid-devel</packagereq>
+      <packagereq type="mandatory">lksctp-tools-devel</packagereq>
+      <packagereq type="mandatory">lz4</packagereq>
+      <packagereq type="mandatory">lz4-devel</packagereq>
+      <packagereq type="mandatory">lzo</packagereq>
+      <packagereq type="mandatory">lzo-devel</packagereq>
+      <packagereq type="mandatory">numactl-devel</packagereq>
+      <packagereq type="mandatory">pciutils-devel</packagereq>
+      <packagereq type="mandatory">pcre-devel</packagereq>
+      <packagereq type="mandatory">polkit-devel</packagereq>
+      <packagereq type="mandatory">popt-devel</packagereq>
+      <packagereq type="mandatory">rdma-core-devel</packagereq>
+      <packagereq type="mandatory">readline-devel</packagereq>
+      <packagereq type="mandatory">sqlite-devel</packagereq>
+      <packagereq type="mandatory">systemd-devel</packagereq>
+      <packagereq type="mandatory">tcl-devel</packagereq>
+      <packagereq type="mandatory">xfsprogs-devel</packagereq>
+      <packagereq type="mandatory">xz-devel</packagereq>
+      <packagereq type="mandatory">SDL-devel</packagereq>
+      <packagereq type="mandatory">alsa-lib-devel</packagereq>
+      <packagereq type="mandatory">binutils-devel</packagereq>
+      <packagereq type="mandatory">boost-devel</packagereq>
+      <packagereq type="mandatory">dbus-glib-devel</packagereq>
+      <packagereq type="mandatory">gd-devel</packagereq>
+      <packagereq type="mandatory">gnutls-devel</packagereq>
+      <packagereq type="mandatory">gpm-devel</packagereq>
+      <packagereq type="mandatory">gstreamer1-devel</packagereq>
+      <packagereq type="mandatory">gstreamer1-plugins-base-devel</packagereq>
+      <packagereq type="mandatory">gvfs-devel</packagereq>
+      <packagereq type="mandatory">hunspell-devel</packagereq>
+      <packagereq type="mandatory">java-1.8.0-openjdk-devel</packagereq>
+      <packagereq type="mandatory">libXau-devel</packagereq>
+      <packagereq type="mandatory">libXaw-devel</packagereq>
+      <packagereq type="mandatory">libXinerama-devel</packagereq>
+      <packagereq type="mandatory">libXmu-devel</packagereq>
+      <packagereq type="mandatory">libXrandr-devel</packagereq>
+      <packagereq type="mandatory">libcanberra-devel</packagereq>
+      <packagereq type="mandatory">libdrm-devel</packagereq>
+      <packagereq type="mandatory">libnotify-devel</packagereq>
+      <packagereq type="mandatory">libpfm-devel</packagereq>
+      <packagereq type="mandatory">libpq-devel</packagereq>
+      <packagereq type="mandatory">librsvg2-devel</packagereq>
+      <packagereq type="mandatory">libsoup-devel</packagereq>
+      <packagereq type="mandatory">libssh-devel</packagereq>
+      <packagereq type="mandatory">libtiff-devel</packagereq>
+      <packagereq type="mandatory">libxslt-devel</packagereq>
+      <packagereq type="mandatory">mariadb-devel</packagereq>
+      <packagereq type="mandatory">mpfr-devel</packagereq>
+      <packagereq type="mandatory">net-snmp-devel</packagereq>
+      <packagereq type="mandatory">newt-devel</packagereq>
+      <packagereq type="mandatory">openscap-devel</packagereq>
+      <packagereq type="mandatory">papi-devel</packagereq>
+      <packagereq type="mandatory">protobuf-c</packagereq>
+      <packagereq type="mandatory">sane-backends-devel</packagereq>
+      <packagereq type="mandatory">slang-devel</packagereq>
+      <packagereq type="mandatory">startup-notification-devel</packagereq>
+      <packagereq type="mandatory">tbb-devel</packagereq>
+      <packagereq type="mandatory">tk-devel</packagereq>
+      <packagereq type="mandatory">unixODBC-devel</packagereq>
+      <packagereq type="mandatory">xorg-x11-proto-devel</packagereq>
+      <packagereq type="optional">flatpak</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>anaconda-tools</id>
+    <name>Anaconda tools</name>
+    <name xml:lang="zh_CN">Anaconda 工具</name>
+    <description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">lorax</packagereq>
+      <packagereq type="mandatory">chrony</packagereq>
+      <packagereq type="mandatory">cryptsetup</packagereq>
+      <packagereq type="mandatory">device-mapper-multipath</packagereq>
+      <packagereq type="mandatory">dosfstools</packagereq>
+      <packagereq type="mandatory">dracut-network</packagereq>
+      <packagereq type="mandatory">e2fsprogs</packagereq>
+      <packagereq type="mandatory">efibootmgr</packagereq>
+      <packagereq type="mandatory">fcoe-utils</packagereq>
+      <packagereq type="mandatory">firewalld</packagereq>
+      <packagereq type="mandatory">gfs2-utils</packagereq>
+      <packagereq type="mandatory">glibc-all-langpacks</packagereq>
+      <packagereq type="mandatory">grub2-efi-x64</packagereq>
+      <packagereq type="mandatory">grub2-efi-x64-cdboot</packagereq>
+      <packagereq type="mandatory">grub2-tools</packagereq>
+      <packagereq type="mandatory">grub2-tools-extra</packagereq>
+      <packagereq type="mandatory">iscsi-initiator-utils</packagereq>
+      <packagereq type="mandatory">lvm2</packagereq>
+      <packagereq type="mandatory">mdadm</packagereq>
+      <packagereq type="mandatory">realmd</packagereq>
+      <packagereq type="mandatory">shim</packagereq>
+      <packagereq type="mandatory">teamd</packagereq>
+      <packagereq type="mandatory">tmux</packagereq>
+      <packagereq type="mandatory">xfsprogs</packagereq>
+      <packagereq type="mandatory">authselect-compat</packagereq>
+      <packagereq type="mandatory">kdump-anaconda-addon</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>base</id>
+    <name>Base</name>
+    <name xml:lang="zh_CN">基本</name>
+    <description>The standard installation.</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">acl</packagereq>
+      <packagereq type="mandatory">at</packagereq>
+      <packagereq type="mandatory">attr</packagereq>
+      <packagereq type="mandatory">bc</packagereq>
+      <packagereq type="mandatory">cpio</packagereq>
+      <packagereq type="mandatory">crontabs</packagereq>
+      <packagereq type="mandatory">cyrus-sasl-plain</packagereq>
+      <packagereq type="mandatory">dbus</packagereq>
+      <packagereq type="mandatory">ed</packagereq>
+      <packagereq type="mandatory">file</packagereq>
+      <packagereq type="mandatory">iptstate</packagereq>
+      <packagereq type="mandatory">irqbalance</packagereq>
+      <packagereq type="mandatory">kpatch</packagereq>
+      <packagereq type="mandatory">logrotate</packagereq>
+      <packagereq type="mandatory">lsof</packagereq>
+      <packagereq type="mandatory">net-tools</packagereq>
+      <packagereq type="mandatory">pciutils</packagereq>
+      <packagereq type="mandatory">psacct</packagereq>
+      <packagereq type="mandatory">quota</packagereq>
+      <packagereq type="mandatory">openEuler-release</packagereq>
+      <packagereq type="mandatory">openEuler-performance</packagereq>
+      <packagereq type="mandatory">openEuler-latest-release</packagereq>
+      <packagereq type="mandatory">sudo</packagereq>
+      <packagereq type="mandatory">symlinks</packagereq>
+      <packagereq type="mandatory">systemd-udev</packagereq>
+      <packagereq type="mandatory">tar</packagereq>
+      <packagereq type="mandatory">tree</packagereq>
+      <packagereq type="mandatory">util-linux-user</packagereq>
+      <packagereq type="default">bash-completion</packagereq>
+      <packagereq type="default">bpftool</packagereq>
+      <packagereq type="default">bzip2</packagereq>
+      <packagereq type="default">chrony</packagereq>
+      <packagereq type="default">cockpit</packagereq>
+      <packagereq type="default">cryptsetup</packagereq>
+      <packagereq type="default">dos2unix</packagereq>
+      <packagereq type="default">dosfstools</packagereq>
+      <packagereq type="default">ethtool</packagereq>
+      <packagereq type="default">gnupg2</packagereq>
+      <packagereq type="default">libstoragemgmt</packagereq>
+      <packagereq type="default">lvm2</packagereq>
+      <packagereq type="default">mailcap</packagereq>
+      <packagereq type="default">man-pages</packagereq>
+      <packagereq type="default">mdadm</packagereq>
+      <packagereq type="default">mlocate</packagereq>
+      <packagereq type="default">mtr</packagereq>
+      <packagereq type="default">nano</packagereq>
+      <packagereq type="default">realmd</packagereq>
+      <packagereq type="default">rng-tools</packagereq>
+      <packagereq type="default">rsync</packagereq>
+      <packagereq type="default">smartmontools</packagereq>
+      <packagereq type="default">sssd</packagereq>
+      <packagereq type="default">strace</packagereq>

_service:tar_scm_kernel_repo:oemaker-2.0.0.tar.gz Added

_service:tar_scm_kernel_repo:oemaker.yaml Added

_service:tar_scm_kernel_repo:rpmlist.xml Added

@@ -0,0 +1,1420 @@
+<?xml version="1.0" encoding="utf-8"?>
+<groups>
+    <packagelist type="conflict">
+        <packagereq>mariadb</packagereq>
+        <packagereq>mariadb-server</packagereq>
+    </packagelist>
+    <packagelist type="everything_conflict">
+        <packagereq>abrt-addon-ccpp</packagereq>
+        <packagereq>podman-help</packagereq>
+        <packagereq>libcmpiCppImpl0</packagereq>
+        <packagereq>libev-libevent-devel</packagereq>
+        <packagereq>mariadb-devel</packagereq>
+        <packagereq>mariadb-test</packagereq>
+        <packagereq>podman-docker</packagereq>
+        <packagereq>python3-unversioned-command</packagereq>
+        <packagereq>python3-abrt-container-addon</packagereq>
+    </packagelist>
+    <packagelist type="exclude">
+        <packagereq>texlive-collection-bibtexextra</packagereq>
+        <packagereq>texlive-collection-mathscience</packagereq>
+        <packagereq>texlive-collection-latexextra</packagereq>
+        <packagereq>texlive-collection-fontsextra</packagereq>
+        <packagereq>texlive-crossrefware</packagereq>
+        <packagereq>texlive-ctanupload</packagereq>
+        <packagereq>texlive-exceltex</packagereq>
+        <packagereq>texlive-latexindent</packagereq>
+        <packagereq>texlive-biblatex-apa</packagereq>
+        <packagereq>texlive-bibtexperllibs</packagereq>
+        <packagereq>texlive-collection-binextra</packagereq>
+        <packagereq>texlive-collection-fontutils</packagereq>
+        <packagereq>texlive-includernw</packagereq>
+        <packagereq>texlive-oldstandard</packagereq>
+        <packagereq>texlive-pdfpc-movie</packagereq>
+        <packagereq>texlive-scheme-full</packagereq>
+        <packagereq>texlive-scheme-gust</packagereq>
+        <packagereq>texlive-scheme-medium</packagereq>
+        <packagereq>texlive-scheme-tetex</packagereq>
+        <packagereq>wildfly-core</packagereq>
+        <packagereq>wildfly-core-javadoc</packagereq>
+        <packagereq>wildfly-core-feature-pack</packagereq>
+        <packagereq>totem</packagereq>
+        <packagereq>gimp</packagereq>
+        <packagereq>python3-nni</packagereq>
+        <packagereq>ceph-mgr-rook</packagereq>
+        <packagereq>ceph-mgr-ssh</packagereq>
+        <packagereq>ceph-mgr-dashboard</packagereq>
+        <packagereq>ceph-mgr-k8sevents</packagereq>
+        <packagereq>dbus-c++-devel</packagereq>
+        <packagereq>gnome-software</packagereq>
+        <packagereq>gnome-software-devel</packagereq>
+        <packagereq>gnome-software-editor</packagereq>
+        <packagereq>gnome-software-help</packagereq>
+        <packagereq>ironjacamar</packagereq>
+        <packagereq>metrics-jdbi</packagereq>
+        <packagereq>nodejs-bunker</packagereq>
+        <packagereq>nodejs-lru-queue</packagereq>
+        <packagereq>nodejs-timers-ext</packagereq>
+        <packagereq>nodejs-grunt-contrib-internal</packagereq>
+        <packagereq>obs-api-testsuite-deps</packagereq>
+        <packagereq>pcp-collector</packagereq>
+        <packagereq>rubygem-activestorage-doc</packagereq>
+        <packagereq>rubygem-pry-nav-doc</packagereq>
+        <packagereq>rubygem-rails</packagereq>
+        <packagereq>rubygem-rspec-help</packagereq>
+        <packagereq>rubygem-rspec-rails-help</packagereq>
+        <packagereq>rubygem-rspec2-doc-</packagereq>
+        <packagereq>rubygem-selenium-webdriver-doc-</packagereq>
+        <packagereq>openal-soft-devel</packagereq>
+    </packagelist>
+    <packagelist type="src_exclude">
+        <packagereq>totem</packagereq>
+        <packagereq>gimp</packagereq>
+    </packagelist>
+    <packagelist type="aarch64">
+        <packagereq>edk2-aarch64</packagereq>
+        <packagereq>grub2-efi-aa64</packagereq>
+        <packagereq>grub2-efi-aa64-modules</packagereq>
+        <packagereq>hisi_hpre</packagereq>
+        <packagereq>hisi_rde</packagereq>
+        <packagereq>hisi_sec2</packagereq>
+        <packagereq>hisi_zip</packagereq>
+        <packagereq>libkae</packagereq>
+        <packagereq>libwd</packagereq>
+        <packagereq>shim-aa64</packagereq>
+        <packagereq>uacce</packagereq>
+    </packagelist>
+    <packagelist type="x86_64">
+        <packagereq>grub2-efi-x64</packagereq>
+        <packagereq>grub2-efi-x64-modules</packagereq>
+        <packagereq>shim</packagereq>
+    </packagelist>
+    <packagelist type="common">
+        <packagereq>abattis-cantarell-fonts</packagereq>
+        <packagereq>abattis-cantarell-fonts-help</packagereq>
+        <packagereq>accountsservice</packagereq>
+        <packagereq>accountsservice-help</packagereq>
+        <packagereq>accountsservice-libs</packagereq>
+        <packagereq>acl</packagereq>
+        <packagereq>acl-help</packagereq>
+        <packagereq>acpid</packagereq>
+        <packagereq>acpid-help</packagereq>
+        <packagereq>adcli</packagereq>
+        <packagereq>adcli-help</packagereq>
+        <packagereq>adobe-mappings-cmap</packagereq>
+        <packagereq>adobe-mappings-cmap-help</packagereq>
+        <packagereq>adobe-mappings-pdf</packagereq>
+        <packagereq>adobe-mappings-pdf-help</packagereq>
+        <packagereq>adwaita-gtk2-theme</packagereq>
+        <packagereq>aide</packagereq>
+        <packagereq>aide-help</packagereq>
+        <packagereq>alsa-firmware</packagereq>
+        <packagereq>alsa-tools-firmware</packagereq>
+        <packagereq>apr</packagereq>
+        <packagereq>apr-help</packagereq>
+        <packagereq>arptables</packagereq>
+        <packagereq>arptables-help</packagereq>
+        <packagereq>arpwatch</packagereq>
+        <packagereq>arpwatch-help</packagereq>
+        <packagereq>asciidoc</packagereq>
+        <packagereq>asciidoc-help</packagereq>
+        <packagereq>at</packagereq>
+        <packagereq>at-help</packagereq>
+        <packagereq>attr</packagereq>
+        <packagereq>attr-help</packagereq>
+        <packagereq>atune</packagereq>
+        <packagereq>atune-client</packagereq>
+        <packagereq>atune-db</packagereq>
+        <packagereq>audiofile</packagereq>
+        <packagereq>audit</packagereq>
+        <packagereq>audit-help</packagereq>
+        <packagereq>audit-libs</packagereq>
+        <packagereq>audit-libs-devel</packagereq>
+        <packagereq>authd</packagereq>
+        <packagereq>authd-help</packagereq>
+        <packagereq>authselect</packagereq>
+        <packagereq>authselect-compat</packagereq>
+        <packagereq>authselect-help</packagereq>
+        <packagereq>authselect-libs</packagereq>
+        <packagereq>authz</packagereq>
+        <packagereq>avahi</packagereq>
+        <packagereq>avahi-autoipd</packagereq>
+        <packagereq>avahi-compat-howl</packagereq>
+        <packagereq>avahi-compat-libdns_sd</packagereq>
+        <packagereq>avahi-dnsconfd</packagereq>
+        <packagereq>avahi-gobject</packagereq>
+        <packagereq>avahi-libs</packagereq>
+        <packagereq>avahi-tools</packagereq>
+        <packagereq>basesystem</packagereq>
+        <packagereq>bash</packagereq>
+        <packagereq>bash-completion</packagereq>
+        <packagereq>bash-completion-help</packagereq>
+        <packagereq>bash-help</packagereq>
+        <packagereq>bc</packagereq>
+        <packagereq>bc-help</packagereq>
+        <packagereq>bind-chroot</packagereq>
+        <packagereq>bind-dyndb-ldap</packagereq>
+        <packagereq>bind-export-libs</packagereq>
+        <packagereq>bind-libs</packagereq>
+        <packagereq>bind-utils</packagereq>
+        <packagereq>binutils</packagereq>
+        <packagereq>binutils-devel</packagereq>
+        <packagereq>binutils-help</packagereq>
+        <packagereq>bison</packagereq>
+        <packagereq>bison-help</packagereq>
+        <packagereq>blas-devel</packagereq>
+        <packagereq>blktrace</packagereq>
+        <packagereq>blktrace-help</packagereq>
+        <packagereq>bluez</packagereq>
+        <packagereq>bluez-help</packagereq>
+        <packagereq>boost-atomic</packagereq>
+        <packagereq>boost-chrono</packagereq>
+        <packagereq>boost-context</packagereq>
+        <packagereq>boost-date-time</packagereq>
+        <packagereq>boost-devel</packagereq>
+        <packagereq>boost-filesystem</packagereq>
+        <packagereq>boost-graph</packagereq>
+        <packagereq>boost-help</packagereq>
+        <packagereq>boost-iostreams</packagereq>
+        <packagereq>boost-locale</packagereq>
+        <packagereq>boost-math</packagereq>
+        <packagereq>boost-program-options</packagereq>
+        <packagereq>boost-python3</packagereq>
+        <packagereq>boost-random</packagereq>
+        <packagereq>boost-regex</packagereq>
+        <packagereq>boost-serialization</packagereq>
+        <packagereq>boost-system</packagereq>
+        <packagereq>boost-test</packagereq>
+        <packagereq>boost-thread</packagereq>
+        <packagereq>boost-timer</packagereq>
+        <packagereq>boost-wave</packagereq>
+        <packagereq>bridge-utils</packagereq>
+        <packagereq>brltty-docs</packagereq>
+        <packagereq>brotli</packagereq>
+        <packagereq>btrfs-progs</packagereq>
+        <packagereq>btrfs-progs-help</packagereq>
+        <packagereq>busybox</packagereq>
+        <packagereq>busybox-help</packagereq>
+        <packagereq>bzip2</packagereq>
+        <packagereq>bzip2-help</packagereq>

normal_aarch64.xml Deleted

@@ -1,1668 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE comps
-  PUBLIC '-//openEuler//DTD Comps info//EN'
-  'comps.dtd'>
-<comps>
-  <group>
-    <id>additional-devel</id>
-    <name>Additional Development</name>
-    <name xml:lang="zh_CN">附加开发</name>
-    <description>Additional development headers and libraries for building open-source applications.</description>
-    <description xml:lang="zh_CN">用于构建开源应用程序的附加开发标头及程序可。</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">atlas-devel</packagereq>
-      <packagereq type="mandatory">audit-libs-devel</packagereq>
-      <packagereq type="mandatory">bzip2-devel</packagereq>
-      <packagereq type="mandatory">c-ares-devel</packagereq>
-      <packagereq type="mandatory">cyrus-sasl-devel</packagereq>
-      <packagereq type="mandatory">e2fsprogs-devel</packagereq>
-      <packagereq type="mandatory">elfutils-devel</packagereq>
-      <packagereq type="mandatory">elfutils-libelf-devel</packagereq>
-      <packagereq type="mandatory">expat-devel</packagereq>
-      <packagereq type="mandatory">fuse3-devel</packagereq>
-      <packagereq type="mandatory">gmp-devel</packagereq>
-      <packagereq type="mandatory">lksctp-tools-devel</packagereq>
-      <packagereq type="mandatory">iptables-devel</packagereq>
-      <packagereq type="mandatory">libacl-devel</packagereq>
-      <packagereq type="mandatory">libaio-devel</packagereq>
-      <packagereq type="mandatory">libattr-devel</packagereq>
-      <packagereq type="mandatory">libblkid-devel</packagereq>
-      <packagereq type="mandatory">libcap-devel</packagereq>
-      <packagereq type="mandatory">libcap-ng-devel</packagereq>
-      <packagereq type="mandatory">libcurl-devel</packagereq>
-      <packagereq type="mandatory">libffi-devel</packagereq>
-      <packagereq type="mandatory">libgcrypt-devel</packagereq>
-      <packagereq type="mandatory">libhugetlbfs-devel</packagereq>
-      <packagereq type="mandatory">libnl3-devel</packagereq>
-      <packagereq type="mandatory">libselinux-devel</packagereq>
-      <packagereq type="mandatory">libusbx-devel</packagereq>
-      <packagereq type="mandatory">libuuid-devel</packagereq>
-      <packagereq type="mandatory">lksctp-tools-devel</packagereq>
-      <packagereq type="mandatory">lz4</packagereq>
-      <packagereq type="mandatory">lz4-devel</packagereq>
-      <packagereq type="mandatory">lzo</packagereq>
-      <packagereq type="mandatory">lzo-devel</packagereq>
-      <packagereq type="mandatory">numactl-devel</packagereq>
-      <packagereq type="mandatory">pciutils-devel</packagereq>
-      <packagereq type="mandatory">pcre-devel</packagereq>
-      <packagereq type="mandatory">polkit-devel</packagereq>
-      <packagereq type="mandatory">popt-devel</packagereq>
-      <packagereq type="mandatory">rdma-core-devel</packagereq>
-      <packagereq type="mandatory">readline-devel</packagereq>
-      <packagereq type="mandatory">sqlite-devel</packagereq>
-      <packagereq type="mandatory">systemd-devel</packagereq>
-      <packagereq type="mandatory">tcl-devel</packagereq>
-      <packagereq type="mandatory">xfsprogs-devel</packagereq>
-      <packagereq type="mandatory">xz-devel</packagereq>
-      <packagereq type="mandatory">SDL-devel</packagereq>
-      <packagereq type="mandatory">alsa-lib-devel</packagereq>
-      <packagereq type="mandatory">binutils-devel</packagereq>
-      <packagereq type="mandatory">boost-devel</packagereq>
-      <packagereq type="mandatory">dbus-glib-devel</packagereq>
-      <packagereq type="mandatory">gd-devel</packagereq>
-      <packagereq type="mandatory">gnutls-devel</packagereq>
-      <packagereq type="mandatory">gpm-devel</packagereq>
-      <packagereq type="mandatory">gstreamer1-devel</packagereq>
-      <packagereq type="mandatory">gstreamer1-plugins-base-devel</packagereq>
-      <packagereq type="mandatory">gvfs-devel</packagereq>
-      <packagereq type="mandatory">hunspell-devel</packagereq>
-      <packagereq type="mandatory">java-1.8.0-openjdk-devel</packagereq>
-      <packagereq type="mandatory">libXau-devel</packagereq>
-      <packagereq type="mandatory">libXaw-devel</packagereq>
-      <packagereq type="mandatory">libXinerama-devel</packagereq>
-      <packagereq type="mandatory">libXmu-devel</packagereq>
-      <packagereq type="mandatory">libXrandr-devel</packagereq>
-      <packagereq type="mandatory">libcanberra-devel</packagereq>
-      <packagereq type="mandatory">libdrm-devel</packagereq>
-      <packagereq type="mandatory">libnotify-devel</packagereq>
-      <packagereq type="mandatory">libpfm-devel</packagereq>
-      <packagereq type="mandatory">libpq-devel</packagereq>
-      <packagereq type="mandatory">librsvg2-devel</packagereq>
-      <packagereq type="mandatory">libsoup-devel</packagereq>
-      <packagereq type="mandatory">libssh-devel</packagereq>
-      <packagereq type="mandatory">libtiff-devel</packagereq>
-      <packagereq type="mandatory">libxslt-devel</packagereq>
-      <packagereq type="mandatory">mariadb-devel</packagereq>
-      <packagereq type="mandatory">mpfr-devel</packagereq>
-      <packagereq type="mandatory">net-snmp-devel</packagereq>
-      <packagereq type="mandatory">newt-devel</packagereq>
-      <packagereq type="mandatory">openscap-devel</packagereq>
-      <packagereq type="mandatory">papi-devel</packagereq>
-      <packagereq type="mandatory">protobuf-c</packagereq>
-      <packagereq type="mandatory">sane-backends-devel</packagereq>
-      <packagereq type="mandatory">slang-devel</packagereq>
-      <packagereq type="mandatory">startup-notification-devel</packagereq>
-      <packagereq type="mandatory">tbb-devel</packagereq>
-      <packagereq type="mandatory">tk-devel</packagereq>
-      <packagereq type="mandatory">unixODBC-devel</packagereq>
-      <packagereq type="mandatory">xorg-x11-proto-devel</packagereq>
-      <packagereq type="optional">flatpak</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>anaconda-tools</id>
-    <name>Anaconda tools</name>
-    <name xml:lang="zh_CN">Anaconda 工具</name>
-    <description/>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">lorax</packagereq>
-      <packagereq type="mandatory">chrony</packagereq>
-      <packagereq type="mandatory">cryptsetup</packagereq>
-      <packagereq type="mandatory">device-mapper-multipath</packagereq>
-      <packagereq type="mandatory">dosfstools</packagereq>
-      <packagereq type="mandatory">dracut-network</packagereq>
-      <packagereq type="mandatory">e2fsprogs</packagereq>
-      <packagereq type="mandatory">efibootmgr</packagereq>
-      <packagereq type="mandatory">fcoe-utils</packagereq>
-      <packagereq type="mandatory">firewalld</packagereq>
-      <packagereq type="mandatory">gfs2-utils</packagereq>
-      <packagereq type="mandatory">glibc-all-langpacks</packagereq>
-      <packagereq type="mandatory">grub2-efi-aa64</packagereq>
-      <packagereq type="mandatory">grub2-efi-aa64-cdboot</packagereq>
-      <packagereq type="mandatory">grub2-tools</packagereq>
-      <packagereq type="mandatory">grub2-tools-extra</packagereq>
-      <packagereq type="mandatory">iscsi-initiator-utils</packagereq>
-      <packagereq type="mandatory">lvm2</packagereq>
-      <packagereq type="mandatory">mdadm</packagereq>
-      <packagereq type="mandatory">realmd</packagereq>
-      <packagereq type="mandatory">shim-aa64</packagereq>
-      <packagereq type="mandatory">teamd</packagereq>
-      <packagereq type="mandatory">tmux</packagereq>
-      <packagereq type="mandatory">xfsprogs</packagereq>
-      <packagereq type="mandatory">authselect-compat</packagereq>
-      <packagereq type="mandatory">kdump-anaconda-addon</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>base</id>
-    <name>Base</name>
-    <name xml:lang="zh_CN">基本</name>
-    <description>The standard installation.</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">acl</packagereq>
-      <packagereq type="mandatory">at</packagereq>
-      <packagereq type="mandatory">attr</packagereq>
-      <packagereq type="mandatory">bc</packagereq>
-      <packagereq type="mandatory">cpio</packagereq>
-      <packagereq type="mandatory">crontabs</packagereq>
-      <packagereq type="mandatory">cyrus-sasl-plain</packagereq>
-      <packagereq type="mandatory">dbus</packagereq>
-      <packagereq type="mandatory">ed</packagereq>
-      <packagereq type="mandatory">file</packagereq>
-      <packagereq type="mandatory">iptstate</packagereq>
-      <packagereq type="mandatory">irqbalance</packagereq>
-      <packagereq type="mandatory">kpatch</packagereq>
-      <packagereq type="mandatory">logrotate</packagereq>
-      <packagereq type="mandatory">lsof</packagereq>
-      <packagereq type="mandatory">net-tools</packagereq>
-      <packagereq type="mandatory">pciutils</packagereq>
-      <packagereq type="mandatory">psacct</packagereq>
-      <packagereq type="mandatory">quota</packagereq>
-      <packagereq type="mandatory">openEuler-release</packagereq>
-      <packagereq type="mandatory">openEuler-performance</packagereq>
-      <packagereq type="mandatory">openEuler-latest-release</packagereq>
-      <packagereq type="mandatory">sudo</packagereq>
-      <packagereq type="mandatory">symlinks</packagereq>
-      <packagereq type="mandatory">systemd-udev</packagereq>
-      <packagereq type="mandatory">tar</packagereq>
-      <packagereq type="mandatory">tree</packagereq>
-      <packagereq type="mandatory">util-linux-user</packagereq>
-      <packagereq type="default">bash-completion</packagereq>
-      <packagereq type="default">bpftool</packagereq>
-      <packagereq type="default">bzip2</packagereq>
-      <packagereq type="default">chrony</packagereq>
-      <packagereq type="default">cockpit</packagereq>
-      <packagereq type="default">cryptsetup</packagereq>
-      <packagereq type="default">dos2unix</packagereq>
-      <packagereq type="default">dosfstools</packagereq>
-      <packagereq type="default">ethtool</packagereq>
-      <packagereq type="default">gnupg2</packagereq>
-      <packagereq type="default">libstoragemgmt</packagereq>
-      <packagereq type="default">lvm2</packagereq>
-      <packagereq type="default">mailcap</packagereq>
-      <packagereq type="default">man-pages</packagereq>
-      <packagereq type="default">mdadm</packagereq>
-      <packagereq type="default">mlocate</packagereq>
-      <packagereq type="default">mtr</packagereq>
-      <packagereq type="default">nano</packagereq>
-      <packagereq type="default">realmd</packagereq>
-      <packagereq type="default">rng-tools</packagereq>
-      <packagereq type="default">rsync</packagereq>
-      <packagereq type="default">smartmontools</packagereq>
-      <packagereq type="default">sssd</packagereq>
-      <packagereq type="default">strace</packagereq>

normal_x86_64.xml Deleted

@@ -1,1670 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE comps
-  PUBLIC '-//openEuler//DTD Comps info//EN'
-  'comps.dtd'>
-<comps>
-  <group>
-    <id>additional-devel</id>
-    <name>Additional Development</name>
-    <name xml:lang="zh_CN">附加开发</name>
-    <description>Additional development headers and libraries for building open-source applications.</description>
-    <description xml:lang="zh_CN">用于构建开源应用程序的附加开发标头及程序可。</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">atlas-devel</packagereq>
-      <packagereq type="mandatory">audit-libs-devel</packagereq>
-      <packagereq type="mandatory">bzip2-devel</packagereq>
-      <packagereq type="mandatory">c-ares-devel</packagereq>
-      <packagereq type="mandatory">cyrus-sasl-devel</packagereq>
-      <packagereq type="mandatory">e2fsprogs-devel</packagereq>
-      <packagereq type="mandatory">elfutils-devel</packagereq>
-      <packagereq type="mandatory">elfutils-libelf-devel</packagereq>
-      <packagereq type="mandatory">expat-devel</packagereq>
-      <packagereq type="mandatory">fuse3-devel</packagereq>
-      <packagereq type="mandatory">gmp-devel</packagereq>
-      <packagereq type="mandatory">lksctp-tools-devel</packagereq>
-      <packagereq type="mandatory">iptables-devel</packagereq>
-      <packagereq type="mandatory">libacl-devel</packagereq>
-      <packagereq type="mandatory">libaio-devel</packagereq>
-      <packagereq type="mandatory">libattr-devel</packagereq>
-      <packagereq type="mandatory">libblkid-devel</packagereq>
-      <packagereq type="mandatory">libcap-devel</packagereq>
-      <packagereq type="mandatory">libcap-ng-devel</packagereq>
-      <packagereq type="mandatory">libcurl-devel</packagereq>
-      <packagereq type="mandatory">libffi-devel</packagereq>
-      <packagereq type="mandatory">libgcrypt-devel</packagereq>
-      <packagereq type="mandatory">libhugetlbfs-devel</packagereq>
-      <packagereq type="mandatory">libnl3-devel</packagereq>
-      <packagereq type="mandatory">libselinux-devel</packagereq>
-      <packagereq type="mandatory">libusbx-devel</packagereq>
-      <packagereq type="mandatory">libuuid-devel</packagereq>
-      <packagereq type="mandatory">lksctp-tools-devel</packagereq>
-      <packagereq type="mandatory">lz4</packagereq>
-      <packagereq type="mandatory">lz4-devel</packagereq>
-      <packagereq type="mandatory">lzo</packagereq>
-      <packagereq type="mandatory">lzo-devel</packagereq>
-      <packagereq type="mandatory">numactl-devel</packagereq>
-      <packagereq type="mandatory">pciutils-devel</packagereq>
-      <packagereq type="mandatory">pcre-devel</packagereq>
-      <packagereq type="mandatory">polkit-devel</packagereq>
-      <packagereq type="mandatory">popt-devel</packagereq>
-      <packagereq type="mandatory">rdma-core-devel</packagereq>
-      <packagereq type="mandatory">readline-devel</packagereq>
-      <packagereq type="mandatory">sqlite-devel</packagereq>
-      <packagereq type="mandatory">systemd-devel</packagereq>
-      <packagereq type="mandatory">tcl-devel</packagereq>
-      <packagereq type="mandatory">xfsprogs-devel</packagereq>
-      <packagereq type="mandatory">xz-devel</packagereq>
-      <packagereq type="mandatory">SDL-devel</packagereq>
-      <packagereq type="mandatory">alsa-lib-devel</packagereq>
-      <packagereq type="mandatory">binutils-devel</packagereq>
-      <packagereq type="mandatory">boost-devel</packagereq>
-      <packagereq type="mandatory">dbus-glib-devel</packagereq>
-      <packagereq type="mandatory">gd-devel</packagereq>
-      <packagereq type="mandatory">gnutls-devel</packagereq>
-      <packagereq type="mandatory">gpm-devel</packagereq>
-      <packagereq type="mandatory">gstreamer1-devel</packagereq>
-      <packagereq type="mandatory">gstreamer1-plugins-base-devel</packagereq>
-      <packagereq type="mandatory">gvfs-devel</packagereq>
-      <packagereq type="mandatory">hunspell-devel</packagereq>
-      <packagereq type="mandatory">java-1.8.0-openjdk-devel</packagereq>
-      <packagereq type="mandatory">libXau-devel</packagereq>
-      <packagereq type="mandatory">libXaw-devel</packagereq>
-      <packagereq type="mandatory">libXinerama-devel</packagereq>
-      <packagereq type="mandatory">libXmu-devel</packagereq>
-      <packagereq type="mandatory">libXrandr-devel</packagereq>
-      <packagereq type="mandatory">libcanberra-devel</packagereq>
-      <packagereq type="mandatory">libdrm-devel</packagereq>
-      <packagereq type="mandatory">libnotify-devel</packagereq>
-      <packagereq type="mandatory">libpfm-devel</packagereq>
-      <packagereq type="mandatory">libpq-devel</packagereq>
-      <packagereq type="mandatory">librsvg2-devel</packagereq>
-      <packagereq type="mandatory">libsoup-devel</packagereq>
-      <packagereq type="mandatory">libssh-devel</packagereq>
-      <packagereq type="mandatory">libtiff-devel</packagereq>
-      <packagereq type="mandatory">libxslt-devel</packagereq>
-      <packagereq type="mandatory">mariadb-devel</packagereq>
-      <packagereq type="mandatory">mpfr-devel</packagereq>
-      <packagereq type="mandatory">net-snmp-devel</packagereq>
-      <packagereq type="mandatory">newt-devel</packagereq>
-      <packagereq type="mandatory">openscap-devel</packagereq>
-      <packagereq type="mandatory">papi-devel</packagereq>
-      <packagereq type="mandatory">protobuf-c</packagereq>
-      <packagereq type="mandatory">sane-backends-devel</packagereq>
-      <packagereq type="mandatory">slang-devel</packagereq>
-      <packagereq type="mandatory">startup-notification-devel</packagereq>
-      <packagereq type="mandatory">tbb-devel</packagereq>
-      <packagereq type="mandatory">tk-devel</packagereq>
-      <packagereq type="mandatory">unixODBC-devel</packagereq>
-      <packagereq type="mandatory">xorg-x11-proto-devel</packagereq>
-      <packagereq type="optional">flatpak</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>anaconda-tools</id>
-    <name>Anaconda tools</name>
-    <name xml:lang="zh_CN">Anaconda 工具</name>
-    <description/>
-    <default>false</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">lorax</packagereq>
-      <packagereq type="mandatory">chrony</packagereq>
-      <packagereq type="mandatory">cryptsetup</packagereq>
-      <packagereq type="mandatory">device-mapper-multipath</packagereq>
-      <packagereq type="mandatory">dosfstools</packagereq>
-      <packagereq type="mandatory">dracut-network</packagereq>
-      <packagereq type="mandatory">e2fsprogs</packagereq>
-      <packagereq type="mandatory">efibootmgr</packagereq>
-      <packagereq type="mandatory">fcoe-utils</packagereq>
-      <packagereq type="mandatory">firewalld</packagereq>
-      <packagereq type="mandatory">gfs2-utils</packagereq>
-      <packagereq type="mandatory">glibc-all-langpacks</packagereq>
-      <packagereq type="mandatory">grub2-efi-x64</packagereq>
-      <packagereq type="mandatory">grub2-efi-x64-cdboot</packagereq>
-      <packagereq type="mandatory">grub2-tools</packagereq>
-      <packagereq type="mandatory">grub2-tools-extra</packagereq>
-      <packagereq type="mandatory">iscsi-initiator-utils</packagereq>
-      <packagereq type="mandatory">lvm2</packagereq>
-      <packagereq type="mandatory">mdadm</packagereq>
-      <packagereq type="mandatory">realmd</packagereq>
-      <packagereq type="mandatory">shim</packagereq>
-      <packagereq type="mandatory">teamd</packagereq>
-      <packagereq type="mandatory">tmux</packagereq>
-      <packagereq type="mandatory">xfsprogs</packagereq>
-      <packagereq type="mandatory">authselect-compat</packagereq>
-      <packagereq type="mandatory">kdump-anaconda-addon</packagereq>
-    </packagelist>
-  </group>
-  <group>
-    <id>base</id>
-    <name>Base</name>
-    <name xml:lang="zh_CN">基本</name>
-    <description>The standard installation.</description>
-    <default>true</default>
-    <uservisible>false</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">acl</packagereq>
-      <packagereq type="mandatory">at</packagereq>
-      <packagereq type="mandatory">attr</packagereq>
-      <packagereq type="mandatory">bc</packagereq>
-      <packagereq type="mandatory">cpio</packagereq>
-      <packagereq type="mandatory">crontabs</packagereq>
-      <packagereq type="mandatory">cyrus-sasl-plain</packagereq>
-      <packagereq type="mandatory">dbus</packagereq>
-      <packagereq type="mandatory">ed</packagereq>
-      <packagereq type="mandatory">file</packagereq>
-      <packagereq type="mandatory">iptstate</packagereq>
-      <packagereq type="mandatory">irqbalance</packagereq>
-      <packagereq type="mandatory">kpatch</packagereq>
-      <packagereq type="mandatory">logrotate</packagereq>
-      <packagereq type="mandatory">lsof</packagereq>
-      <packagereq type="mandatory">net-tools</packagereq>
-      <packagereq type="mandatory">pciutils</packagereq>
-      <packagereq type="mandatory">psacct</packagereq>
-      <packagereq type="mandatory">quota</packagereq>
-      <packagereq type="mandatory">openEuler-release</packagereq>
-      <packagereq type="mandatory">openEuler-performance</packagereq>
-      <packagereq type="mandatory">openEuler-latest-release</packagereq>
-      <packagereq type="mandatory">sudo</packagereq>
-      <packagereq type="mandatory">symlinks</packagereq>
-      <packagereq type="mandatory">systemd-udev</packagereq>
-      <packagereq type="mandatory">tar</packagereq>
-      <packagereq type="mandatory">tree</packagereq>
-      <packagereq type="mandatory">util-linux-user</packagereq>
-      <packagereq type="default">bash-completion</packagereq>
-      <packagereq type="default">bpftool</packagereq>
-      <packagereq type="default">bzip2</packagereq>
-      <packagereq type="default">chrony</packagereq>
-      <packagereq type="default">cockpit</packagereq>
-      <packagereq type="default">cryptsetup</packagereq>
-      <packagereq type="default">dos2unix</packagereq>
-      <packagereq type="default">dosfstools</packagereq>
-      <packagereq type="default">ethtool</packagereq>
-      <packagereq type="default">gnupg2</packagereq>
-      <packagereq type="default">libstoragemgmt</packagereq>
-      <packagereq type="default">lvm2</packagereq>
-      <packagereq type="default">mailcap</packagereq>
-      <packagereq type="default">man-pages</packagereq>
-      <packagereq type="default">mdadm</packagereq>
-      <packagereq type="default">mlocate</packagereq>
-      <packagereq type="default">mtr</packagereq>
-      <packagereq type="default">nano</packagereq>
-      <packagereq type="default">realmd</packagereq>
-      <packagereq type="default">rng-tools</packagereq>
-      <packagereq type="default">rsync</packagereq>
-      <packagereq type="default">smartmontools</packagereq>
-      <packagereq type="default">sssd</packagereq>
-      <packagereq type="default">strace</packagereq>

oemaker-2.0.0.tar.gz Deleted

oemaker.yaml Deleted

rpmlist.xml Deleted

@@ -1,1420 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<groups>
-    <packagelist type="conflict">
-        <packagereq>mariadb</packagereq>
-        <packagereq>mariadb-server</packagereq>
-    </packagelist>
-    <packagelist type="everything_conflict">
-        <packagereq>abrt-addon-ccpp</packagereq>
-        <packagereq>podman-help</packagereq>
-        <packagereq>libcmpiCppImpl0</packagereq>
-        <packagereq>libev-libevent-devel</packagereq>
-        <packagereq>mariadb-devel</packagereq>
-        <packagereq>mariadb-test</packagereq>
-        <packagereq>podman-docker</packagereq>
-        <packagereq>python3-unversioned-command</packagereq>
-        <packagereq>python3-abrt-container-addon</packagereq>
-    </packagelist>
-    <packagelist type="exclude">
-        <packagereq>texlive-collection-bibtexextra</packagereq>
-        <packagereq>texlive-collection-mathscience</packagereq>
-        <packagereq>texlive-collection-latexextra</packagereq>
-        <packagereq>texlive-collection-fontsextra</packagereq>
-        <packagereq>texlive-crossrefware</packagereq>
-        <packagereq>texlive-ctanupload</packagereq>
-        <packagereq>texlive-exceltex</packagereq>
-        <packagereq>texlive-latexindent</packagereq>
-        <packagereq>texlive-biblatex-apa</packagereq>
-        <packagereq>texlive-bibtexperllibs</packagereq>
-        <packagereq>texlive-collection-binextra</packagereq>
-        <packagereq>texlive-collection-fontutils</packagereq>
-        <packagereq>texlive-includernw</packagereq>
-        <packagereq>texlive-oldstandard</packagereq>
-        <packagereq>texlive-pdfpc-movie</packagereq>
-        <packagereq>texlive-scheme-full</packagereq>
-        <packagereq>texlive-scheme-gust</packagereq>
-        <packagereq>texlive-scheme-medium</packagereq>
-        <packagereq>texlive-scheme-tetex</packagereq>
-        <packagereq>wildfly-core</packagereq>
-        <packagereq>wildfly-core-javadoc</packagereq>
-        <packagereq>wildfly-core-feature-pack</packagereq>
-        <packagereq>totem</packagereq>
-        <packagereq>gimp</packagereq>
-        <packagereq>python3-nni</packagereq>
-        <packagereq>ceph-mgr-rook</packagereq>
-        <packagereq>ceph-mgr-ssh</packagereq>
-        <packagereq>ceph-mgr-dashboard</packagereq>
-        <packagereq>ceph-mgr-k8sevents</packagereq>
-        <packagereq>dbus-c++-devel</packagereq>
-        <packagereq>gnome-software</packagereq>
-        <packagereq>gnome-software-devel</packagereq>
-        <packagereq>gnome-software-editor</packagereq>
-        <packagereq>gnome-software-help</packagereq>
-        <packagereq>ironjacamar</packagereq>
-        <packagereq>metrics-jdbi</packagereq>
-        <packagereq>nodejs-bunker</packagereq>
-        <packagereq>nodejs-lru-queue</packagereq>
-        <packagereq>nodejs-timers-ext</packagereq>
-        <packagereq>nodejs-grunt-contrib-internal</packagereq>
-        <packagereq>obs-api-testsuite-deps</packagereq>
-        <packagereq>pcp-collector</packagereq>
-        <packagereq>rubygem-activestorage-doc</packagereq>
-        <packagereq>rubygem-pry-nav-doc</packagereq>
-        <packagereq>rubygem-rails</packagereq>
-        <packagereq>rubygem-rspec-help</packagereq>
-        <packagereq>rubygem-rspec-rails-help</packagereq>
-        <packagereq>rubygem-rspec2-doc-</packagereq>
-        <packagereq>rubygem-selenium-webdriver-doc-</packagereq>
-        <packagereq>openal-soft-devel</packagereq>
-    </packagelist>
-    <packagelist type="src_exclude">
-        <packagereq>totem</packagereq>
-        <packagereq>gimp</packagereq>
-    </packagelist>
-    <packagelist type="aarch64">
-        <packagereq>edk2-aarch64</packagereq>
-        <packagereq>grub2-efi-aa64</packagereq>
-        <packagereq>grub2-efi-aa64-modules</packagereq>
-        <packagereq>hisi_hpre</packagereq>
-        <packagereq>hisi_rde</packagereq>
-        <packagereq>hisi_sec2</packagereq>
-        <packagereq>hisi_zip</packagereq>
-        <packagereq>libkae</packagereq>
-        <packagereq>libwd</packagereq>
-        <packagereq>shim-aa64</packagereq>
-        <packagereq>uacce</packagereq>
-    </packagelist>
-    <packagelist type="x86_64">
-        <packagereq>grub2-efi-x64</packagereq>
-        <packagereq>grub2-efi-x64-modules</packagereq>
-        <packagereq>shim</packagereq>
-    </packagelist>
-    <packagelist type="common">
-        <packagereq>abattis-cantarell-fonts</packagereq>
-        <packagereq>abattis-cantarell-fonts-help</packagereq>
-        <packagereq>accountsservice</packagereq>
-        <packagereq>accountsservice-help</packagereq>
-        <packagereq>accountsservice-libs</packagereq>
-        <packagereq>acl</packagereq>
-        <packagereq>acl-help</packagereq>
-        <packagereq>acpid</packagereq>
-        <packagereq>acpid-help</packagereq>
-        <packagereq>adcli</packagereq>
-        <packagereq>adcli-help</packagereq>
-        <packagereq>adobe-mappings-cmap</packagereq>
-        <packagereq>adobe-mappings-cmap-help</packagereq>
-        <packagereq>adobe-mappings-pdf</packagereq>
-        <packagereq>adobe-mappings-pdf-help</packagereq>
-        <packagereq>adwaita-gtk2-theme</packagereq>
-        <packagereq>aide</packagereq>
-        <packagereq>aide-help</packagereq>
-        <packagereq>alsa-firmware</packagereq>
-        <packagereq>alsa-tools-firmware</packagereq>
-        <packagereq>apr</packagereq>
-        <packagereq>apr-help</packagereq>
-        <packagereq>arptables</packagereq>
-        <packagereq>arptables-help</packagereq>
-        <packagereq>arpwatch</packagereq>
-        <packagereq>arpwatch-help</packagereq>
-        <packagereq>asciidoc</packagereq>
-        <packagereq>asciidoc-help</packagereq>
-        <packagereq>at</packagereq>
-        <packagereq>at-help</packagereq>
-        <packagereq>attr</packagereq>
-        <packagereq>attr-help</packagereq>
-        <packagereq>atune</packagereq>
-        <packagereq>atune-client</packagereq>
-        <packagereq>atune-db</packagereq>
-        <packagereq>audiofile</packagereq>
-        <packagereq>audit</packagereq>
-        <packagereq>audit-help</packagereq>
-        <packagereq>audit-libs</packagereq>
-        <packagereq>audit-libs-devel</packagereq>
-        <packagereq>authd</packagereq>
-        <packagereq>authd-help</packagereq>
-        <packagereq>authselect</packagereq>
-        <packagereq>authselect-compat</packagereq>
-        <packagereq>authselect-help</packagereq>
-        <packagereq>authselect-libs</packagereq>
-        <packagereq>authz</packagereq>
-        <packagereq>avahi</packagereq>
-        <packagereq>avahi-autoipd</packagereq>
-        <packagereq>avahi-compat-howl</packagereq>
-        <packagereq>avahi-compat-libdns_sd</packagereq>
-        <packagereq>avahi-dnsconfd</packagereq>
-        <packagereq>avahi-gobject</packagereq>
-        <packagereq>avahi-libs</packagereq>
-        <packagereq>avahi-tools</packagereq>
-        <packagereq>basesystem</packagereq>
-        <packagereq>bash</packagereq>
-        <packagereq>bash-completion</packagereq>
-        <packagereq>bash-completion-help</packagereq>
-        <packagereq>bash-help</packagereq>
-        <packagereq>bc</packagereq>
-        <packagereq>bc-help</packagereq>
-        <packagereq>bind-chroot</packagereq>
-        <packagereq>bind-dyndb-ldap</packagereq>
-        <packagereq>bind-export-libs</packagereq>
-        <packagereq>bind-libs</packagereq>
-        <packagereq>bind-utils</packagereq>
-        <packagereq>binutils</packagereq>
-        <packagereq>binutils-devel</packagereq>
-        <packagereq>binutils-help</packagereq>
-        <packagereq>bison</packagereq>
-        <packagereq>bison-help</packagereq>
-        <packagereq>blas-devel</packagereq>
-        <packagereq>blktrace</packagereq>
-        <packagereq>blktrace-help</packagereq>
-        <packagereq>bluez</packagereq>
-        <packagereq>bluez-help</packagereq>
-        <packagereq>boost-atomic</packagereq>
-        <packagereq>boost-chrono</packagereq>
-        <packagereq>boost-context</packagereq>
-        <packagereq>boost-date-time</packagereq>
-        <packagereq>boost-devel</packagereq>
-        <packagereq>boost-filesystem</packagereq>
-        <packagereq>boost-graph</packagereq>
-        <packagereq>boost-help</packagereq>
-        <packagereq>boost-iostreams</packagereq>
-        <packagereq>boost-locale</packagereq>
-        <packagereq>boost-math</packagereq>
-        <packagereq>boost-program-options</packagereq>
-        <packagereq>boost-python3</packagereq>
-        <packagereq>boost-random</packagereq>
-        <packagereq>boost-regex</packagereq>
-        <packagereq>boost-serialization</packagereq>
-        <packagereq>boost-system</packagereq>
-        <packagereq>boost-test</packagereq>
-        <packagereq>boost-thread</packagereq>
-        <packagereq>boost-timer</packagereq>
-        <packagereq>boost-wave</packagereq>
-        <packagereq>bridge-utils</packagereq>
-        <packagereq>brltty-docs</packagereq>
-        <packagereq>brotli</packagereq>
-        <packagereq>btrfs-progs</packagereq>
-        <packagereq>btrfs-progs-help</packagereq>
-        <packagereq>busybox</packagereq>
-        <packagereq>busybox-help</packagereq>
-        <packagereq>bzip2</packagereq>
-        <packagereq>bzip2-help</packagereq>