diff --git a/.gitignore b/.gitignore index 8cba57a..440b591 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rpm-ostree-2022.1.tar.xz +SOURCES/rpm-ostree-2022.2.tar.xz diff --git a/.rpm-ostree.metadata b/.rpm-ostree.metadata index 5cb17ab..e683e54 100644 --- a/.rpm-ostree.metadata +++ b/.rpm-ostree.metadata @@ -1 +1 @@ -344d0438bdd32b6e982492b1e63956c9863db706 SOURCES/rpm-ostree-2022.1.tar.xz +1bcee7eba384617fb49922310275f708a97a2fcf SOURCES/rpm-ostree-2022.2.tar.xz diff --git a/SOURCES/0001-build-sys-Symlink-not-hard-link-ostree-container.patch b/SOURCES/0001-build-sys-Symlink-not-hard-link-ostree-container.patch deleted file mode 100644 index 1e2a835..0000000 --- a/SOURCES/0001-build-sys-Symlink-not-hard-link-ostree-container.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a50fde2ebc004c3bb5c0721b94a1a17f8296deeb Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Tue, 11 Jan 2022 15:05:12 -0500 -Subject: [PATCH] build-sys: Symlink, not hard link `ostree-container` - -It seems like the debuginfo processing code in RHEL8 fails in -this scenario: - -``` -$ Checking for unpackaged file(s): /usr/lib/rpm/check-files /builddir/build/BUILDROOT/rpm-ostree-2022.1-1.el8.x86_64 -RPM build errors: -error: Installed (but unpackaged) file(s) found: - /usr/lib/debug/usr/bin/rpm-ostree-2022.1-1.el8.x86_64.debug.#dwz#.Iybgi6 - Installed (but unpackaged) file(s) found: - /usr/lib/debug/usr/bin/rpm-ostree-2022.1-1.el8.x86_64.debug.#dwz#.Iybgi6 -Child return code was: 1 -``` - -Additionally, while hardlinks are conceptually cleaner, actually -because of SELinux they are highly likely to result in duplicate -disk usage. IOW we'd have to be sure `/usr/bin/ostree-container` -is also labeled `install_t`, otherwise ostree will compute different -digests for them. ---- - Makefile-rpm-ostree.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am -index 2dd19b5a..170d6b38 100644 ---- a/Makefile-rpm-ostree.am -+++ b/Makefile-rpm-ostree.am -@@ -138,7 +138,7 @@ BUILT_SOURCES += $(binding_generated_sources) - install-rpmostree-hook: - install -d -m 0755 $(DESTDIR)$(bindir) - install -m 0755 -t $(DESTDIR)$(bindir) rpm-ostree -- ln -T -f $(DESTDIR)$(bindir)/rpm-ostree $(DESTDIR)$(bindir)/ostree-container -+ ln -Tsr -f $(DESTDIR)$(bindir)/rpm-ostree $(DESTDIR)$(bindir)/ostree-container - INSTALL_EXEC_HOOKS += install-rpmostree-hook - - # Wraps `cargo test`. This is always a debug non-release build; --- -2.33.1 - diff --git a/SPECS/rpm-ostree.spec b/SPECS/rpm-ostree.spec index 7131711..4923bf9 100644 --- a/SPECS/rpm-ostree.spec +++ b/SPECS/rpm-ostree.spec @@ -3,17 +3,14 @@ Summary: Hybrid image/package system Name: rpm-ostree -Version: 2022.1 -Release: 1%{?dist} +Version: 2022.2 +Release: 2%{?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 -# https://github.com/coreos/rpm-ostree/pull/3323 -Patch0: 0001-build-sys-Symlink-not-hard-link-ostree-container.patch - ExclusiveArch: %{rust_arches} BuildRequires: make @@ -211,6 +208,9 @@ $PYTHON autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Mon Feb 07 2022 Colin Walters - 2022.2-2 +- Rebase to 2022.1 + * Tue Jan 11 2022 Colin Walters - 2022.1-2 - Rebase to 2022.1 Resolves: rhbz#2032594