From 9becc3211f01d0720c8db2bd60e2ecceac14e72f Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Thu, 5 Aug 2021 15:28:56 +0800
Subject: [PATCH] add unable install rpms

---
 script/config/unable_install_list  | 33 ++++++++++++++++++++++++++++++
 script/step/make_iso.sh            |  1 +
 script/step/make_iso_everything.sh |  1 +
 3 files changed, 35 insertions(+)

diff --git a/script/config/unable_install_list b/script/config/unable_install_list
index e69de29..d972f0a 100644
--- a/script/config/unable_install_list
+++ b/script/config/unable_install_list
@@ -0,0 +1,33 @@
+mailman
+python3-lazr.config
+python3-lazr.delegates
+oscilloscope
+pacemaker-nagios-plugins-metadata
+protobuf2-emacs-el
+python3-nni
+python3-spec
+texlive-babel-vietnamese
+texlive-biblatex-apa
+texlive-collection-bibtexextra
+texlive-collection-binextra
+texlive-collection-fontsextra
+texlive-oldstandard
+texlive-collection-fontsextra
+texlive-collection-fontutils
+texlive-collection-humanities
+texlive-lexikon
+texlive-collection-langother
+texlive-babel-vietnamese
+texlive-collection-latexextra
+texlive-exceltex
+texlive-collection-mathscience
+texlive-includernw
+texlive-ctanupload
+texlive-latexindent
+texlive-scheme-full
+texlive-scheme-gust
+texlive-scheme-medium
+texlive-scheme-tetex
+vte-devel
+wireless-tools
+wireless-tools-devel
diff --git a/script/step/make_iso.sh b/script/step/make_iso.sh
index 419b22b..d6f299e 100644
--- a/script/step/make_iso.sh
+++ b/script/step/make_iso.sh
@@ -36,6 +36,7 @@ function make_iso_inchroot()
     fi
     yum install oemaker lorax -y -c "${yum_conf}"
     cd /opt/oemaker
+    #sed -i 's/--resolve//g' rpm.sh
     REPOS=`echo "${OBS_STANDARD_REPO_URL} ${OBS_STANDARD_THIRD_REPO_URL}" | sed 's/[ \t]*$//g'`
     set +e
     num=0
diff --git a/script/step/make_iso_everything.sh b/script/step/make_iso_everything.sh
index 94e4178..af918bf 100644
--- a/script/step/make_iso_everything.sh
+++ b/script/step/make_iso_everything.sh
@@ -39,6 +39,7 @@ function make_iso_everything_inchroot()
     
     yum install oemaker lorax -y -c "${yum_conf}"
     cd /opt/oemaker
+    #sed -i 's/--resolve//g' rpm.sh
     rpmsnames=`cat ${UNABLE_INSTALL_LIST}`
     for rpmsname in $rpmsnames
     do
-- 
Gitee