add fix-compose-err.patch

(cherry picked from commit 9c13a01c185064e254230a16f5fcc1a69966e771)
This commit is contained in:
fu-shanqing 2022-10-10 11:25:36 +08:00 committed by openeuler-sync-bot
parent 82825e467a
commit 6f9a5bb5a5
2 changed files with 17 additions and 2 deletions

12
fix-compose-err.patch Normal file
View File

@ -0,0 +1,12 @@
--- rpm-ostree-2022.8/rust/src/scripts.rs 2022-04-21 01:08:14.000000000 +0800
+++ rpm-ostree-2022.8-new/rust/src/scripts.rs 2022-10-10 11:19:42.945934322 +0800
@@ -16,6 +16,9 @@ use phf::phf_set;
///
/// NOTE FOR GIT history: This list used to live in src/libpriv/rpmostree-script-gperf.gperf
static IGNORED_PKG_SCRIPTS: phf::Set<&'static str> = phf_set! {
+ "glibc-common.posttrans",
+ "grub2-efi-x64.prein",
+ "grub2-efi-aa64.prein",
"glibc.prein",
// We take over depmod/dracut etc. It's `kernel` in C7 and kernel-core in F25+
"kernel.posttrans",

View File

@ -4,12 +4,12 @@
Name: rpm-ostree
Version: 2022.8
Release: 2
Release: 3
Summary: Hybrid image/package system
License: Apache-2.0 or MIT and GPL-2.0-or-later and LGPL-2.0-or-later
URL: https://github.com/coreos/rpm-ostree
Source0: https://github.com/coreos/rpm-ostree/releases/download/v2022.8/%{name}-%{version}.tar.xz
Patch0: fix-compose-err.patch
%if %{with rust}
%if !%{defined rust_arches}
@ -114,6 +114,9 @@ install -pm 0644 src/daemon/org.projectatomic.rpmostree1.conf %{buildroot}/etc/d
%{_mandir}/man*/*
%changelog
* Mon Oct 10 2022 fushanqing <fushanqing@kylinos.cn> - 2022.8-3
- add fix-compose-err.patch
* Wed Aug 03 2022 liukuo <liukuo@kylinos.cn> - 2022.8-2
- License compliance rectification