From fca868ab27aa32712f02dcee402729d314e8362c Mon Sep 17 00:00:00 2001
From: Wenlong Zhang <zhangwenlong@loongson.cn>
Date: Mon, 10 Jul 2023 09:20:29 +0800
Subject: [PATCH] Add loongarch64 support for CreateImage

---
 ...-loongarch64-support-for-CreateImage.patch | 87 +++++++++++++++++++
 CreateImage.spec                              |  8 +-
 2 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 0001-Add-loongarch64-support-for-CreateImage.patch

diff --git a/0001-Add-loongarch64-support-for-CreateImage.patch b/0001-Add-loongarch64-support-for-CreateImage.patch
new file mode 100644
index 0000000..806eea5
--- /dev/null
+++ b/0001-Add-loongarch64-support-for-CreateImage.patch
@@ -0,0 +1,87 @@
+From 9be33800b594776d40ba8db56e1a5a87ccb49a74 Mon Sep 17 00:00:00 2001
+From: Wenlong Zhang <zhangwenlong@loongson.cn>
+Date: Sat, 8 Jul 2023 11:15:50 +0800
+Subject: [PATCH] Add loongarch64 support for CreateImage
+
+---
+ bin/create-image               |  5 +++++
+ hooks/finalise.d/50-bootloader | 29 +++++++++++++++++++++++++++++
+ hooks/root.d/01-create-root    |  2 ++
+ 3 files changed, 36 insertions(+)
+
+diff --git a/bin/create-image b/bin/create-image
+index 9e9a26b..7ba30c0 100755
+--- a/bin/create-image
++++ b/bin/create-image
+@@ -152,6 +152,11 @@ elif [ $ARCH == "aarch64" ]; then
+ 
+     /usr/sbin/parted system.img -- mkpart primary fat16 0% 5%
+     /usr/sbin/parted system.img -- mkpart primary ext4 5% 100%
++
++elif [ $ARCH == "loongarch64" ]; then
++
++    /usr/sbin/parted system.img -- mkpart primary fat16 0% 5%
++    /usr/sbin/parted system.img -- mkpart primary ext4 5% 100%
+ fi
+ 
+ export DEVICE=`losetup -f`
+diff --git a/hooks/finalise.d/50-bootloader b/hooks/finalise.d/50-bootloader
+index 92ed0ec..cf261c9 100755
+--- a/hooks/finalise.d/50-bootloader
++++ b/hooks/finalise.d/50-bootloader
+@@ -68,6 +68,31 @@ function install_grub2_efi ()
+     grub2-mkconfig -o $GRUB_CFG
+ }
+ 
++function install_grub2_loongarch64 ()
++{
++    cp -r /usr/lib/grub/loongarch64-efi /boot/efi/EFI/openEuler/
++    eval "grub2-mkimage -d /usr/lib/grub/loongarch64-efi -O loongarch64-efi --output=/boot/efi/EFI/openEuler/grubloongarch64.efi '--prefix=(,msdos1)/efi/EFI/openEuler' fat part_gpt part_msdos linux"
++
++    mkdir -p /boot/EFI/BOOT/
++    cp -f /boot/efi/EFI/openEuler/grubloongarch64.efi /boot/EFI/BOOT/BOOTLOONGARCH64.EFI
++    cp -f /boot/efi/EFI/openEuler/grubloongarch64.efi /boot/EFI/BOOT/BOOTLOONGARCH.EFI
++
++    echo 'GRUB_TIMEOUT=5' >> /etc/default/grub
++    echo 'GRUB_DEFAULT=saved' >> /etc/default/grub
++    echo 'GRUB_DISABLE_SUBMENU=true' >> /etc/default/grub
++    echo 'GRUB_TERMINAL_OUTPUT="console"' >> /etc/default/grub
++    echo 'GRUB_CMDLINE_LINUX="rootfstype=ext4 nomodeset quiet oops=panic softlockup_panic=1 net.ifnames=0 biosdevname=0 nmi_watchdog=1 rd.shell=0 selinux=0 crashkernel=256M reserve_kbox_mem=16M crash_kexec_post_notifiers panic=3 no-steal-time use-sched-idle-time"' >> /etc/default/grub
++    echo 'GRUB_DISABLE_RECOVERY="true"' >>/etc/default/grub
++
++    echo "cat <<EOF" >> /etc/grub.d/00_header
++    echo "set superusers=\"root\"" >> /etc/grub.d/00_header
++    echo "password_pbkdf2 root grub.pbkdf2.sha512.10000.5A45748D892672FDA02DD3B6F7AE390AC6E6D532A600D4AC477D25C7D087644697D8A0894DFED9D86DC2A27F4E01D925C46417A225FC099C12DBD3D7D49A7425.2BD2F5BF4907DCC389CC5D165DB85CC3E2C94C8F9A30B01DACAA9CD552B731BA1DD3B7CC2C765704D55B8CD962D2AEF19A753CBE9B8464E2B1EB39A3BB4EAB08" >> /etc/grub.d/00_header
++
++    echo "EOF" >> /etc/grub.d/00_header
++    GRUB_CFG=/boot/efi/EFI/openEuler/grub.cfg
++    grub2-mkconfig -o $GRUB_CFG
++}
++
+ if [ -f /boot/grub2/device.map ]; then
+ cat << EOF | tee /boot/grub2/device.map > /dev/null
+ (hd0)   /dev/xvda
+@@ -83,3 +108,7 @@ if [ $ARCH == "aarch64" ]; then
+     install_grub2_efi
+ fi
+ 
++if [ $ARCH == "loongarch64" ]; then
++    install_grub2_loongarch64
++fi
++
+diff --git a/hooks/root.d/01-create-root b/hooks/root.d/01-create-root
+index 49bd48c..96a0cec 100755
+--- a/hooks/root.d/01-create-root
++++ b/hooks/root.d/01-create-root
+@@ -102,6 +102,8 @@ if [ $ARCH == "x86_64" ]; then
+     sudo -E chroot $TARGET_ROOT yum -y install grub2 grub2-efi-x64-modules grub2-pc-modules
+ elif [ $ARCH == "aarch64" ]; then
+     sudo -E chroot $TARGET_ROOT yum -y install grub2-efi-aa64-modules
++elif [ $ARCH == "loongarch64" ]; then
++    sudo -E chroot $TARGET_ROOT yum -y install grub2-efi-loongarch64-modules
+ fi
+ sudo -E chroot $TARGET_ROOT yum -y install grub2-efi grub2-tools kernel
+ 
+-- 
+2.27.0
+
diff --git a/CreateImage.spec b/CreateImage.spec
index ba196af..548e555 100755
--- a/CreateImage.spec
+++ b/CreateImage.spec
@@ -1,11 +1,12 @@
 Name:        CreateImage
 Version:     1.0.0
-Release:     2
+Release:     3
 Summary:     The tool to create Machine Image
 Group:       System Environment/Base
 License:     Mulan PSL v2
 Source0:     https://gitee.com/openeuler/%{name}/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Patch0001:   0001-fix-uname-r-error.patch
+Patch0002:   0001-Add-loongarch64-support-for-CreateImage.patch
 BuildArch:   noarch
 Requires:    qemu-img bc
 
@@ -15,6 +16,7 @@ The tool to create Machine Image.
 %prep
 %setup -q
 %patch0001 -p1
+%patch0002 -p1
 
 %build
 
@@ -33,6 +35,10 @@ cp -a lib hooks config %{buildroot}/usr/share/CreateImage
 /usr/share/CreateImage
 
 %changelog
+* Mon Jul 10 2023 WenlongZhang<zhangwenlong@loongson.cn> - 1.0.0-3
+- ID:NA
+- SUG:NA
+- DESC:Add loongarch64 support for CreateImage
 * Mon Jul 25 2022 wangchong<wangchong56@huawei.com> - 1.0.0-2
 - ID:NA
 - SUG:NA
-- 
Gitee