diff --git a/script/config/unable_install_list b/script/config/unable_install_list index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f67610bbaae3e2fd89c8b10c269b57d95823ece0 100644 --- a/script/config/unable_install_list +++ b/script/config/unable_install_list @@ -0,0 +1,6 @@ +deepin-compressor-5.6.9-2.oe1.aarch64.rpm +deepin-desktop-server-2020.03.23-2.oe1.noarch.rpm +kwin-wayland-5.15.4-1.oe1.aarch64.rpm +libqt5-ukui-style-dev-1.0.5-1.oe1.aarch64.rpm +mate-desktop-1.22.2-1.oe1.aarch64.rpm +openbox-kde-3.6.1-12.oe1.noarch.rpm diff --git a/script/step/get_epol_rpms.sh b/script/step/get_epol_rpms.sh index 7c9763588c2a96118debafb51a4929e0a435ae4b..79dddae16c4e58f1f13d6752a2c2794159399266 100644 --- a/script/step/get_epol_rpms.sh +++ b/script/step/get_epol_rpms.sh @@ -46,6 +46,11 @@ function get_epol_rpms_inchroot() yum list --installroot="${tmp_dir}/Packages" --available | awk '{print $1}' | grep -E "noarch|${ARCH}" | grep -v ".src" > ava_epol_lst yumdownloader --installroot="${tmp_dir}/Packages" --destdir="${tmp_dir}/Packages" $(cat ava_epol_lst | tr '\n' ' ') rm -rf ${tmp_dir}/Packages/var + unrpms=`cat ${UNABLE_INSTALL_LIST}` + for unrpm in ${unrpms} + do + rm -rf ${tmp_dir}/Packages/${unrpm} + done createrepo -d ${tmp_dir} sshscp "${tmp_dir}" "${RELEASE_DIR}/main/" if [[ "$ARCH" == "aarch64" ]];then @@ -57,6 +62,10 @@ function get_epol_rpms_inchroot() yum list --installroot="${tmp_source}/Packages" --available | awk '{print $1}' | grep -E "noarch|${ARCH}" | grep -v ".src" > ava_epol_lst yumdownloader --installroot="${tmp_source}/Packages" --destdir="${tmp_source}/Packages" --source $(cat ava_epol_lst | tr '\n' ' ') rm -rf ${tmp_source}/Packages/var + for unrpm in ${unrpms} + do + rm -rf ${tmp_source}/Packages/${unrpm} + done createrepo -d ${tmp_source} sshscp "${tmp_source}" "${RELEASE_DIR}/main/" SSH_CMD="mkdir -p ${RELEASE_DIR}/update/main/source/Packages && createrepo -d ${RELEASE_DIR}/update/main/source" @@ -81,6 +90,10 @@ function get_epol_rpms_inchroot() yum list --installroot="${tmp_dir}/Packages" --available | awk '{print $1}' | grep -E "noarch|${ARCH}" | grep -v ".src" > ava_epol_lst yumdownloader --installroot="${tmp_dir}/Packages" --destdir="${tmp_dir}/Packages" $(cat ava_epol_lst | tr '\n' ' ') rm -rf ${tmp_dir}/Packages/var + for unrpm in ${unrpms} + do + rm -rf ${tmp_dir}/Packages/${unrpm} + done createrepo -d ${tmp_dir} SSH_CMD="mkdir -p ${RELEASE_DIR}/multi_version/${PKG}-${VER}" sshcmd "${SSH_CMD}" @@ -92,6 +105,10 @@ function get_epol_rpms_inchroot() yum list --installroot="${tmp_source}/Packages" --available | awk '{print $1}' | grep -E "noarch|${ARCH}" | grep -v ".src" > ava_epol_lst yumdownloader --installroot="${tmp_source}/Packages" --destdir="${tmp_source}/Packages" --source $(cat ava_epol_lst | tr '\n' ' ') rm -rf ${tmp_source}/Packages/var + for unrpm in ${unrpms} + do + rm -rf ${tmp_source}/Packages/${unrpm} + done createrepo -d ${tmp_source} sshscp "${tmp_source}" "${RELEASE_DIR}/multi_version/${PKG}-${VER}" fi