From b3c2b34c20c57d3d03aff5403b1c0bf9005eeaf5 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 3 Nov 2020 07:30:11 +0800 Subject: [PATCH 1/2] [patch tracking] 20201103073007626239 - https://github.com/weldr/lorax/commit/0e9262ba20c31ef059092a6819029ef2981ff00f --- ...62ba20c31ef059092a6819029ef2981ff00f.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 0e9262ba20c31ef059092a6819029ef2981ff00f.patch diff --git a/0e9262ba20c31ef059092a6819029ef2981ff00f.patch b/0e9262ba20c31ef059092a6819029ef2981ff00f.patch new file mode 100644 index 0000000..73e9185 --- /dev/null +++ b/0e9262ba20c31ef059092a6819029ef2981ff00f.patch @@ -0,0 +1,34 @@ +diff --git a/lorax.spec b/lorax.spec +index de04d6308..0cdfbcd7f 100644 +--- a/lorax.spec ++++ b/lorax.spec +@@ -3,7 +3,7 @@ + %define debug_package %{nil} + + Name: lorax +-Version: 34.3 ++Version: 34.4 + Release: 1%{?dist} + Summary: Tool for creating the anaconda install images + +@@ -193,6 +193,13 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install + %{_mandir}/man1/composer-cli.1* + + %changelog ++* Mon Nov 02 2020 Brian C. Lane 34.4-1 ++- Update the default release version to 34 (bcl@redhat.com) ++- Remove mdmonitor service from boot.iso (bcl@redhat.com) ++- Switch to using upstream mk-s390image for s390 cdboot.img creation (bcl@redhat.com) ++- sshd_config: Apply suggested changes (bcl@redhat.com) ++- lorax.spec: Add BuildRequires on systemd-rpm-macros for tmpfilesdir macro (bcl@redhat.com) ++ + * Wed Oct 07 2020 Brian C. Lane 34.3-1 + - composer: Fix open file warnings (bcl@redhat.com) + - ltmpl: Fix deprecated escape in docstring (bcl@redhat.com) +diff --git a/rel-eng/packages/lorax b/rel-eng/packages/lorax +index 5d08668b9..5b4c3496c 100644 +--- a/rel-eng/packages/lorax ++++ b/rel-eng/packages/lorax +@@ -1 +1 @@ +-34.3-1 ./ ++34.4-1 ./ -- Gitee From 540bc20cea2ff5b5c4bf5d04e33a0dd23b5d8481 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 3 Nov 2020 07:30:11 +0800 Subject: [PATCH 2/2] [patch tracking] 20201103073007626239 - update spec file --- lorax.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lorax.spec b/lorax.spec index 3ed4224..c7c13c7 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: 0e9262ba20c31ef059092a6819029ef2981ff00f.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 +* 20201103073007626239 patch-tracking 33.6-3 +- append patch file of upstream repository from <0e9262ba20c31ef059092a6819029ef2981ff00f> to <0e9262ba20c31ef059092a6819029ef2981ff00f> + * 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