diff --git a/0001-fix-uname-r-error.patch b/0001-fix-uname-r-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..1fd3ef26169536b02656b765b7410a32627367e8 --- /dev/null +++ b/0001-fix-uname-r-error.patch @@ -0,0 +1,52 @@ +From 028e98b1defd2d8187386f21d3b4bfbd58c9607c Mon Sep 17 00:00:00 2001 +From: wangchong1995924 <15229716099@163.com> +Date: Mon, 25 Jul 2022 14:21:17 +0800 +Subject: fix issue I5GK9F + + +diff --git a/hooks/root.d/01-create-root b/hooks/root.d/01-create-root +index df63d4c..49bd48c 100755 +--- a/hooks/root.d/01-create-root ++++ b/hooks/root.d/01-create-root +@@ -105,38 +105,6 @@ elif [ $ARCH == "aarch64" ]; then + fi + sudo -E chroot $TARGET_ROOT yum -y install grub2-efi grub2-tools kernel + +-function change_uname() +-{ +- cat << EOF > "${1}" +-#!/bin/sh +- +-OUTPUT=\$(uname.bin \$*) +-NOT_INSTALLED="is not installed" +- +-if [[ \$* == "-r" ]];then +- dir=\$(rpm -q --qf '%{VERSION}-%{RELEASE}.%{ARCH}\n' kernel | head -n 1) +- if [ -z "\$(echo "\${dir}" | grep "\${NOT_INSTALLED}")" ]; then +- [ -n "\${dir}" ] && echo \${dir} && exit 0 +- fi +- dir=\$(rpm -q --qf '%{VERSION}-%{RELEASE}.%{ARCH}\n' kernel-devel | head -n 1) +- if [ -z "\$(echo "\${dir}" | grep "\${NOT_INSTALLED}")" ]; then +- [ -n "\${dir}" ] && echo \${dir} && exit 0 +- fi +- dir=\$(rpm -q --qf '%{VERSION}-%{RELEASE}.%{ARCH}\n' kernel-headers | head -n 1) +- if [ -z "\$(echo "\${dir}" | grep "\${NOT_INSTALLED}")" ]; then +- [ -n "\${dir}" ] && echo \${dir} && exit 0 +- fi +- echo "error: you must installed kernel or kernel-headers" && exit 1 +-else +- echo \${OUTPUT} +-fi +-EOF +-} +- +-sudo -E chroot $TARGET_ROOT mv /usr/bin/uname /usr/bin/uname.bin +-change_uname "$TARGET_ROOT/usr/bin/uname" +-sudo -E chroot $TARGET_ROOT chmod +x /usr/bin/uname +- + if [ "X$PKGS_LIST" != "X" ] + then + rpms=`cat $PKGS_LIST | tr "\n" " "` +-- +2.27.0 + diff --git a/CreateImage.spec b/CreateImage.spec index 7259a66ed9b46eed4224dcfa56a0b8cf7d4bc962..ba196af75e9ee7eeae3056bb56e1783c4345ac11 100755 --- a/CreateImage.spec +++ b/CreateImage.spec @@ -1,10 +1,11 @@ Name: CreateImage Version: 1.0.0 -Release: 1 +Release: 2 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 BuildArch: noarch Requires: qemu-img bc @@ -13,6 +14,7 @@ The tool to create Machine Image. %prep %setup -q +%patch0001 -p1 %build @@ -31,6 +33,11 @@ cp -a lib hooks config %{buildroot}/usr/share/CreateImage /usr/share/CreateImage %changelog +* Mon Jul 25 2022 wangchong - 1.0.0-2 +- ID:NA +- SUG:NA +- DESC: fix issue I5GK9F + * Fri May 27 2022 wangchong - 1.0.0-1 - ID:NA - SUG:NA