From 6f9a5bb5a53c7e4e9284b07bca331da29a2a9e40 Mon Sep 17 00:00:00 2001 From: fu-shanqing Date: Mon, 10 Oct 2022 11:25:36 +0800 Subject: [PATCH] add fix-compose-err.patch (cherry picked from commit 9c13a01c185064e254230a16f5fcc1a69966e771) --- fix-compose-err.patch | 12 ++++++++++++ rpm-ostree.spec | 7 +++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 fix-compose-err.patch diff --git a/fix-compose-err.patch b/fix-compose-err.patch new file mode 100644 index 0000000..6000baf --- /dev/null +++ b/fix-compose-err.patch @@ -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", diff --git a/rpm-ostree.spec b/rpm-ostree.spec index 905e878..c5d2195 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -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 - 2022.8-3 +- add fix-compose-err.patch + * Wed Aug 03 2022 liukuo - 2022.8-2 - License compliance rectification