From 43bb05b3b97ca9d8f632dac2ce003a0f32ddd3af Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 9 Dec 2020 03:58:54 +0800 Subject: [PATCH 1/2] [patch tracking] 20201209035849743332 - https://github.com/weldr/lorax/commit/07600b24180f5ec27903c3d178c09e73e2d5f0c8 --- 07600b24180f5ec27903c3d178c09e73e2d5f0c8.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 07600b24180f5ec27903c3d178c09e73e2d5f0c8.patch diff --git a/07600b24180f5ec27903c3d178c09e73e2d5f0c8.patch b/07600b24180f5ec27903c3d178c09e73e2d5f0c8.patch new file mode 100644 index 0000000..63339cb --- /dev/null +++ b/07600b24180f5ec27903c3d178c09e73e2d5f0c8.patch @@ -0,0 +1,12 @@ +diff --git a/lorax.spec b/lorax.spec +index 7a628c5c4..40506b076 100644 +--- a/lorax.spec ++++ b/lorax.spec +@@ -21,7 +21,6 @@ BuildRequires: systemd-rpm-macros + + Requires: lorax-templates + +-Requires: GConf2 + Requires: cpio + Requires: device-mapper + Requires: dosfstools -- Gitee From 68a01fcf8a13d2f7bcec738613b97071d4ade85b Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 9 Dec 2020 03:58:55 +0800 Subject: [PATCH 2/2] [patch tracking] 20201209035849743332 - update spec file --- lorax.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lorax.spec b/lorax.spec index 3ed4224..7ad7e2d 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: 07600b24180f5ec27903c3d178c09e73e2d5f0c8.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 +* 20201209035849743332 patch-tracking 33.6-3 +- append patch file of upstream repository from <07600b24180f5ec27903c3d178c09e73e2d5f0c8> to <07600b24180f5ec27903c3d178c09e73e2d5f0c8> + * 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