From 3ff45b86f90aadd85ab8f8e0070568bbce8ffdcb Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Thu, 24 Feb 2022 14:43:10 +0800 Subject: [PATCH] treeinfo: correct images-xen tree info Signed-off-by: Liwei Ge --- 1002-correct-images_xen-tree-info.patch | 14 ++++++++++++++ lorax-templates-anolis.spec | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 1002-correct-images_xen-tree-info.patch diff --git a/1002-correct-images_xen-tree-info.patch b/1002-correct-images_xen-tree-info.patch new file mode 100644 index 0000000..ff22801 --- /dev/null +++ b/1002-correct-images_xen-tree-info.patch @@ -0,0 +1,14 @@ +diff -Nur lorax-templates-anolis-8.3/80-anolis/x86.tmpl lorax-templates-anolis-8.3.new/80-anolis/x86.tmpl +--- lorax-templates-anolis-8.3/80-anolis/x86.tmpl 2022-02-24 14:37:45.519571981 +0800 ++++ lorax-templates-anolis-8.3.new/80-anolis/x86.tmpl 2022-02-24 14:20:47.056594971 +0800 +@@ -71,8 +71,8 @@ + %endfor + + %if basearch == 'x86_64': +- treeinfo images-xen kernel ${KERNELDIR}/vmlinuz +- treeinfo images-xen initrd ${KERNELDIR}/initrd.img ++ treeinfo images-xen kernel ${KERNELDIR}/vmlinuz-${kernel.version} ++ treeinfo images-xen initrd ${KERNELDIR}/initrd-${kernel.version}.img + %endif + + ## WHeeeeeeee, EFI. diff --git a/lorax-templates-anolis.spec b/lorax-templates-anolis.spec index 867a91e..65b2d6a 100644 --- a/lorax-templates-anolis.spec +++ b/lorax-templates-anolis.spec @@ -1,4 +1,4 @@ -%define anolis_release 5 +%define anolis_release 6 Name: lorax-templates-anolis Version: 8.3 Release: 4.%{anolis_release}%{?dist} @@ -11,6 +11,7 @@ Source0: lorax-templates-anolis-8.3-4.tar.gz Patch1000: 1000-lorax-templates-anolis-add-loongarch64-support.patch Patch1001: 1001-install-kernel-with-version-suffixed.patch +Patch1002: 1002-correct-images_xen-tree-info.patch # Where are these supposed to end up? %define templatedir %{_datadir}/lorax/templates.d/80-anolis @@ -23,6 +24,7 @@ placed in %{templatedir} %setup %patch1000 -p1 %patch1001 -p1 +%patch1002 -p1 %build # nothing to build @@ -37,6 +39,9 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Thu Feb 24 2022 Liwei Ge - 8.3-4.6 +- Correct images-xen tree info + * Thu Feb 24 2022 Liwei Ge - 8.3-4.5 - Fix efi templates -- Gitee