diff --git a/0001-bugfix-IABY7K.patch b/0001-bugfix-IABY7K.patch deleted file mode 100644 index e559a9def5e666079163ffe1c29cd016247c779a..0000000000000000000000000000000000000000 --- a/0001-bugfix-IABY7K.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 52f60354b4d48a0b3c2a25ddabb10a47073bfb0c Mon Sep 17 00:00:00 2001 -From: wangchong1995924 <15229716099@163.com> -Date: Wed, 10 Jul 2024 15:28:00 +0800 -Subject: [PATCH] fix issue IABY7K - - -diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh -index a9efe4b..b2ba4de 100644 ---- a/isomaker/rpm.sh -+++ b/isomaker/rpm.sh -@@ -185,7 +185,7 @@ function get_desktop_rpms() - - function get_everything_rpms() - { -- yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "\.noarch|\.${ARCH}" | grep -v "debuginfo" | grep -v "debugsource" > ava_every_lst -+ yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "\.noarch|\.${ARCH}" | grep -v "debuginfo\." | grep -v "debugsource\." > ava_every_lst - parse_rpmlist_xml "exclude" - cat parsed_rpmlist_exclude - if [ -s parsed_rpmlist_exclude ];then -@@ -259,7 +259,7 @@ function everything_source_rpms_download() - function everything_debug_rpms_download() - { - mkdir ${EVERY_DEBUG_DIR} -- yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "debuginfo|debugsource" > ava_debug_lst -+ yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "debuginfo\.|debugsource\." > ava_debug_lst - parse_rpmlist_xml "everything_debug_exclude" - cat parsed_rpmlist_everything_debug_exclude - if [ -s parsed_rpmlist_everything_debug_exclude ];then --- -2.27.0 - diff --git a/0002-fix-createrepo-data-error.patch b/0002-fix-createrepo-data-error.patch deleted file mode 100644 index e7080963085755c2b530c4e92c6631ce3b291196..0000000000000000000000000000000000000000 --- a/0002-fix-createrepo-data-error.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 64a6ab9106cffd6d4be84e98de79cdaaf3d17e2d Mon Sep 17 00:00:00 2001 -From: xyn-coder -Date: Mon, 19 Aug 2024 10:51:49 +0800 -Subject: [PATCH] fix createrepo data error - ---- - isocut/isocut.py | 4 ++-- - isomaker/iso.sh | 14 +++++++------- - isomaker/rpm.sh | 2 +- - 3 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/isocut/isocut.py b/isocut/isocut.py -index 8578f83..51442d6 100755 ---- a/isocut/isocut.py -+++ b/isocut/isocut.py -@@ -324,7 +324,7 @@ def create_yum_conf(): - - def create_repo_conf(): - if ICONFIG.rpm_path is not None: -- cmd = "createrepo {0}".format(ICONFIG.rpm_path) -+ cmd = "createrepo -d {0}".format(ICONFIG.rpm_path) - ret = ICONFIG.run_cmd(cmd) - if ret[0] != 0: - print("Create extern rpm repo failed!!") -@@ -456,7 +456,7 @@ def regen_repodata(): - f_product.seek(0, 0) - f_product.write(contents_str) - f_product.close() -- cmd = "createrepo -g {0} {1}".format(product_xml, ICONFIG.temp_path_new_image) -+ cmd = "createrepo -d -g {0} {1}".format(product_xml, ICONFIG.temp_path_new_image) - ret = ICONFIG.run_cmd(cmd) - if ret[0] != 0: - print("Regenerate repodata failed!!") -diff --git a/isomaker/iso.sh b/isomaker/iso.sh -index 7bf0bf9..e825a2a 100644 ---- a/isomaker/iso.sh -+++ b/isomaker/iso.sh -@@ -22,7 +22,7 @@ function gen_debug_iso() - cp "$CONFIG" "${BUILD}"/iso/repodata/ - rm -rf "$BUILD"/iso/Packages - mv "$DBG_DIR" "$BUILD"/iso/Packages -- createrepo -g "${BUILD}"/iso/repodata/*.xml "${BUILD}"/iso -+ createrepo -d -g "${BUILD}"/iso/repodata/*.xml "${BUILD}"/iso - if [ "$ARCH" == "x86_64" ]; then - mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DBG_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -@@ -53,7 +53,7 @@ function gen_edge_iso() - set +e - mkdir -p "${BUILD}"/iso/repodata/ - cp "config/${ARCH}/edge_normal.xml" "${BUILD}"/iso/repodata/ -- createrepo -g "${BUILD}"/iso/repodata/*.xml "${BUILD}"/iso -+ createrepo -d -g "${BUILD}"/iso/repodata/*.xml "${BUILD}"/iso - if [ "$ARCH" == "x86_64" ]; then - mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${EDGE_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -@@ -70,7 +70,7 @@ function gen_desktop_iso() - set +e - mkdir -p "${BUILD}"/iso/repodata/ - cp "config/${ARCH}/desktop_normal.xml" "${BUILD}"/iso/repodata/ -- createrepo -g "${BUILD}"/iso/repodata/*.xml "${BUILD}"/iso -+ createrepo -d -g "${BUILD}"/iso/repodata/*.xml "${BUILD}"/iso - if [ "$ARCH" == "x86_64" ]; then - mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DESKTOP_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -@@ -87,7 +87,7 @@ function gen_src_iso() - set +e - rm -rf "$BUILD"/iso/Packages - mv "$SRC_DIR" "$BUILD"/iso/Packages -- createrepo "$BUILD"/iso -+ createrepo -d "$BUILD"/iso - if [ "$ARCH" == "x86_64" ]; then - mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${SRC_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -@@ -105,7 +105,7 @@ function gen_everything_iso() - rm -rf "$BUILD"/iso/Packages - cp "$CONFIG" "${BUILD}"/iso/repodata/ - mv "${EVERY_DIR}" "${BUILD}"/iso/Packages -- createrepo -g "${BUILD}"/iso/repodata/*.xml "${BUILD}"/iso -+ createrepo -d -g "${BUILD}"/iso/repodata/*.xml "${BUILD}"/iso - if [ "$ARCH" == "x86_64" ]; then - mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -@@ -125,7 +125,7 @@ function gen_everything_debug_iso() - rm -rf "${BUILD}"/iso/Packages - cp "$CONFIG" "${BUILD}"/iso/repodata/ - mv "${EVERY_DEBUG_DIR}" "${BUILD}"/iso/Packages -- createrepo -g "${BUILD}"/iso/repodata/*.xml "${BUILD}"/iso -+ createrepo -d -g "${BUILD}"/iso/repodata/*.xml "${BUILD}"/iso - if [ "$ARCH" == "x86_64" ]; then - mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_DEBUG_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -@@ -144,7 +144,7 @@ function gen_everything_src_iso() - rm -rf "${BUILD}"/iso/Packages - cp "$CONFIG" "${BUILD}"/iso/repodata/ - mv "${EVERY_SRC_DIR}" "${BUILD}"/iso/Packages -- createrepo -g "${BUILD}"/iso/repodata/*.xml "${BUILD}"/iso -+ createrepo -d -g "${BUILD}"/iso/repodata/*.xml "${BUILD}"/iso - if [ "$ARCH" == "x86_64" ]; then - mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_SRC_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso - [ $? != 0 ] && return 1 -diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh -index b2ba4de..1dff8e5 100644 ---- a/isomaker/rpm.sh -+++ b/isomaker/rpm.sh -@@ -138,7 +138,7 @@ function download_rpms() - - mkdir -p "${BUILD}"/iso/repodata - cp "$CONFIG" "${BUILD}"/iso/repodata/ -- createrepo -g "${BUILD}"/iso/repodata/*.xml "${BUILD}"/iso -+ createrepo -d -g "${BUILD}"/iso/repodata/*.xml "${BUILD}"/iso - return 0 - } - --- -2.43.0 - diff --git a/oemaker-3.1.0.tar.gz b/oemaker-3.1.0.tar.gz deleted file mode 100644 index 2cdf6e47b49a6f0397ecb26117b639c3eeb61f66..0000000000000000000000000000000000000000 Binary files a/oemaker-3.1.0.tar.gz and /dev/null differ diff --git a/oemaker-3.2.0.tar.gz b/oemaker-3.2.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d7eb20e5133ea9021b47872eede8de4307c66a96 Binary files /dev/null and b/oemaker-3.2.0.tar.gz differ diff --git a/oemaker.spec b/oemaker.spec index 705c83cac0dc7336d31468d6efb29807e517e2fa..c2ef5a4f7a2fdd9cb52e795293d35112050ef472 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -10,8 +10,8 @@ Name: oemaker Summary: a building tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management -Version: 3.1.0 -Release: 11 +Version: 3.2.0 +Release: 1 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -27,8 +27,6 @@ Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libs Requires: lorax >= 19.6.78-1 # Patch here -Patch0001: 0001-bugfix-IABY7K.patch -Patch0002: 0002-fix-createrepo-data-error.patch %description a building tool for DVD ISO making and ISO cutting @@ -174,6 +172,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Wed Sep 18 2024 xiangyuning - 3.2.0-1 +- ID:NA +- SUG:NA +- upgrade to 3.2.0 + * Fri Sep 13 2024 yangchaohao - 3.1.0-11 - ID:NA - SUG:NA