diff --git a/imageTailor.spec b/imageTailor.spec index 5f2ce2a..4394b10 100644 --- a/imageTailor.spec +++ b/imageTailor.spec @@ -2,14 +2,12 @@ Name: imageTailor Summary: Cut out the ISO License: Mulan PSL v2 Group: System/Management -Version: 2.0.1 -Release: 2 +Version: 2.2.0 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version} Source: https://gitee.com/openeuler/imageTailor/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch1: openEuler-fixed-make-qcow2-in-docker.patch - -Requires: dnf-utils tar python3 drpm genisoimage python3-kiwi kiwi-tools kiwi-systemdeps +Requires: dnf-utils tar python3 drpm genisoimage python3-kiwi kiwi-tools kiwi-systemdeps dosfstools parted kpartx xz rsync %description Dopralinux custom tool @@ -18,13 +16,15 @@ Dopralinux custom tool %autopatch -p1 %install -iso_arch=$(uname -m) +sys_arch=$(uname -m) mkdir -p %{buildroot}/opt/imageTailor cd %{name} -cp -a conf/${iso_arch}/* %{buildroot}/opt/imageTailor +cp -a conf/${sys_arch}/* %{buildroot}/opt/imageTailor cp -a conf/common/* %{buildroot}/opt/imageTailor cp -a mkdliso %{buildroot}/opt/imageTailor +%ifnarch riscv64 + # for user install hook config chmod 600 %{buildroot}/opt/imageTailor/custom/cfg_*/usr_install/hook/install_succ_hook/S00reboot chmod 600 %{buildroot}/opt/imageTailor/custom/cfg_*/usr_install/hook/after_setup_os_hook/S00setcap @@ -42,6 +42,8 @@ chmod 550 %{buildroot}/opt/imageTailor/kiwi/hook/config.sh chmod 550 %{buildroot}/opt/imageTailor/kiwi/hook/images.sh chmod 550 %{buildroot}/opt/imageTailor/mkdliso +%endif + chmod 550 %{buildroot}/opt/imageTailor/custom/cfg_qcow2/bin/* chmod 550 %{buildroot}/opt/imageTailor/custom/cfg_qcow2/lib/* chmod 550 %{buildroot}/opt/imageTailor/custom/cfg_qcow2/misc/* @@ -71,6 +73,11 @@ rm -rf %{_tmppath}/%{name}-%{version} rm -rf $RPM_BUILD_DIR/%{name}-%{version} %changelog +* Wed Nov 22 2023 chenhuihan - 2.2.0-1 +- ID:NA +- SUG:NA +- DESC: support for qcow2 riscv64 + * Fri Jun 2 2023 chenhuihan - 2.0.1-2 - ID:NA - SUG:NA