From 1133cf8e9e652b4797ef9201187b9e7d1d74ba80 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 1 Dec 2020 06:58:54 +0800 Subject: [PATCH 1/3] [patch tracking] 20201201065849742706 - https://github.com/weldr/lorax/commit/bd37cd5b8751c0070392ff031be184f2a3f6aaf4 --- bd37cd5b8751c0070392ff031be184f2a3f6aaf4.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bd37cd5b8751c0070392ff031be184f2a3f6aaf4.patch diff --git a/bd37cd5b8751c0070392ff031be184f2a3f6aaf4.patch b/bd37cd5b8751c0070392ff031be184f2a3f6aaf4.patch new file mode 100644 index 0000000..f67cb97 --- /dev/null +++ b/bd37cd5b8751c0070392ff031be184f2a3f6aaf4.patch @@ -0,0 +1,13 @@ +diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl +index bef907616..17ce1648a 100644 +--- a/share/templates.d/99-generic/runtime-cleanup.tmpl ++++ b/share/templates.d/99-generic/runtime-cleanup.tmpl +@@ -264,7 +264,7 @@ removefrom nfs-utils /usr/sbin/showmount /usr/sbin/sm-notify + removefrom nfs-utils /usr/sbin/start-statd /var/lib/nfs/etab + removefrom nfs-utils /var/lib/nfs/rmtab /var/lib/nfs/statd/state + removefrom nss-softokn /usr/${libdir}/nss/* +-removefrom openldap /etc/openldap/* /usr/${libdir}/libldap_r-* ++removefrom openldap /etc/openldap/* + removefrom openssh /usr/libexec/* + removefrom openssh-clients /etc/ssh/* /usr/bin/ssh-* + removefrom openssh-clients /usr/libexec/* -- Gitee From 80fda5d007a83319acf87e5bb122925a98bfad8f Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 1 Dec 2020 06:58:55 +0800 Subject: [PATCH 2/3] [patch tracking] 20201201065849742706 - https://github.com/weldr/lorax/commit/a4e87a07e04558e46c2bbdbcbbb8684b70a25525 --- ...7a07e04558e46c2bbdbcbbb8684b70a25525.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 a4e87a07e04558e46c2bbdbcbbb8684b70a25525.patch diff --git a/a4e87a07e04558e46c2bbdbcbbb8684b70a25525.patch b/a4e87a07e04558e46c2bbdbcbbb8684b70a25525.patch new file mode 100644 index 0000000..4caa6da --- /dev/null +++ b/a4e87a07e04558e46c2bbdbcbbb8684b70a25525.patch @@ -0,0 +1,33 @@ +diff --git a/lorax.spec b/lorax.spec +index 0cdfbcd7f..7a628c5c4 100644 +--- a/lorax.spec ++++ b/lorax.spec +@@ -3,7 +3,7 @@ + %define debug_package %{nil} + + Name: lorax +-Version: 34.4 ++Version: 34.5 + Release: 1%{?dist} + Summary: Tool for creating the anaconda install images + +@@ -193,6 +193,12 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install + %{_mandir}/man1/composer-cli.1* + + %changelog ++* Mon Nov 30 2020 Brian C. Lane 34.5-1 ++- Don't remove libldap_r libraries during runtime-cleanup.tmpl (spichugi@redhat.com) ++- Do not use '--loglevel' option when running Anaconda (vtrefny@redhat.com) ++- Makefile: quiet rsync use in testing (bcl@redhat.com) ++- Switch to using GitHub Actions instead of Travis CI (bcl@redhat.com) ++ + * 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) +diff --git a/rel-eng/packages/lorax b/rel-eng/packages/lorax +index 5b4c3496c..cfcd73465 100644 +--- a/rel-eng/packages/lorax ++++ b/rel-eng/packages/lorax +@@ -1 +1 @@ +-34.4-1 ./ ++34.5-1 ./ -- Gitee From 07cd2e4f80d1cee6216d576e9d5fd28c2457f9b2 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 1 Dec 2020 06:58:55 +0800 Subject: [PATCH 3/3] [patch tracking] 20201201065849742706 - update spec file --- lorax.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lorax.spec b/lorax.spec index 3ed4224..8914511 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,8 @@ Patch9007: eliminate-difference.patch Patch9008: lorax-enable-GUI-installation.patch Patch9009: lorax-enable-anaconda-KdumpSpoke.patch Patch9010: lorax-delete-udisk2-iscsi.patch +Patch9011: bd37cd5b8751c0070392ff031be184f2a3f6aaf4.patch +Patch9012: a4e87a07e04558e46c2bbdbcbbb8684b70a25525.patch BuildRequires: python3-devel python3-sphinx_rtd_theme python3-magic @@ -203,6 +205,9 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/*.1* %changelog +* 20201201065849742706 patch-tracking 33.6-3 +- append patch file of upstream repository from to + * Feb Oct 13 2020 yuboyun - 33.6-2 - add yaml file @@ -304,4 +309,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