diff --git a/isocut/isocut.py b/isocut/isocut.py index 75dc45d..2f5d6d9 100644 --- a/isocut/isocut.py +++ b/isocut/isocut.py @@ -432,7 +432,7 @@ def remake_iso(): return 0 def add_checksum(): - cmd = "implantisomd5 {0}".format(ICONFIG.dest_iso) + cmd = "implantisosm3 {0}".format(ICONFIG.dest_iso) ret = ICONFIG.run_cmd(cmd) if ret[0] != 0: print("Add checksum failed!!") diff --git a/isomaker/80-openeuler/runtime-cleanup.tmpl b/isomaker/80-openeuler/runtime-cleanup.tmpl index 256d013..2ce85ea 100644 --- a/isomaker/80-openeuler/runtime-cleanup.tmpl +++ b/isomaker/80-openeuler/runtime-cleanup.tmpl @@ -51,7 +51,7 @@ removepkg notification-daemon removepkg logrotate remove /etc/logrotate.d ## anaconda needs this to do media check -removefrom isomd5sum --allbut /usr/bin/checkisomd5 +removefrom isosm3sum --allbut /usr/bin/checkisosm3 ## systemd-nspawn isn't very useful and doesn't link anyway without iptables, ## and there's no need for a bunch of zsh files without zsh diff --git a/isomaker/iso.sh b/isomaker/iso.sh index 38fa4ab..0bdd420 100755 --- a/isomaker/iso.sh +++ b/isomaker/iso.sh @@ -30,7 +30,7 @@ function gen_debug_iso() 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}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso [ $? != 0 ] && return 1 fi - implantisomd5 "${OUTPUT_DIR}/${DBG_ISO_NAME}" + implantisosm3 "${OUTPUT_DIR}/${DBG_ISO_NAME}" return 0 } @@ -44,7 +44,7 @@ function gen_standard_iso() mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso [ $? != 0 ] && return 1 fi - implantisomd5 "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" + implantisosm3 "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" return 0 } @@ -61,7 +61,7 @@ function gen_edge_iso() 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}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso [ $? != 0 ] && return 1 fi - implantisomd5 "${OUTPUT_DIR}/${EDGE_ISO_NAME}" + implantisosm3 "${OUTPUT_DIR}/${EDGE_ISO_NAME}" return 0 } @@ -97,7 +97,7 @@ function gen_everything_iso() mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso [ $? != 0 ] && return 1 fi - implantisomd5 /result/"${EVE_ISO_NAME}" + implantisosm3 /result/"${EVE_ISO_NAME}" return 0 } @@ -116,7 +116,7 @@ function gen_everything_debug_iso() 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}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso [ $? != 0 ] && return 1 fi - implantisomd5 /result/"${EVE_DEBUG_ISO_NAME}" + implantisosm3 /result/"${EVE_DEBUG_ISO_NAME}" return 0 } @@ -135,7 +135,7 @@ function gen_everything_src_iso() 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}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso [ $? != 0 ] && return 1 fi - implantisomd5 /result/"${EVE_SRC_ISO_NAME}" + implantisosm3 /result/"${EVE_SRC_ISO_NAME}" return 0 } @@ -148,6 +148,6 @@ function gen_netinst_iso() elif [ "$ARCH" == "aarch64" ]; then mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${NETINST_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso fi - implantisomd5 /result/"${NETINST_ISO_NAME}" + implantisosm3 /result/"${NETINST_ISO_NAME}" return 0 }