From a549110d7ef373afbca2b5094b25b1f45c14c60f Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 20 Oct 2020 02:30:12 +0800 Subject: [PATCH 1/2] [patch tracking] 20201020023007626676 - https://github.com/weldr/lorax/commit/6a8901fb09cb66741712ffebc558846a9f9f0574 --- 6a8901fb09cb66741712ffebc558846a9f9f0574.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 6a8901fb09cb66741712ffebc558846a9f9f0574.patch diff --git a/6a8901fb09cb66741712ffebc558846a9f9f0574.patch b/6a8901fb09cb66741712ffebc558846a9f9f0574.patch new file mode 100644 index 0000000..c437f2b --- /dev/null +++ b/6a8901fb09cb66741712ffebc558846a9f9f0574.patch @@ -0,0 +1,12 @@ +diff --git a/lorax.spec b/lorax.spec +index 1421a9d76..c8d911063 100644 +--- a/lorax.spec ++++ b/lorax.spec +@@ -17,6 +17,7 @@ Source0: %{name}-%{version}.tar.gz + + BuildRequires: python3-devel + BuildRequires: make ++BuildRequires: systemd-rpm-macros + + Requires: lorax-templates + -- Gitee From 0f56ad7c8e39aa063e35ef67bdf8a75f8d8c4d63 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 20 Oct 2020 02:30:12 +0800 Subject: [PATCH 2/2] [patch tracking] 20201020023007626676 - update spec file --- lorax.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lorax.spec b/lorax.spec index 3ed4224..7e107f0 100644 --- a/lorax.spec +++ b/lorax.spec @@ -3,7 +3,7 @@ Name: lorax Version: 33.6 -Release: 2 +Release: 3 Summary: A set of tools used to create bootable images License: GPLv2+ URL: https://github.com/weldr/lorax @@ -20,6 +20,7 @@ Patch9007: eliminate-difference.patch Patch9008: lorax-enable-GUI-installation.patch Patch9009: lorax-enable-anaconda-KdumpSpoke.patch Patch9010: lorax-delete-udisk2-iscsi.patch +Patch9011: 6a8901fb09cb66741712ffebc558846a9f9f0574.patch BuildRequires: python3-devel python3-sphinx_rtd_theme python3-magic @@ -203,6 +204,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/*.1* %changelog +* 20201020023007626676 patch-tracking 33.6-3 +- append patch file of upstream repository from <6a8901fb09cb66741712ffebc558846a9f9f0574> to <6a8901fb09cb66741712ffebc558846a9f9f0574> + * Feb Oct 13 2020 yuboyun - 33.6-2 - add yaml file @@ -304,4 +308,3 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin ignore the dir that without kernel version add text mode in aarch64 installation - -- Gitee