diff --git a/0001-change-source-iso-method.patch b/0001-change-source-iso-method.patch new file mode 100644 index 0000000000000000000000000000000000000000..582a26715c2f0d797c3049fa480f53ba81c8ddf1 --- /dev/null +++ b/0001-change-source-iso-method.patch @@ -0,0 +1,92 @@ +From d2181a8bd05e2761827f0cc9451992d137828095 Mon Sep 17 00:00:00 2001 +From: miao_kaibo +Date: Wed, 10 Mar 2021 09:16:00 +0800 +Subject: [PATCH] change source iso method + +--- + config/rpmlist.xml | 11 +++++++++++ + rpm.sh | 21 +++++++++++++-------- + 2 files changed, 24 insertions(+), 8 deletions(-) + +diff --git a/config/rpmlist.xml b/config/rpmlist.xml +index d5fcf8a..a6ac01b 100644 +--- a/config/rpmlist.xml ++++ b/config/rpmlist.xml +@@ -32,6 +32,17 @@ + texlive-scheme-gust + texlive-scheme-medium + texlive-scheme-tetex ++ totem ++ gimp ++ python3-nni ++ ceph-mgr-rook ++ ceph-mgr-ssh ++ ceph-mgr-dashboard ++ ceph-mgr-k8sevents ++ ++ ++ totem ++ gimp + + + edk2-aarch64 +diff --git a/rpm.sh b/rpm.sh +index 7e4a7e2..f8cf92e 100755 +--- a/rpm.sh ++++ b/rpm.sh +@@ -154,7 +154,7 @@ function get_everything_rpms() + if [ -s parsed_rpmlist_exclude ];then + for rpmname in $(cat parsed_rpmlist_exclude) + do +- sed -i "/^${rpmname}/d" ava_every_lst ++ sed -i "/^${rpmname}\./d" ava_every_lst + done + fi + if [ -s conflict_list ];then +@@ -165,7 +165,7 @@ 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 ++ sed -i "/^${rpmname}\./d" ava_every_lst + echo "${rpmname}" >> conflict_list + done + fi +@@ -174,7 +174,7 @@ 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 ++ sed -i "/^${rpmname}\./d" ava_every_lst + echo "${rpmname}" >> conflict_list + done + fi +@@ -197,15 +197,20 @@ function everything_rpms_download() + function everything_source_rpms_download() + { + mkdir ${EVERY_SRC_DIR} +- get_everything_rpms +- yumdownloader --resolve --installroot="${BUILD}"/tmp --destdir="${EVERY_SRC_DIR}" --source $(cat ava_every_lst | tr '\n' ' ') ++ yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep ".src" > ava_every_lst ++ parse_rpmlist_xml "src_exclude" ++ cat parsed_rpmlist_src_exclude ++ if [ -s parsed_rpmlist_src_exclude ];then ++ for rpmname in $(cat parsed_rpmlist_src_exclude) ++ do ++ sed -i "/^${rpmname}\./d" ava_every_lst ++ done ++ fi ++ yumdownloader --installroot="${BUILD}"/tmp --destdir="${EVERY_SRC_DIR}" --source $(cat ava_every_lst | tr '\n' ' ') + if [ $? != 0 ] || [ $(ls ${EVERY_SRC_DIR} | wc -l) == 0 ]; then + echo "Download rpms failed!" + exit 133 + fi +- if [ -s conflict_list ];then +- yumdownloader --resolve --installroot="${BUILD}"/tmp --destdir="${EVERY_SRC_DIR}" --source $(cat conflict_list | tr '\n' ' ') +- fi + } + + function everything_debug_rpms_download() +-- +2.27.0 + diff --git a/README.en.md b/README.en.md index 5ca36ccace18ff9d874335acff702ef1a1053c56..9b442e21117e8773c3eafddfb3f70e7cbc9b595d 100644 --- a/README.en.md +++ b/README.en.md @@ -2,7 +2,7 @@ #### 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` 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. diff --git a/oemaker-1.1.1.tar.gz b/oemaker-1.1.1.tar.gz deleted file mode 100644 index 8279d7f2db6aaadd7975a9606350616f59af05cb..0000000000000000000000000000000000000000 Binary files a/oemaker-1.1.1.tar.gz and /dev/null differ diff --git a/oemaker-1.1.2.tar.gz b/oemaker-1.1.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..2cee59f2ac3d83181d3aa777537788299903b62a Binary files /dev/null and b/oemaker-1.1.2.tar.gz differ diff --git a/oemaker.spec b/oemaker.spec index eaca0ae41cdc372672fa8edd7a56466df72d789f..b88a4d8d0a8021543317a1e4565274108f4f43b3 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -2,8 +2,8 @@ Name: oemaker Summary: a duilding tool for making DVD ISO License: Mulan PSL v2 Group: System/Management -Version: 1.1.1 -Release: 2 +Version: 1.1.2 +Release: 3 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch @@ -11,6 +11,7 @@ Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libs Requires: lorax >= 19.6.78-1 Patch0001: add-stratovirt-in-virtualization-group.patch +Patch0002: 0001-change-source-iso-method.patch %description a building tool for making DVD ISO @@ -66,6 +67,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Thu Mar 11 2021 miao_kaibo - 1.1.2-3 +- ID:NA +- SUG:NA +- DESC: update + * Thu MAR 01 2021 Chen Qun - 1.1.1-2 - ID:NA - SUG:NA