diff --git a/1013-remove-strace-in-loongarch.patch b/1013-remove-strace-in-loongarch.patch index f7f9222b1351cb5c56e92ff6c2026346c5d89939..17841d87b5e1678597937c01e184f02bf884672b 100644 --- a/1013-remove-strace-in-loongarch.patch +++ b/1013-remove-strace-in-loongarch.patch @@ -1,26 +1,25 @@ -From 3f142cc72fc0d9d39d9cbe55841d5c64113edd59 Mon Sep 17 00:00:00 2001 +From f7f2f24c699a8c30a17d95b3dd70a2bfa97ebfbc Mon Sep 17 00:00:00 2001 From: happy_orange -Date: Tue, 5 Dec 2023 20:01:20 +0800 -Subject: [PATCH 1/1] 1 +Date: Tue, 5 Dec 2023 20:52:46 +0800 +Subject: [PATCH 1/1] remove strace package in loongarch 64 --- - 80-anolis/runtime-install.tmpl | 5 +++++ - 1 file changed, 5 insertions(+) + 80-anolis/runtime-install.tmpl | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/80-anolis/runtime-install.tmpl b/80-anolis/runtime-install.tmpl -index 5e4a137..4ecec95 100644 +index 5e4a137..474523d 100644 --- a/80-anolis/runtime-install.tmpl +++ b/80-anolis/runtime-install.tmpl -@@ -166,7 +166,12 @@ installpkg python3-pyatspi +@@ -166,7 +166,10 @@ installpkg python3-pyatspi ## extra tools not required by anaconda ## installpkg nano nano-default-editor installpkg nano -+%if basearch != "loongarch64": - installpkg vim-minimal strace lsof dump xz less -+%else +-installpkg vim-minimal strace lsof dump xz less +installpkg vim-minimal lsof dump xz less ++%if basearch != "loongarch64": ++ installpkg strace +%endif -+ installpkg wget rsync bind-utils ftp mtr vconfig installpkg spice-vdagent installpkg gdisk hexedit sg3_utils diff --git a/lorax-templates-anolis.spec b/lorax-templates-anolis.spec index 769e93febaf377a751e505372f0a447708e801ca..9b03e1a362ab9e93eba014812a4fb3f4acb84cfd 100644 --- a/lorax-templates-anolis.spec +++ b/lorax-templates-anolis.spec @@ -1,4 +1,4 @@ -%define anolis_release 13 +%define anolis_release 14 Name: lorax-templates-anolis Version: 37.0 @@ -25,6 +25,7 @@ Patch1011: 1011-remove-the-nm-applet.patch Patch1012: 1012-add-kmod-ast-in-anaconda.patch Patch1013: 1013-remove-strace-in-loongarch.patch + # Where are these supposed to end up? %define templatedir %{_datadir}/lorax/templates.d/80-anolis @@ -48,7 +49,10 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog -* Mon Dec 05 2023 happy_orange - 37.0.1-13 +* Tue Dec 05 2023 happy_orange - 37.0.1-14 +- remove strace in loongarch + +* Tue Dec 05 2023 happy_orange - 37.0.1-13 - remove strace in loongarch * Fri Jun 16 2023 happy_orange - 37.0.1-12