From 522a3277d36a54b1440a64c4a33109b4f06aed59 Mon Sep 17 00:00:00 2001 From: happy_orange Date: Mon, 17 Apr 2023 15:03:26 +0800 Subject: [PATCH] remove the ia32 package --- 1010-remove-ia32-package.patch | 38 ++++++++++++++++++++++++++++++++++ lorax-templates-anolis.spec | 6 +++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 1010-remove-ia32-package.patch diff --git a/1010-remove-ia32-package.patch b/1010-remove-ia32-package.patch new file mode 100644 index 0000000..07eba6f --- /dev/null +++ b/1010-remove-ia32-package.patch @@ -0,0 +1,38 @@ +From 0afc6bb603b73d5250f035ca58dd78ccacef54f5 Mon Sep 17 00:00:00 2001 +From: happy_orange +Date: Mon, 17 Apr 2023 14:58:12 +0800 +Subject: [PATCH 1/1] remove ia32 package + +--- + 80-anolis/live/live-install.tmpl | 1 - + 80-anolis/runtime-install.tmpl | 2 -- + 2 files changed, 3 deletions(-) + +diff --git a/80-anolis/live/live-install.tmpl b/80-anolis/live/live-install.tmpl +index 29cd0a3..50e4b9a 100644 +--- a/80-anolis/live/live-install.tmpl ++++ b/80-anolis/live/live-install.tmpl +@@ -15,7 +15,6 @@ + installpkg grub2-tools-efi + installpkg efibootmgr + installpkg shim-x64 grub2-efi-x64-cdboot +- installpkg shim-ia32 grub2-efi-ia32-cdboot + %endif + %if basearch in ("i386", "x86_64"): + installpkg biosdevname syslinux +diff --git a/80-anolis/runtime-install.tmpl b/80-anolis/runtime-install.tmpl +index 20e516c..410c774 100644 +--- a/80-anolis/runtime-install.tmpl ++++ b/80-anolis/runtime-install.tmpl +@@ -60,8 +60,6 @@ installpkg glibc-all-langpacks + installpkg efibootmgr + installpkg shim-x64 + installpkg grub2-efi-x64-cdboot +- installpkg shim-ia32 +- installpkg grub2-efi-ia32-cdboot + %endif + %if basearch in ("i386", "x86_64"): + installpkg biosdevname syslinux +-- +2.31.1 + diff --git a/lorax-templates-anolis.spec b/lorax-templates-anolis.spec index d7821c6..7e7ff76 100644 --- a/lorax-templates-anolis.spec +++ b/lorax-templates-anolis.spec @@ -1,4 +1,4 @@ -%define anolis_release 9 +%define anolis_release 10 Name: lorax-templates-anolis Version: 37.0 @@ -20,6 +20,7 @@ Patch1006: 1006-not-delete-auditctl-which-is-needed-by-anaconda.patch Patch1007: 1007-remove-gtk4-files.patch Patch1008: 1008-remove-some-unused-package.patch Patch1009: 1009-do-not-remove-libtiff-for-spice-vdagent.patch +Patch1010: 1010-remove-ia32-package.patch # Where are these supposed to end up? %define templatedir %{_datadir}/lorax/templates.d/80-anolis @@ -44,6 +45,9 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Mon Apr 17 2023 happy_orange - 37.0.1-10 +- remove the ia32 package + * Tue Apr 04 2023 Chunmei Xu - 37.0.1-9 - do not remote libtiff for spice-vdagent -- Gitee