diff --git a/0001-change-rescue-parameter-with-new-anaconda.patch b/0001-change-rescue-parameter-with-new-anaconda.patch deleted file mode 100644 index 96fd4c13c3a029be79001c6b6776a6be8474effd..0000000000000000000000000000000000000000 --- a/0001-change-rescue-parameter-with-new-anaconda.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 827754f12b73541273197eec7ba7a8a4b3eb2271 Mon Sep 17 00:00:00 2001 -From: sun_hai_10 -Date: Thu, 8 Dec 2022 17:14:16 +0800 -Subject: [PATCH] change rescue parameter with new anaconda - ---- - isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg | 2 +- - isomaker/80-openeuler/config_files/x86/grub2-efi.cfg | 2 +- - isomaker/80-openeuler/config_files/x86/isolinux.cfg | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg b/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg -index 2d165e1..2cc19a8 100644 ---- a/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg -+++ b/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg -@@ -40,7 +40,7 @@ submenu 'Troubleshooting -->' { - initrd @INITRDPATH@ - } - menuentry 'Rescue the @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { -- linux @KERNELPATH@ @ROOT@ rescue console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me fpi_to_tail=off -+ linux @KERNELPATH@ @ROOT@ inst.rescue console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me fpi_to_tail=off - initrd @INITRDPATH@ - } - } -diff --git a/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg b/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg -index fe2bc03..c7cb824 100644 ---- a/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg -+++ b/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg -@@ -34,7 +34,7 @@ submenu 'Troubleshooting -->' { - initrdefi @INITRDPATH@ - } - menuentry 'Rescue a @PRODUCT@ system' --class openEuler --class gnu-linux --class gnu --class os { -- linuxefi @KERNELPATH@ @ROOT@ rescue fpi_to_tail=off -+ linuxefi @KERNELPATH@ @ROOT@ inst.rescue fpi_to_tail=off - initrdefi @INITRDPATH@ - } - } -diff --git a/isomaker/80-openeuler/config_files/x86/isolinux.cfg b/isomaker/80-openeuler/config_files/x86/isolinux.cfg -index 0471f42..1b3fae2 100644 ---- a/isomaker/80-openeuler/config_files/x86/isolinux.cfg -+++ b/isomaker/80-openeuler/config_files/x86/isolinux.cfg -@@ -93,7 +93,7 @@ label rescue - and edit config files to try to get it booting again. - endtext - kernel vmlinuz -- append initrd=initrd.img @ROOT@ rescue quiet -+ append initrd=initrd.img @ROOT@ inst.rescue quiet - - label memtest - menu label Run a ^memory test --- -2.23.0 - diff --git a/0002-enable-eject-in-install.img.patch b/0002-enable-eject-in-install.img.patch deleted file mode 100644 index d0e174521a71296d91a9e7375308178bfc283826..0000000000000000000000000000000000000000 --- a/0002-enable-eject-in-install.img.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 40e9deb6d6ba1d8ad07c9903ce326d2053afdeff Mon Sep 17 00:00:00 2001 -From: sun_hai_10 -Date: Mon, 19 Dec 2022 21:32:23 +0800 -Subject: [PATCH] enable eject in install.img - ---- - isomaker/80-openeuler/runtime-cleanup.tmpl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/isomaker/80-openeuler/runtime-cleanup.tmpl b/isomaker/80-openeuler/runtime-cleanup.tmpl -index 5bce798..256d013 100644 ---- a/isomaker/80-openeuler/runtime-cleanup.tmpl -+++ b/isomaker/80-openeuler/runtime-cleanup.tmpl -@@ -305,7 +305,7 @@ removefrom sysvinit-tools /usr/bin/* - removefrom tar /usr/share/locale/* - removefrom usbutils /usr/bin/* - removefrom util-linux --allbut \ -- /usr/bin/{dmesg,getopt,kill,login,lsblk,more,mount,umount,mountpoint,findmnt} \ -+ /usr/bin/{dmesg,eject,getopt,kill,login,lsblk,more,mount,umount,mountpoint,findmnt} \ - /etc/mtab /etc/pam.d/login /etc/pam.d/remote \ - /usr/sbin/{agetty,blkid,blockdev,clock,fdisk,fsck,fstrim,hwclock,losetup} \ - /usr/sbin/{mkswap,swaplabel,nologin,sfdisk,swapoff,swapon,wipefs,partx,fsfreeze} \ --- -2.23.0 - diff --git a/0004-repo-source-traversal-bugfix.patch b/0004-repo-source-traversal-bugfix.patch deleted file mode 100644 index d03e3f1c647f935b94775c47992ce6bec30b1cb5..0000000000000000000000000000000000000000 --- a/0004-repo-source-traversal-bugfix.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 56d39a89eeeb54f20b413e4466d17fbc6b7337e4 Mon Sep 17 00:00:00 2001 -From: xyn-coder -Date: Mon, 21 Aug 2023 19:45:49 +0800 -Subject: [PATCH] repo source traversal bugfix - ---- - isomaker/img_repo.sh | 2 +- - isomaker/init.sh | 3 +-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/isomaker/img_repo.sh b/isomaker/img_repo.sh -index cb46708..530f3c7 100644 ---- a/isomaker/img_repo.sh -+++ b/isomaker/img_repo.sh -@@ -19,7 +19,7 @@ set -e - function create_install_img() - { - tmprep='' -- repos=($(echo "$YUMREPO" | sed 's/-s//g')) -+ repos=($(echo "$YUMREPO")) - for rep in ${repos[@]} - do - if [[ "${rep}" =~ "Epol" ]];then -diff --git a/isomaker/init.sh b/isomaker/init.sh -index c6a868e..26478ff 100644 ---- a/isomaker/init.sh -+++ b/isomaker/init.sh -@@ -140,12 +140,11 @@ function global_var_init() - YUMREPO="$CONFIG_YUM_REPOS" - CONFIG="$CONFIG_PACKAGES_LIST_FILE" - else -- YUMREPO="-s $YUM_REPO" -+ YUMREPO="$YUM_REPO" - CONFIG="" - fi - REPOS=$(echo "$REPOS1") - if [ "X$REPOS" != "X" ];then -- REPOS=$(echo " ""${REPOS}" | sed 's/ / -s /g') - YUMREPO="${REPOS}" - fi - set -e --- -2.33.0 - diff --git a/oemaker-3.0.2.tar.gz b/oemaker-3.0.2.tar.gz deleted file mode 100644 index 784ae8c11160c59bdd2a5cb8c555a36491d89499..0000000000000000000000000000000000000000 Binary files a/oemaker-3.0.2.tar.gz and /dev/null differ diff --git a/oemaker-3.0.5.tar.gz b/oemaker-3.0.5.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ca043def04836c98242b38f00c31e5e6a3245d43 Binary files /dev/null and b/oemaker-3.0.5.tar.gz differ diff --git a/oemaker.spec b/oemaker.spec index 66fb4e4ddaf5545c112dbca39ead3d50b2ae0be6..bf2eb8bd5e83ef457bb6450965b420c62bfd3b3d 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -10,8 +10,8 @@ Name: oemaker Summary: a building tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management -Version: 3.0.2 -Release: 8 +Version: 3.0.5 +Release: 1 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -26,11 +26,6 @@ Source7: desktop_normal_x86_64.xml Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2 Requires: lorax >= 19.6.78-1 - -Patch0001: 0001-change-rescue-parameter-with-new-anaconda.patch -Patch0002: 0002-enable-eject-in-install.img.patch -Patch0004: 0004-repo-source-traversal-bugfix.patch - %description a building tool for DVD ISO making and ISO cutting @@ -164,6 +159,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Mon Sep 19 2023 wangchong - 3.0.5-1 +- ID:NA +- SUG:NA +- DESC: upgrade to 3.0.5 + * Mon Sep 4 2023 luhuaxin - 3.0.2-8 - ID:NA - SUG:NA