Cherry pick patch to work around filesystem package

This commit is contained in:
Colin Walters 2022-08-07 10:29:25 -04:00
parent b49e8b9015
commit 0e40231a60
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From 668cc225ad0440cee5bd65021d4fc3002c7329ce Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 5 Aug 2022 14:14:09 -0400
Subject: [PATCH] scripts: Ignore filesystem.posttrans
New in rawhide.
The entire filesystem package is insane. Every hack in there would go
away if we just taught traditional yum/dnf to install it first, in
the same way we do in rpm-ostree.
---
rust/src/scripts.rs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rust/src/scripts.rs b/rust/src/scripts.rs
index 1f59e390..078322ab 100644
--- a/rust/src/scripts.rs
+++ b/rust/src/scripts.rs
@@ -32,6 +32,10 @@ static IGNORED_PKG_SCRIPTS: phf::Set<&'static str> = phf_set! {
// Looks like legacy...
"ca-certificates.prein",
"libgcc.post",
+ // The entire filesystem package is insane. Every hack in there would go
+ // away if we just taught traditional yum/dnf to install it first, in
+ // the same way we do in rpm-ostree.
+ "filesystem.posttrans",
"setup.post",
"pinentry.prein",
"fedora-release.posttrans",
--
2.35.1

View File

@ -4,13 +4,15 @@
Summary: Hybrid image/package system
Name: rpm-ostree
Version: 2022.12
Release: 3%{?dist}
Release: 4%{?dist}
License: LGPLv2+
URL: https://github.com/coreos/rpm-ostree
# This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
# in the upstream git. It also contains vendored Rust sources.
Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz
Patch0: 0001-scripts-Ignore-filesystem.posttrans.patch
ExclusiveArch: %{rust_arches}
BuildRequires: make
@ -235,6 +237,9 @@ $PYTHON autofiles.py > files.devel \
%files devel -f files.devel
%changelog
* Sun Aug 07 2022 Colin Walters <walters@verbum.org> - 2022.12-4
- Cherry pick patch to work around filesystem package
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2022.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild