147 lines
8.7 KiB
Diff
147 lines
8.7 KiB
Diff
From e1c79ca3f09be156d54e98b5733da3290951cc44 Mon Sep 17 00:00:00 2001
|
|
From: jiahua_yu <jiahua.yu@shingroup.cn>
|
|
Date: Mon, 24 Jun 2024 16:58:24 +0800
|
|
Subject: [PATCH 1/3] init support for arch ppc64le
|
|
|
|
---
|
|
isocut/isocut.py | 7 +++++++
|
|
isomaker/init.sh | 2 +-
|
|
isomaker/iso.sh | 27 +++++++++++++++++++++++++++
|
|
3 files changed, 35 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/isocut/isocut.py b/isocut/isocut.py
|
|
index 8578f83..6332f4e 100755
|
|
--- a/isocut/isocut.py
|
|
+++ b/isocut/isocut.py
|
|
@@ -442,6 +442,8 @@ def regen_repodata():
|
|
pack.text = pack.text.split(".aarch64")[0]
|
|
elif os.uname()[-1].strip() == 'loongarch64':
|
|
pack.text = pack.text.split(".loongarch64")[0]
|
|
+ elif os.uname()[-1].strip() == 'ppc64le'[0]:
|
|
+ pack.text = pack.text.split(".ppc64le")[0]
|
|
pack.text = pack.text.split(".noarch")[0]
|
|
fp_rpm.close()
|
|
|
|
@@ -687,6 +689,11 @@ def remake_iso():
|
|
"-joliet-long -allow-multidot -allow-leading-dots -no-bak -V \"%s\" " \
|
|
"-o \"%s\" -e images/efiboot.img -no-emul-boot \"%s\"" % (
|
|
ICONFIG.new_iso_name, ICONFIG.dest_iso, ICONFIG.temp_path_new_image)
|
|
+ elif os.uname()[-1].strip() == 'ppc64le':
|
|
+ make_iso_cmd = "genisoimage -joliet-long -U -J -R -T -part -hfs -r -l -sysid PPC " \
|
|
+ "-V \"%s\" -o \"%s\" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 " \
|
|
+ "-no-desktop -allow-multidot " % (
|
|
+ ICONFIG.iso_desc, ICONFIG.dest_iso, ICONFIG.temp_path_new_image)
|
|
dest_iso_path = os.path.dirname(ICONFIG.dest_iso)
|
|
if not (dest_iso_path is None or dest_iso_path ==
|
|
"") and not os.path.exists(dest_iso_path):
|
|
diff --git a/isomaker/init.sh b/isomaker/init.sh
|
|
index f3222ec..00aadd3 100644
|
|
--- a/isomaker/init.sh
|
|
+++ b/isomaker/init.sh
|
|
@@ -35,7 +35,7 @@ function parse_cmd_line()
|
|
{
|
|
#param init
|
|
ARCH="$(uname -m)"
|
|
- if [ "${ARCH}" = "aarch64" ] || [ "${ARCH}" = "x86_64" ] || [ "${ARCH}" = "loongarch64" ];then
|
|
+ if [ "${ARCH}" = "aarch64" ] || [ "${ARCH}" = "x86_64" ] || [ "${ARCH}" = "loongarch64" ] || [ "${ARCH}" = "ppc64le" ];then
|
|
CONFIG_FILE="${CPATH}/config/${ARCH}/standard.conf"
|
|
source "${CONFIG_FILE}"
|
|
else
|
|
diff --git a/isomaker/iso.sh b/isomaker/iso.sh
|
|
index 7bf0bf9..211a8ed 100644
|
|
--- a/isomaker/iso.sh
|
|
+++ b/isomaker/iso.sh
|
|
@@ -29,6 +29,9 @@ function gen_debug_iso()
|
|
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; 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}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
[ $? != 0 ] && return 1
|
|
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${DBG_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
+ [ $? != 0 ] && return 1
|
|
fi
|
|
implantisomd5 "${OUTPUT_DIR}/${DBG_ISO_NAME}"
|
|
return 0
|
|
@@ -43,6 +46,9 @@ function gen_standard_iso()
|
|
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; then
|
|
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
|
|
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
+ [ $? != 0 ] && return 1
|
|
fi
|
|
implantisomd5 "${OUTPUT_DIR}/${STANDARD_ISO_NAME}"
|
|
return 0
|
|
@@ -60,6 +66,9 @@ function gen_edge_iso()
|
|
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; 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}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
[ $? != 0 ] && return 1
|
|
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
+ [ $? != 0 ] && return 1
|
|
fi
|
|
implantisomd5 "${OUTPUT_DIR}/${EDGE_ISO_NAME}"
|
|
return 0
|
|
@@ -77,6 +86,9 @@ function gen_desktop_iso()
|
|
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; 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}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
[ $? != 0 ] && return 1
|
|
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
+ [ $? != 0 ] && return 1
|
|
fi
|
|
implantisomd5 "${OUTPUT_DIR}/${DESKTOP_ISO_NAME}"
|
|
return 0
|
|
@@ -94,6 +106,9 @@ function gen_src_iso()
|
|
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; 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}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
[ $? != 0 ] && return 1
|
|
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
+ [ $? != 0 ] && return 1
|
|
fi
|
|
return 0
|
|
}
|
|
@@ -113,6 +128,9 @@ function gen_everything_iso()
|
|
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; 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}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
[ $? != 0 ] && return 1
|
|
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
+ [ $? != 0 ] && return 1
|
|
fi
|
|
implantisomd5 /result/"${EVE_ISO_NAME}"
|
|
return 0
|
|
@@ -132,6 +150,9 @@ function gen_everything_debug_iso()
|
|
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; 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}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
[ $? != 0 ] && return 1
|
|
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
+ [ $? != 0 ] && return 1
|
|
fi
|
|
implantisomd5 /result/"${EVE_DEBUG_ISO_NAME}"
|
|
return 0
|
|
@@ -151,6 +172,9 @@ function gen_everything_src_iso()
|
|
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; 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}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
|
|
[ $? != 0 ] && return 1
|
|
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
+ [ $? != 0 ] && return 1
|
|
fi
|
|
implantisomd5 /result/"${EVE_SRC_ISO_NAME}"
|
|
return 0
|
|
@@ -164,6 +188,9 @@ function gen_netinst_iso()
|
|
isohybrid -u /result/"${NETINST_ISO_NAME}"
|
|
elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; 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
|
|
+ elif [ "$ARCH" == "ppc64le" ]; then
|
|
+ mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid PPC -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275 -no-desktop -allow-multidot "${BUILD}"/iso
|
|
+ [ $? != 0 ] && return 1
|
|
fi
|
|
implantisomd5 /result/"${NETINST_ISO_NAME}"
|
|
return 0
|
|
--
|
|
2.43.0
|
|
|