!257 add pre patches
From: @sun_hai_10 Reviewed-by: @t_feng Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot
Gitee
commit
6052029b89
53
0001-change-rescue-parameter-with-new-anaconda.patch
Normal file
53
0001-change-rescue-parameter-with-new-anaconda.patch
Normal file
@ -0,0 +1,53 @@
|
||||
From 827754f12b73541273197eec7ba7a8a4b3eb2271 Mon Sep 17 00:00:00 2001
|
||||
From: sun_hai_10 <sunha10@huawei.com>
|
||||
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
|
||||
|
||||
25
0002-enable-eject-in-install.img.patch
Normal file
25
0002-enable-eject-in-install.img.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 40e9deb6d6ba1d8ad07c9903ce326d2053afdeff Mon Sep 17 00:00:00 2001
|
||||
From: sun_hai_10 <sunha10@huawei.com>
|
||||
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
|
||||
|
||||
11
oemaker.spec
11
oemaker.spec
@ -11,7 +11,7 @@ Summary: a building tool for DVD ISO making and ISO cutting
|
||||
License: Mulan PSL v2
|
||||
Group: System/Management
|
||||
Version: 3.0.2
|
||||
Release: 3
|
||||
Release: 4
|
||||
BuildRoot: %{_tmppath}/%{name}
|
||||
|
||||
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
@ -27,6 +27,9 @@ Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libs
|
||||
Requires: lorax >= 19.6.78-1
|
||||
|
||||
|
||||
Patch0001: 0001-change-rescue-parameter-with-new-anaconda.patch
|
||||
Patch0002: 0002-enable-eject-in-install.img.patch
|
||||
|
||||
%description
|
||||
a building tool for DVD ISO making and ISO cutting
|
||||
|
||||
@ -63,6 +66,7 @@ cp %{SOURCE6} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/aarch64/de
|
||||
rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/desktop_normal.xml
|
||||
cp %{SOURCE7} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/desktop_normal.xml
|
||||
cd %{_builddir}/%{name}-%{version}/%{name}
|
||||
%autopatch -p1
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}/opt/
|
||||
@ -159,6 +163,11 @@ rm -rf %{buildroot}
|
||||
rm -rf $RPM_BUILD_DIR/%{name}
|
||||
|
||||
%changelog
|
||||
* Thu Aug 07 2023 sunhai <sunhai10@huawei.com> - 3.0.2-4
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: add pre version patches
|
||||
|
||||
* Mon Jul 31 2023 liuyang <liuyang645@huawei.com> - 3.0.2-3
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user