diff --git a/.gitignore b/.gitignore index 460acbe..86a1986 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rpm-ostree-2022.8.tar.xz +SOURCES/rpm-ostree-2022.19.tar.xz diff --git a/.rpm-ostree.metadata b/.rpm-ostree.metadata index eb2531e..91db9a8 100644 --- a/.rpm-ostree.metadata +++ b/.rpm-ostree.metadata @@ -1 +1 @@ -2f9c289889f50ee77b2c354f8722e239e5c8d42a SOURCES/rpm-ostree-2022.8.tar.xz +e07fc2eeed3979cf048a4db4e3b4d4218ee81791 SOURCES/rpm-ostree-2022.19.tar.xz diff --git a/SOURCES/0001-rust-scripts-Ignore-kernel-automotive-core.posttrans.patch b/SOURCES/0001-rust-scripts-Ignore-kernel-automotive-core.posttrans.patch deleted file mode 100644 index 904d6d2..0000000 --- a/SOURCES/0001-rust-scripts-Ignore-kernel-automotive-core.posttrans.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 34cdfd6e055e79a659364c5c97ee300d1672379a Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon -Date: Thu, 2 Jun 2022 11:39:55 -0400 -Subject: [PATCH] rust/scripts: Ignore `kernel-automotive-core.posttrans` - -Yet another kernel package variant whose %posttrans we want to ignore. - -As mentioned in there, I think we should change the strategy so that we -detect kernel packages like we do in the core based on its `Provides` to -know to ignore %posttrans. - -Alternatively/additionally, we should work with kernel and systemd teams -so that e.g. it short-circuits if it detects an "offline" system. That -would also benefit containers, which AFAIK even today runs dracut on -kernel installs. - -Closes: #3720 ---- - rust/src/scripts.rs | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/rust/src/scripts.rs b/rust/src/scripts.rs -index 3b15c629..1f59e390 100644 ---- a/rust/src/scripts.rs -+++ b/rust/src/scripts.rs -@@ -18,9 +18,11 @@ use phf::phf_set; - static IGNORED_PKG_SCRIPTS: phf::Set<&'static str> = phf_set! { - "glibc.prein", - // We take over depmod/dracut etc. It's `kernel` in C7 and kernel-core in F25+ -+ // XXX: we should probably change this to instead ignore based on the kernel virtual Provides - "kernel.posttrans", - "kernel-core.posttrans", - "kernel-debug-core.posttrans", -+ "kernel-automotive-core.posttrans", - // Additionally ignore posttrans scripts for the Oracle Linux `kernel-uek` package - "kernel-uek.posttrans", - // Legacy workaround --- -2.36.1 - diff --git a/SPECS/rpm-ostree.spec b/SPECS/rpm-ostree.spec index 0535e36..7c0dd04 100644 --- a/SPECS/rpm-ostree.spec +++ b/SPECS/rpm-ostree.spec @@ -3,14 +3,13 @@ Summary: Hybrid image/package system Name: rpm-ostree -Version: 2022.8 +Version: 2022.19 Release: 3%{?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-rust-scripts-Ignore-kernel-automotive-core.posttrans.patch ExclusiveArch: %{rust_arches} @@ -28,6 +27,13 @@ BuildRequires: rust # Embedded unit tests %bcond_with bin_unit_tests +# This is copied from the libdnf spec +%if 0%{?rhel} && ! 0%{?centos} +%bcond_without rhsm +%else +%bcond_with rhsm +%endif + # RHEL (8,9) doesn't ship zchunk today. Keep this in sync # with libdnf: https://gitlab.com/redhat/centos-stream/rpms/libdnf/-/blob/762f631e36d1e42c63a794882269d26c156b68c1/libdnf.spec#L45 %if 0%{?rhel} @@ -43,7 +49,6 @@ BuildRequires: autoconf automake libtool git # For docs BuildRequires: chrpath BuildRequires: gtk-doc -BuildRequires: gnome-common BuildRequires: /usr/bin/g-ir-scanner # Core requirements # One way to check this: `objdump -p /path/to/rpm-ostree | grep LIBOSTREE` and pick the highest (though that might miss e.g. new struct members) @@ -84,7 +89,7 @@ BuildRequires: jq ######################################################################### -%global libsolv_version 0.7.17 +%global libsolv_version 0.7.21 %global libmodulemd_version 2.13.0 %global librepo_version 1.13.1 @@ -96,23 +101,20 @@ BuildRequires: pkgconfig(librepo) >= %{librepo_version} BuildRequires: pkgconfig(check) BuildRequires: pkgconfig(gio-unix-2.0) >= 2.46.0 BuildRequires: pkgconfig(gtk-doc) -BuildRequires: rpm-devel >= 4.11.0 +BuildRequires: rpm-devel >= 4.15.0 +%if %{with rhsm} +BuildRequires: pkgconfig(librhsm) >= 0.0.3 +%endif %if %{with zchunk} BuildRequires: pkgconfig(zck) >= 0.9.11 %endif BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(cppunit) -BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(modulemd-2.0) >= %{libmodulemd_version} BuildRequires: pkgconfig(smartcols) BuildRequires: gettext BuildRequires: gpgme-devel -%if 0%{?rhel} <= 8 -# In current Fedora, this is a dependency of gpgme-devel, but -# not in RHEL8. Missing this package breaks -znow. -BuildRequires: libassuan-devel -%endif Requires: libmodulemd%{?_isa} >= %{libmodulemd_version} Requires: libsolv%{?_isa} >= %{libsolv_version} @@ -171,7 +173,8 @@ env NOCONFIGURE=1 ./autogen.sh %if 0%{?build_rustflags:1} export RUSTFLAGS="%{build_rustflags}" %endif -%configure --disable-silent-rules --enable-gtk-doc %{?rpmdb_default} %{?with_sanitizers:--enable-sanitizers} %{?with_bin_unit_tests:--enable-bin-unit-tests} +%configure --disable-silent-rules --enable-gtk-doc %{?rpmdb_default} %{?with_sanitizers:--enable-sanitizers} %{?with_bin_unit_tests:--enable-bin-unit-tests} \ + %{?with_rhsm:--enable-featuresrs=rhsm} %make_build @@ -236,7 +239,35 @@ $PYTHON autofiles.py > files.devel \ %files libs -f files.lib %files devel -f files.devel + %changelog +* Tue Dec 20 2022 Colin Walters - 2022.19-3 +- https://github.com/coreos/rpm-ostree/releases/tag/v2022.19 + Resolves: rhbz#2153460 + +* Wed Dec 14 2022 Colin Walters - 2022.18-2 +- https://github.com/coreos/rpm-ostree/releases/tag/v2022.18 + Resolves: rhbz#2153460 + +* Tue Nov 22 2022 Colin Walters - 2022.16-2 +- Rebase to 2022.16 + Resolves: rhbz#2144586 + +* Thu Oct 13 2022 Joseph Marrero - 2022.14-1 +- https://github.com/coreos/rpm-ostree/releases/tag/v2022.14 + +* Tue Sep 13 2022 Luca BRUNO - 2022.13-1 +- New upstream version + https://github.com/coreos/rpm-ostree/releases/tag/v2022.12 + Resolves: rhbz#2126108 + +* Tue Jul 19 2022 Colin Walters - 2022.12-2 +- https://github.com/coreos/rpm-ostree/releases/tag/v2022.12 + +* Mon Jul 11 2022 Colin Walters - 2022.11-2 +- https://github.com/coreos/rpm-ostree/releases/tag/v2022.11 + Resolves: rhbz#2105405 + * Thu Jun 09 2022 Jonathan Lebon - 2022.8-3 - Backport https://github.com/coreos/rpm-ostree/pull/3721 Resolves: rhbz#2094085