From 3d1f95fde5c84febc502f1e523c9cf2e7c1b8693 Mon Sep 17 00:00:00 2001 From: ouuleilei Date: Tue, 16 Jul 2024 11:15:20 +0800 Subject: [PATCH] fix riscv64 support patch conflict problem and riscv64 package xml adjustment --- 0001-add-riscv64-support.patch | 172 +++++++++++++++++---------------- normal_riscv64.xml | 23 ----- oemaker.spec | 10 +- rpmlist_riscv64.xml | 8 ++ 4 files changed, 101 insertions(+), 112 deletions(-) diff --git a/0001-add-riscv64-support.patch b/0001-add-riscv64-support.patch index 2abb994..1e539b8 100644 --- a/0001-add-riscv64-support.patch +++ b/0001-add-riscv64-support.patch @@ -1,24 +1,24 @@ -From abe27c45365f98a01f3bef968f5e027e6da3b07c Mon Sep 17 00:00:00 2001 +From 924f6801cb6af7d897c4de5b9ae7965426a98335 Mon Sep 17 00:00:00 2001 From: ouuleilei -Date: Tue, 28 May 2024 10:35:17 +0800 +Date: Thu, 13 Jun 2024 13:11:27 +0800 Subject: [PATCH] add riscv64 support --- - envmaker/config/compile_env_rpmlist.xml | 6 +- + envmaker/config/compile_env_rpmlist.xml | 4 + envmaker/config/riscv64/openEuler_repo.conf | 17 + isocut/config/riscv64/anaconda-ks.cfg | 371 ++++ isocut/config/riscv64/rpmlist | 1 + isocut/isocut.py | 7 + .../config_files/riscv64/boot.msg | 5 + .../config_files/riscv64/grub.conf | 13 + - .../config_files/riscv64/grub2-efi.cfg | 47 + + .../config_files/riscv64/grub2-efi.cfg | 46 + isomaker/80-openeuler/efi.tmpl | 14 +- - isomaker/80-openeuler/live/efi.tmpl | 4 + - isomaker/80-openeuler/live/riscv64.tmpl | 83 + - isomaker/80-openeuler/riscv64.tmpl | 76 + + isomaker/80-openeuler/live/efi.tmpl | 5 + + isomaker/80-openeuler/live/riscv64.tmpl | 82 + + isomaker/80-openeuler/riscv64.tmpl | 75 + isomaker/80-openeuler/runtime-cleanup.tmpl | 2 + isomaker/80-openeuler/runtime-install.tmpl | 7 +- - isomaker/config/common/livecd/live/efi.tmpl | 5 + + isomaker/config/common/livecd/live/efi.tmpl | 3 + isomaker/config/riscv64/desktop_normal.xml | 0 isomaker/config/riscv64/edge_normal.xml | 0 .../livecd/live/config_files/riscv64/boot.msg | 5 + @@ -26,12 +26,12 @@ Subject: [PATCH] add riscv64 support .../live/config_files/riscv64/grub2-efi.cfg | 38 + .../config/riscv64/livecd/live/riscv64.tmpl | 75 + .../config/riscv64/livecd/livecd_riscv64.ks | 70 + - isomaker/config/riscv64/livecd/rpmlist | 112 ++ + isomaker/config/riscv64/livecd/rpmlist | 111 ++ isomaker/config/riscv64/normal.xml | 1569 +++++++++++++++++ isomaker/config/riscv64/standard.conf | 6 + isomaker/init.sh | 2 +- isomaker/iso.sh | 18 +- - 27 files changed, 2544 insertions(+), 18 deletions(-) + 27 files changed, 2538 insertions(+), 17 deletions(-) create mode 100644 envmaker/config/riscv64/openEuler_repo.conf create mode 100644 isocut/config/riscv64/anaconda-ks.cfg create mode 100644 isocut/config/riscv64/rpmlist @@ -52,7 +52,7 @@ Subject: [PATCH] add riscv64 support create mode 100644 isomaker/config/riscv64/standard.conf diff --git a/envmaker/config/compile_env_rpmlist.xml b/envmaker/config/compile_env_rpmlist.xml -index d2461ea..eec1480 100644 +index d2461ea..b7b99ce 100644 --- a/envmaker/config/compile_env_rpmlist.xml +++ b/envmaker/config/compile_env_rpmlist.xml @@ -17,6 +17,10 @@ @@ -66,16 +66,9 @@ index d2461ea..eec1480 100644 acl acpica-tools -@@ -463,4 +467,4 @@ - clang - imageTailor - -- -\ No newline at end of file -+ diff --git a/envmaker/config/riscv64/openEuler_repo.conf b/envmaker/config/riscv64/openEuler_repo.conf new file mode 100644 -index 0000000..4bff406 +index 0000000..d2a677c --- /dev/null +++ b/envmaker/config/riscv64/openEuler_repo.conf @@ -0,0 +1,17 @@ @@ -96,9 +89,10 @@ index 0000000..4bff406 +baseurl=https://repo.openeuler.org/openEuler-23.09/OS/riscv64/ +enabled=1 +gpgcheck=0 +\ No newline at end of file diff --git a/isocut/config/riscv64/anaconda-ks.cfg b/isocut/config/riscv64/anaconda-ks.cfg new file mode 100644 -index 0000000..adcb6fe +index 0000000..f586d14 --- /dev/null +++ b/isocut/config/riscv64/anaconda-ks.cfg @@ -0,0 +1,371 @@ @@ -473,13 +467,15 @@ index 0000000..adcb6fe +NetworkManager.riscv64 + +%end +\ No newline at end of file diff --git a/isocut/config/riscv64/rpmlist b/isocut/config/riscv64/rpmlist new file mode 100644 -index 0000000..b134835 +index 0000000..78c2220 --- /dev/null +++ b/isocut/config/riscv64/rpmlist @@ -0,0 +1 @@ -+kernel.riscv64 ++kernel.riscv64 +\ No newline at end of file diff --git a/isocut/isocut.py b/isocut/isocut.py index 8578f83..be836ff 100755 --- a/isocut/isocut.py @@ -518,7 +514,7 @@ index 0000000..ff54899 + diff --git a/isomaker/80-openeuler/config_files/riscv64/grub.conf b/isomaker/80-openeuler/config_files/riscv64/grub.conf new file mode 100644 -index 0000000..49fa32b +index 0000000..a36d183 --- /dev/null +++ b/isomaker/80-openeuler/config_files/riscv64/grub.conf @@ -0,0 +1,13 @@ @@ -528,19 +524,20 @@ index 0000000..49fa32b +timeout 5 +hiddenmenu +title Install @PRODUCT@ @VERSION@ -+ findiso -+ kernel @KERNELPATH@ @ROOT@ quiet -+ initrd @INITRDPATH@ ++ findiso ++ kernel @KERNELPATH@ @ROOT@ quiet ++ initrd @INITRDPATH@ +title Test this media & install @PRODUCT@ @VERSION@ -+ findiso -+ kernel @KERNELPATH@ @ROOT@ rd.live.check quiet -+ initrd @INITRDPATH@ ++ findiso ++ kernel @KERNELPATH@ @ROOT@ rd.live.check quiet ++ initrd @INITRDPATH@ +\ No newline at end of file diff --git a/isomaker/80-openeuler/config_files/riscv64/grub2-efi.cfg b/isomaker/80-openeuler/config_files/riscv64/grub2-efi.cfg new file mode 100644 -index 0000000..918b7d3 +index 0000000..b19ceb2 --- /dev/null +++ b/isomaker/80-openeuler/config_files/riscv64/grub2-efi.cfg -@@ -0,0 +1,47 @@ +@@ -0,0 +1,46 @@ +set default="1" + +function load_video { @@ -564,30 +561,30 @@ index 0000000..918b7d3 +insmod ext2 + +set timeout=60 -+set debug="linux,loader,mm" +### END /etc/grub.d/00_header ### + +search --no-floppy --set=root -l '@ISOLABEL@' + +### BEGIN /etc/grub.d/10_linux ### +menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { -+ linux @KERNELPATH@ @ROOT@ ro inst.geoloc=0 systemd.default_timeout_start_sec=600 selinux=0 highres=off earlycon no4lvl -+ initrd @INITRDPATH@ ++ linux @KERNELPATH@ @ROOT@ ro inst.geoloc=0 systemd.default_timeout_start_sec=600 selinux=0 highres=off earlycon no4lvl ++ initrd @INITRDPATH@ +} +menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { -+ linux @KERNELPATH@ @ROOT@ rd.live.check inst.geoloc=0 systemd.default_timeout_start_sec=600 selinux=0 highres=off earlycon no4lvl -+ initrd @INITRDPATH@ ++ linux @KERNELPATH@ @ROOT@ rd.live.check inst.geoloc=0 systemd.default_timeout_start_sec=600 selinux=0 highres=off earlycon no4lvl ++ initrd @INITRDPATH@ +} +submenu 'Troubleshooting -->' { -+ menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { -+ linux @KERNELPATH@ @ROOT@ nomodeset inst.geoloc=0 systemd.default_timeout_start_sec=600 selinux=0 highres=off earlycon no4lvl -+ initrd @INITRDPATH@ -+ } -+ menuentry 'Rescue the @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { -+ linux @KERNELPATH@ @ROOT@ rescue systemd.default_timeout_start_sec=600 selinux=0 highres=off earlycon no4lvl -+ initrd @INITRDPATH@ -+ } ++ menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { ++ linux @KERNELPATH@ @ROOT@ nomodeset inst.geoloc=0 systemd.default_timeout_start_sec=600 selinux=0 highres=off earlycon no4lvl ++ initrd @INITRDPATH@ ++ } ++ menuentry 'Rescue the @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { ++ linux @KERNELPATH@ @ROOT@ rescue systemd.default_timeout_start_sec=600 selinux=0 highres=off earlycon no4lvl ++ initrd @INITRDPATH@ ++ } +} +\ No newline at end of file diff --git a/isomaker/80-openeuler/efi.tmpl b/isomaker/80-openeuler/efi.tmpl index 0b5e770..29a61d4 100644 --- a/isomaker/80-openeuler/efi.tmpl @@ -621,10 +618,10 @@ index 0b5e770..29a61d4 100644 ## actually make the EFI images diff --git a/isomaker/80-openeuler/live/efi.tmpl b/isomaker/80-openeuler/live/efi.tmpl -index 79f6444..1fa7bf6 100644 +index 79f6444..25e07f3 100644 --- a/isomaker/80-openeuler/live/efi.tmpl +++ b/isomaker/80-openeuler/live/efi.tmpl -@@ -6,6 +6,10 @@ EFIBOOTDIR="EFI/BOOT" +@@ -6,10 +6,15 @@ EFIBOOTDIR="EFI/BOOT" mkdir ${EFIBOOTDIR} mkdir ${EFIBOOTDIR}/fonts/ %if efiarch64: @@ -635,12 +632,17 @@ index 79f6444..1fa7bf6 100644 install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi + %endif ++%endif + %if efiarch32: + install boot/efi/EFI/*/shim${efiarch32|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch32}.EFI + install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ diff --git a/isomaker/80-openeuler/live/riscv64.tmpl b/isomaker/80-openeuler/live/riscv64.tmpl new file mode 100644 -index 0000000..1944e5a +index 0000000..5f160b5 --- /dev/null +++ b/isomaker/80-openeuler/live/riscv64.tmpl -@@ -0,0 +1,83 @@ +@@ -0,0 +1,82 @@ +<%page args="kernels, runtime_img, basearch, inroot, outroot, product, isolabel"/> +<% +configdir="tmp/config_files/riscv64" @@ -723,13 +725,13 @@ index 0000000..1944e5a + install ${f} ${f|basename} + <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %> +%endfor -+ +\ No newline at end of file diff --git a/isomaker/80-openeuler/riscv64.tmpl b/isomaker/80-openeuler/riscv64.tmpl new file mode 100644 -index 0000000..be9d81c +index 0000000..c6afbff --- /dev/null +++ b/isomaker/80-openeuler/riscv64.tmpl -@@ -0,0 +1,76 @@ +@@ -0,0 +1,75 @@ +<%page args="kernels, runtime_img, basearch, inroot, outroot, product, isolabel"/> +<% +configdir="tmp/config_files/riscv64" @@ -805,9 +807,9 @@ index 0000000..be9d81c + install ${f} ${f|basename} + <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %> +%endfor -+ +\ No newline at end of file diff --git a/isomaker/80-openeuler/runtime-cleanup.tmpl b/isomaker/80-openeuler/runtime-cleanup.tmpl -index 256d013..898f9c7 100644 +index 8d4b423..f3c2664 100644 --- a/isomaker/80-openeuler/runtime-cleanup.tmpl +++ b/isomaker/80-openeuler/runtime-cleanup.tmpl @@ -337,8 +337,10 @@ runcmd chroot ${root} find /boot \! -name "vmlinuz*" \ @@ -847,25 +849,19 @@ index 9937e70..f38e5eb 100644 %endif installpkg rng-tools diff --git a/isomaker/config/common/livecd/live/efi.tmpl b/isomaker/config/common/livecd/live/efi.tmpl -index 9a57df4..abe9526 100644 +index fdfc489..31fe163 100644 --- a/isomaker/config/common/livecd/live/efi.tmpl +++ b/isomaker/config/common/livecd/live/efi.tmpl -@@ -11,10 +11,15 @@ mkdir ${EFIBOOTDIR}/fonts/ - install usr/share/shim/lockdown.efi ${EFIBOOTDIR}/ - %endif - %if efiarch64: -+%if efiarch64 == 'RISCV64': -+install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI -+install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64}.EFI -+%else - install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI - install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ - install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi - %endif -+%endif - install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ - - ## actually make the EFI images +@@ -15,6 +15,9 @@ mkdir ${EFIBOOTDIR}/fonts/ + install boot/efi/EFI/openEuler/grubloongarch64.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI + install boot/efi/EFI/openEuler/grubloongarch64.efi ${EFIBOOTDIR}/BOOTLOONGARCH.EFI + install boot/efi/EFI/openEuler/grubloongarch64.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi ++ %elif efiarch64 == 'RISCV64': ++ install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI ++ install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64}.EFI + %else: + install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI + install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ diff --git a/isomaker/config/riscv64/desktop_normal.xml b/isomaker/config/riscv64/desktop_normal.xml new file mode 100644 index 0000000..e69de29 @@ -885,7 +881,7 @@ index 0000000..ff54899 + diff --git a/isomaker/config/riscv64/livecd/live/config_files/riscv64/grub.conf b/isomaker/config/riscv64/livecd/live/config_files/riscv64/grub.conf new file mode 100644 -index 0000000..7e5e934 +index 0000000..ee47854 --- /dev/null +++ b/isomaker/config/riscv64/livecd/live/config_files/riscv64/grub.conf @@ -0,0 +1,9 @@ @@ -898,9 +894,10 @@ index 0000000..7e5e934 + findiso + kernel @KERNELPATH@ @ROOT@ quiet inst.text rd.live.ram net.ifnames=0 biosdevname=0 rd.shell=0 + initrd @INITRDPATH@ +\ No newline at end of file diff --git a/isomaker/config/riscv64/livecd/live/config_files/riscv64/grub2-efi.cfg b/isomaker/config/riscv64/livecd/live/config_files/riscv64/grub2-efi.cfg new file mode 100644 -index 0000000..aa36684 +index 0000000..182fdd2 --- /dev/null +++ b/isomaker/config/riscv64/livecd/live/config_files/riscv64/grub2-efi.cfg @@ -0,0 +1,38 @@ @@ -942,9 +939,10 @@ index 0000000..aa36684 + initrd @INITRDPATH@ + } +} +\ No newline at end of file diff --git a/isomaker/config/riscv64/livecd/live/riscv64.tmpl b/isomaker/config/riscv64/livecd/live/riscv64.tmpl new file mode 100644 -index 0000000..e7a9309 +index 0000000..9c14d3f --- /dev/null +++ b/isomaker/config/riscv64/livecd/live/riscv64.tmpl @@ -0,0 +1,75 @@ @@ -1023,9 +1021,10 @@ index 0000000..e7a9309 + ${efigraft} ${filegraft} +treeinfo images-${basearch} boot.iso images/boot.iso +%endif +\ No newline at end of file diff --git a/isomaker/config/riscv64/livecd/livecd_riscv64.ks b/isomaker/config/riscv64/livecd/livecd_riscv64.ks new file mode 100644 -index 0000000..192c4b1 +index 0000000..fba4995 --- /dev/null +++ b/isomaker/config/riscv64/livecd/livecd_riscv64.ks @@ -0,0 +1,70 @@ @@ -1099,12 +1098,13 @@ index 0000000..192c4b1 + +%packages --excludedocs +%end +\ No newline at end of file diff --git a/isomaker/config/riscv64/livecd/rpmlist b/isomaker/config/riscv64/livecd/rpmlist new file mode 100644 -index 0000000..9f80b75 +index 0000000..a35b61f --- /dev/null +++ b/isomaker/config/riscv64/livecd/rpmlist -@@ -0,0 +1,112 @@ +@@ -0,0 +1,111 @@ +NetworkManager +NetworkManager-config-server +abattis-cantarell-fonts @@ -1137,7 +1137,7 @@ index 0000000..9f80b75 +genisoimage +glibc +grub2 -+gryb2-efi-riscv64 ++grub2-efi-riscv64 +grub2-efi-riscv64-cdboot +grubby +gtk2 @@ -1185,7 +1185,6 @@ index 0000000..9f80b75 +pciutils +policycoreutils +procps-ng -+python3-bind +python3-decorator +python3-ply +python3-slip @@ -1217,9 +1216,10 @@ index 0000000..9f80b75 +xfsprogs +yum +zip +\ No newline at end of file diff --git a/isomaker/config/riscv64/normal.xml b/isomaker/config/riscv64/normal.xml new file mode 100644 -index 0000000..175a94c +index 0000000..5677a02 --- /dev/null +++ b/isomaker/config/riscv64/normal.xml @@ -0,0 +1,1569 @@ @@ -1604,7 +1604,7 @@ index 0000000..175a94c + rpmlint + + -+ ++ + dial-up + Dial-up Networking Support + 拨号网络支持 @@ -2792,9 +2792,10 @@ index 0000000..175a94c + + + +\ No newline at end of file diff --git a/isomaker/config/riscv64/standard.conf b/isomaker/config/riscv64/standard.conf new file mode 100644 -index 0000000..73bbb0b +index 0000000..83dc26d --- /dev/null +++ b/isomaker/config/riscv64/standard.conf @@ -0,0 +1,6 @@ @@ -2804,6 +2805,7 @@ index 0000000..73bbb0b +CONFIG_PRODUCT="openEuler" +CONFIG_VERSION="24.03" +CONFIG_RELEASE="LTS" +\ No newline at end of file diff --git a/isomaker/init.sh b/isomaker/init.sh index f3222ec..1166d7f 100644 --- a/isomaker/init.sh @@ -2818,7 +2820,7 @@ index f3222ec..1166d7f 100644 source "${CONFIG_FILE}" else diff --git a/isomaker/iso.sh b/isomaker/iso.sh -index 7bf0bf9..78e3392 100644 +index 3badcd7..be14649 100644 --- a/isomaker/iso.sh +++ b/isomaker/iso.sh @@ -26,7 +26,7 @@ function gen_debug_iso() @@ -2853,7 +2855,7 @@ index 7bf0bf9..78e3392 100644 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 - elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; then -+ elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ] ; then ++ elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; 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 fi @@ -2898,10 +2900,10 @@ index 7bf0bf9..78e3392 100644 [ $? != 0 ] && return 1 isohybrid -u /result/"${NETINST_ISO_NAME}" - elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ]; then -+ elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ] ; then ++ elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; 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}" -- -2.41.0 +2.45.2 diff --git a/normal_riscv64.xml b/normal_riscv64.xml index 175a94c..550acff 100644 --- a/normal_riscv64.xml +++ b/normal_riscv64.xml @@ -453,28 +453,6 @@ open-isns - - opengauss-server - openGauss Server - openGauss数据库 - openGauss is an open source relational database management system. - openGauss一款开源的关系数据库管理系统。 - true - false - - lz4-devel - protobuf-devel - snappy-devel - zstd-devel - boost-devel - libcgroup-devel - unixODBC-devel - jemalloc-devel - java-1.8.0-openjdk-devel - libedit-devel - libaio-devel - - fonts Fonts @@ -1535,7 +1513,6 @@ smb-server virtualization-hypervisor web-server - opengauss-server diff --git a/oemaker.spec b/oemaker.spec index 8bb5a96..06fc1bb 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -15,7 +15,7 @@ Summary: a building tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management Version: 3.1.0 -Release: 13 +Release: 14 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -41,9 +41,6 @@ Requires: lorax >= 19.6.78-1 # Patch here Patch0001: 0001-fix-createrepo-data-error.patch Patch0002: add-openEuler_repo.conf-for-loongarch64.patch -%ifarch riscv64 -Patch0003: 0001-add-riscv64-support.patch -%endif Patch0004: add-loongarch64-support-for-livecd.patch Patch0005: add-ls2k500sfb.ko-for-loongarch64.patch %ifarch ppc64le @@ -52,6 +49,7 @@ Patch0007: 0002-add-config-for-arch-ppc64le.patch Patch0008: 0003-add-support-for-ppc64le-runtime-install.patch %endif Patch0009: 0004-bugfix-IABY7K.patch +Patch0010: 0001-add-riscv64-support.patch %description @@ -235,6 +233,10 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Tue Jul 16 2024 Ouuleilei - 3.1.0-14 +- riscv64 rpmlist.xml exclude some packages, riscv64 normal.xml delete opengauss +- fix patch conflict + * Wed Jul 10 2024 wangchong - 3.1.0-13 - ID:NA - SUG:NA diff --git a/rpmlist_riscv64.xml b/rpmlist_riscv64.xml index c9aa0ea..d500454 100644 --- a/rpmlist_riscv64.xml +++ b/rpmlist_riscv64.xml @@ -40,6 +40,14 @@ drbd-utils gnome-boxes nodejs-grunt-contrib-watch + apache-poi + gala-anteater + gala-ops + metrics-httpasyncclient + nvwa + python3-gala-anteater + python3-keras-rl2 + zinc drbd -- Gitee