Compare commits

...

No commits in common. "c8" and "c9s" have entirely different histories.
c8 ... c9s

11 changed files with 652 additions and 214 deletions

129
.gitignore vendored
View File

@ -1 +1,128 @@
SOURCES/rpm-ostree-2022.10.117.g52714b51.tar.xz
/rpm-ostree-2014.5.8.ge3264d9.tar.xz
/rpm-ostree-2014.6.tar.xz
/rpm-ostree-2014.6.3.g5707fa7.tar.xz
/rpm-ostree-2014.7.tar.xz
/rpm-ostree-2014.8.tar.xz
/rpm-ostree-2014.100.tar.xz
/rpm-ostree-2014.101.tar.xz
/rpm-ostree-2014.101.5.g87a00be.tar.xz
/rpm-ostree-2014.103.tar.xz
/rpm-ostree-2014.104.tar.xz
/rpm-ostree-2014.105.tar.xz
/rpm-ostree-2014.106.tar.xz
/rpm-ostree-2014.107.tar.xz
/rpm-ostree-2014.109.tar.xz
/rpm-ostree-2014.110.tar.xz
/rpm-ostree-2014.111.tar.xz
/rpm-ostree-2014.112.tar.xz
/rpm-ostree-2014.113.tar.xz
/rpm-ostree-2014.114.tar.xz
/rpm-ostree-2015.2.tar.xz
/rpm-ostree-2015.3.tar.xz
/rpm-ostree-2015.4.tar.xz
/rpm-ostree-2015.5.tar.xz
/rpm-ostree-2015.6.tar.xz
/rpm-ostree-2015.7.tar.xz
/rpm-ostree-2015.8.tar.xz
/rpm-ostree-2015.9.tar.xz
/rpm-ostree-2015.10.tar.xz
/rpm-ostree-2015.11.tar.xz
/rpm-ostree-2015.11.43.ga2c052b.tar.xz
/libhif.tar.gz
/rpm-ostree-2016.1.tar.xz
/rpm-ostree-2016.2.tar.xz
/rpm-ostree-2016.3.tar.xz
/rpm-ostree-2016.3.3.g17fb980.tar.xz
/rpm-ostree-2016.4.tar.xz
/rpm-ostree-2016.5.tar.xz
/rpm-ostree-2016.6.tar.xz
/rpm-ostree-2016.7.tar.xz
/rpm-ostree-2016.8.tar.xz
/rpm-ostree-2016.9.tar.xz
/rpm-ostree-2016.10.tar.xz
/rpm-ostree-2016.11.tar.xz
/rpm-ostree-2016.12.tar.xz
/rpm-ostree-2016.13.tar.xz
/rpm-ostree-2017.1.tar.xz
/rpm-ostree-2017.2.tar.xz
/rpm-ostree-2017.3.tar.xz
/rpm-ostree-2017.4.tar.xz
/rpm-ostree-2017.5.tar.xz
/rpm-ostree-2017.6.tar.xz
/rpm-ostree-2017.6.67.g417a3d8.tar.xz
/rpm-ostree-2017.7.tar.xz
/rpm-ostree-2017.8.tar.xz
/rpm-ostree-2017.9.tar.xz
/rpm-ostree-2017.10.tar.xz
/rpm-ostree-2017.11.tar.xz
/rpm-ostree-2018.1.tar.xz
/rpm-ostree-2018.2.tar.xz
/rpm-ostree-2018.3.tar.xz
/rpm-ostree-2018.4.tar.xz
/rpm-ostree-2018.5.tar.xz
/rpm-ostree-2018.6.tar.xz
/rpm-ostree-2018.6.42.gda27b94b.tar.xz
/rpm-ostree-2018.7.tar.xz
/rpm-ostree-2018.8.tar.xz
/rpm-ostree-2018.9.tar.xz
/rpm-ostree-2018.10.tar.xz
/rpm-ostree-2019.1.tar.xz
/rpm-ostree-2019.2.tar.xz
/rpm-ostree-2019.3.tar.xz
/rpm-ostree-2019.3.5.g0da9f997.tar.xz
/rpm-ostree-2019.4.tar.xz
/rpm-ostree-2019.4.10.gc1cc0827.tar.xz
/rpm-ostree-2019.4.15.gbbc9aa9f.tar.xz
/rpm-ostree-2019.4.27.gb381e029.tar.xz
/rpm-ostree-2019.4.28.g44395673.tar.xz
/rpm-ostree-2019.4.39.g8d90d03d.tar.xz
/rpm-ostree-2019.5.tar.xz
/rpm-ostree-2019.5.7.gcac5aa41.tar.xz
/rpm-ostree-2019.6.tar.xz
/rpm-ostree-2019.6.24.gfec61ce5.tar.xz
/rpm-ostree-2019.6.27.g3b8a1ec6.tar.xz
/rpm-ostree-2019.7.tar.xz
/rpm-ostree-2019.7.31.g70c38563.tar.xz
/rpm-ostree-2020.1.tar.xz
/rpm-ostree-2020.1.21.ge9011530.tar.xz
/rpm-ostree-2020.1.80.g3ec5e287.tar.xz
/rpm-ostree-2020.2.tar.xz
/rpm-ostree-2020.3.tar.xz
/rpm-ostree-2020.4.tar.xz
/rpm-ostree-2020.4.15.g8b0bcd7b.tar.xz
/rpm-ostree-2020.5.tar.xz
/rpm-ostree-2020.6.tar.xz
/rpm-ostree-2020.7.tar.xz
/rpm-ostree-2020.8.tar.xz
/rpm-ostree-2020.9.tar.xz
/rpm-ostree-2020.10.tar.xz
/rpm-ostree-2021.1.tar.xz
/rpm-ostree-2021.2.tar.xz
/rpm-ostree-2021.5.tar.xz
/rust-openssl-770ba32702abd2b4cab80727958c27ac3043c3ec.tar.gz
/rpm-ostree-2021.6.tar.xz
/rpm-ostree-2021.14.tar.xz
/rpm-ostree-2022.1.tar.xz
/rpm-ostree-2022.2.tar.xz
/rpm-ostree-2022.7.tar.xz
/rpm-ostree-2022.8.tar.xz
/rpm-ostree-2022.11.tar.xz
/rpm-ostree-2022.12.tar.xz
/rpm-ostree-2022.13.tar.xz
/rpm-ostree-2022.14.tar.xz
/rpm-ostree-2022.16.tar.xz
/rpm-ostree-2022.18.tar.xz
/rpm-ostree-2022.19.tar.xz
/rpm-ostree-2023.2.tar.xz
/rpm-ostree-2023.3.tar.xz
/rpm-ostree-2023.4.tar.xz
/rpm-ostree-2023.5.tar.xz
/ostree-ext.vendor.tar.gz
/rpm-ostree-2023.6.tar.xz
/rpm-ostree-2023.7.tar.xz
/rpm-ostree-2023.8.tar.xz
/rpm-ostree-2023.11.tar.xz
/rpm-ostree-2023.12.tar.xz
/rpm-ostree-2024.1.tar.xz
/rpm-ostree-2024.2.tar.xz
/rpm-ostree-2024.3.tar.xz

View File

@ -1 +1 @@
43d5b34cf6b8c77fc2f17429dcc1d385c885b032 SOURCES/rpm-ostree-2022.10.117.g52714b51.tar.xz
dc6e0ea9f33f162b5ca2d1ea1cb79ec7f9f7d71c rpm-ostree-2024.3.tar.xz

View File

@ -0,0 +1,56 @@
From d02993e30078db2a04820065ccbf22bd56d0d064 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Thu, 22 Feb 2024 14:44:50 -0500
Subject: [PATCH] cliwrap/rpm: mark `--eval`/`-E` as safe
This is sometimes used in scripts to query aspects of the host system.
E.g. this is used by Fedora's pkg-config:
https://src.fedoraproject.org/rpms/pkgconf/blob/95c0bbee/f/pkg-config.in#_6
This in turn gets hit by kdump which runs dracut which has modules that
runs `pkgconf` to query some directory paths.
---
rust/src/cliwrap/rpm.rs | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/rust/src/cliwrap/rpm.rs b/rust/src/cliwrap/rpm.rs
index c6ed5901..3332f76c 100644
--- a/rust/src/cliwrap/rpm.rs
+++ b/rust/src/cliwrap/rpm.rs
@@ -19,6 +19,12 @@ fn new_rpm_app() -> Command {
.long("version")
.action(clap::ArgAction::Version),
)
+ .arg(
+ Arg::new("eval")
+ .long("eval")
+ .short('E')
+ .action(clap::ArgAction::Set),
+ )
.arg(
Arg::new("package")
.help("package")
@@ -130,6 +136,19 @@ mod tests {
Ok(())
}
+ #[test]
+ fn test_eval() -> Result<()> {
+ assert_eq!(
+ disposition(SystemHostType::OstreeHost, &["-E", "%{_target_cpu}"])?,
+ RunDisposition::Ok
+ );
+ assert_eq!(
+ disposition(SystemHostType::OstreeHost, &["--eval=%{_target_cpu}}"])?,
+ RunDisposition::Ok
+ );
+ Ok(())
+ }
+
#[test]
fn test_query_file() -> Result<()> {
assert_eq!(
--
2.43.2

View File

@ -0,0 +1,64 @@
From 53fb8c7cb7075e4ecda4564f3a17af84ad4a2e32 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 21 Jul 2023 15:21:00 -0400
Subject: [PATCH] main: Update ostree-ext, add provisional-repair entrypoint
This updates us to vendor the provisional-repair code. One can
now run `ostree provisional-repair` directly.
(Yes, it's very confusing how in rpm-ostree, we vendor the ostree-ext
source, and then install a wrapper symlink which tells the main
(C) `ostree` binary to call back into us... but it's how the
`ostree container` stuff has been working for a long time)
---
Cargo.lock | 4 ++--
Makefile-rpm-ostree.am | 1 +
rust/src/main.rs | 4 +++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 5ae6366a..c6826a4d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1775,9 +1775,9 @@ dependencies = [
[[package]]
name = "ostree-ext"
-version = "0.11.1"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a690495144c18cb333a67a2ec61dd008831710bbd37804cfa79ab93b51146a6f"
+checksum = "8511513a60fa0c20a84ba8d30255286687c848bec21d24cd3dd4d16ecf48123b"
dependencies = [
"anyhow",
"async-compression 0.3.15",
diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am
index 2ef84f83..be80a6d7 100644
--- a/Makefile-rpm-ostree.am
+++ b/Makefile-rpm-ostree.am
@@ -132,6 +132,7 @@ install-rpmostree-hook:
install -m 0755 -t $(DESTDIR)$(bindir) rpm-ostree
install -d -m 0755 $(ostreeextdir)
ln -Tsr -f $(DESTDIR)$(bindir)/rpm-ostree $(ostreeextdir)/ostree-ima-sign
+ ln -Tsr -f $(DESTDIR)$(bindir)/rpm-ostree $(ostreeextdir)/ostree-provisional-repair
ln -Tsr -f $(DESTDIR)$(bindir)/rpm-ostree $(ostreeextdir)/ostree-container
INSTALL_EXEC_HOOKS += install-rpmostree-hook
diff --git a/rust/src/main.rs b/rust/src/main.rs
index 9088c5f0..569cf094 100644
--- a/rust/src/main.rs
+++ b/rust/src/main.rs
@@ -53,7 +53,9 @@ async fn dispatch_ostree_ext(args: Vec<String>) -> Result<i32> {
/// Dispatch multicall binary to relevant logic, based on callname from `argv[0]`.
async fn dispatch_multicall(callname: String, args: Vec<String>) -> Result<i32> {
match callname.as_str() {
- "ostree-container" | "ostree-ima-sign" => dispatch_ostree_ext(args).await,
+ "ostree-container" | "ostree-ima-sign" | "ostree-provisional-repair" => {
+ dispatch_ostree_ext(args).await
+ }
_ => inner_async_main(args).await, // implicitly includes "rpm-ostree"
}
}
--
2.40.1

View File

@ -1,48 +0,0 @@
From f340dbbfd6a3acc8b85d487a32a78c4517ace1c4 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 7 Dec 2022 20:14:06 -0500
Subject: [PATCH] override: Honor `--install` in container case too
Closes: https://github.com/coreos/rpm-ostree/issues/4192
---
ci/test-container.sh | 8 ++++++--
src/app/rpmostree-override-builtins.cxx | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ci/test-container.sh b/ci/test-container.sh
index be0f9549..342808e4 100755
--- a/ci/test-container.sh
+++ b/ci/test-container.sh
@@ -84,11 +84,15 @@ rpm-ostree override replace --experimental --from repo=fedora-coreos-pool \
rpm -q afterburn-5.2.0-4.fc36.x86_64 afterburn-dracut-5.2.0-4.fc36.x86_64
-# test repo override by pkgname
-rpm-ostree override replace --experimental \
+# test repo override by pkgname, and also test --install
+if rpm -q strace; then
+ echo "strace should not be installed"; exit 1
+fi
+rpm-ostree override replace --install strace --experimental \
--from repo=copr:copr.fedorainfracloud.org:group_CoreOS:continuous \
afterburn \
afterburn-dracut
+rpm -q strace
# the continuous build's version has the git rev, prefixed with g
rpm -q afterburn | grep g
diff --git a/src/app/rpmostree-override-builtins.cxx b/src/app/rpmostree-override-builtins.cxx
index 41ab56f4..0c07ff53 100644
--- a/src/app/rpmostree-override-builtins.cxx
+++ b/src/app/rpmostree-override-builtins.cxx
@@ -204,6 +204,7 @@ handle_override (RPMOSTreeSysroot *sysroot_proxy, RpmOstreeCommandInvocation *in
CXX_TRY_VAR (pkgs, rpmostreecxx::stage_container_rpm_raw_fds (fds), error);
treefile->add_packages_override_replace_local (pkgs);
}
+ treefile->add_packages (util::rust_stringvec_from_strv (install_pkgs), true);
treefile->add_packages_override_remove (util::rust_stringvec_from_strv (override_remove));
return rpmostree_container_rebuild (*treefile, cancellable, error);
}
--
2.41.0

View File

@ -1,38 +0,0 @@
From cb777d950511e29dcb822b4ccba23e43cd63e9cb Mon Sep 17 00:00:00 2001
From: Joseph Marrero <jmarrero@redhat.com>
Date: Fri, 4 Aug 2023 08:27:39 -0400
Subject: [PATCH] scripts: also ignore kernel-debug-modules.posttrans
---
rust/src/scripts.rs | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/rust/src/scripts.rs b/rust/src/scripts.rs
index 1f59e390..b8ab6623 100644
--- a/rust/src/scripts.rs
+++ b/rust/src/scripts.rs
@@ -21,8 +21,21 @@ static IGNORED_PKG_SCRIPTS: phf::Set<&'static str> = phf_set! {
// XXX: we should probably change this to instead ignore based on the kernel virtual Provides
"kernel.posttrans",
"kernel-core.posttrans",
+ "kernel-modules.posttrans",
+ "kernel-redhat-core.posttrans",
+ "kernel-redhat-modules.posttrans",
"kernel-debug-core.posttrans",
+ "kernel-debug-modules.posttrans",
+ "kernel-redhat-debug-core.posttrans",
+ "kernel-redhat-debug-modules.posttrans",
"kernel-automotive-core.posttrans",
+ "kernel-automotive-modules.posttrans",
+ "kernel-automotive-debug-core.posttrans",
+ "kernel-automotive-debug-modules.posttrans",
+ "kernel-rt-core.posttrans",
+ "kernel-rt-modules.posttrans",
+ "kernel-rt-debug-core.posttrans",
+ "kernel-rt-debug-modules.posttrans",
// Additionally ignore posttrans scripts for the Oracle Linux `kernel-uek` package
"kernel-uek.posttrans",
// Legacy workaround
--
2.41.0

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} # this is the testcase identifier, which OSCI pipeline uses

54
import-spec Executable file
View File

@ -0,0 +1,54 @@
#!/bin/bash
set -euo pipefail
KEEP_V_R=
while [ $# -gt 0 ]; do
case "$1" in
-h | --help)
echo "Usage: $0 [--keep-v-r]" >&2
exit 0
;;
--keep-v-r)
KEEP_V_R=1
;;
*)
echo "$0: unrecognized option: $1" >&2
exit 1
;;
esac
shift
done
main() {
local upstream
upstream=$(get_parsed_spec_field URL)
curl --fail-early -Lo rpm-ostree.spec.new "$upstream/raw/main/packaging/rpm-ostree.spec.in"
sed -ne '/%changelog/,$ p' rpm-ostree.spec >> rpm-ostree.spec.new
if [ -n "${KEEP_V_R}" ]; then
local version release
version=$(get_raw_spec_field Version)
release=$(get_raw_spec_field Release)
sed -ie "s/^Version:.*/Version: $version/" rpm-ostree.spec.new
sed -ie "s/^Release:.*/Release: $release/" rpm-ostree.spec.new
fi
if git diff --quiet --exit-code rpm-ostree.spec; then
mv rpm-ostree.spec.new rpm-ostree.spec
echo "Updated rpm-ostree.spec" >&2
else
echo "Refusing to overwrite dirty rpm-ostree.spec" >&2
echo "Updated rpm-ostree.spec.new" >&2
fi
}
get_parsed_spec_field() {
rpmspec -P rpm-ostree.spec | grep "^${1}: " | head -n1 | cut -d ' ' -f 2
}
get_raw_spec_field() {
grep "^${1}: " rpm-ostree.spec | head -n1 | cut -d ' ' -f 2
}
main "$@"

View File

@ -3,27 +3,22 @@
Summary: Hybrid image/package system
Name: rpm-ostree
Version: 2022.10.117.g52714b51
Release: 3%{?dist}
Version: 2024.3
Release: 1%{?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. This is generated from the "rhel8" branch.
# 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-override-Honor-install-in-container-case-too.patch
Patch1: 0002-scripts-also-ignore-kernel-debug-modules.posttrans.patch
Patch0: 0001-cliwrap-rpm-mark-eval-E-as-safe.patch
ExclusiveArch: %{rust_arches}
BuildRequires: make
%if 0%{?rhel} && !0%{?eln}
BuildRequires: rust-toolset
%else
BuildRequires: rust-packaging
BuildRequires: cargo
BuildRequires: rust
%endif
# Enable ASAN + UBSAN
%bcond_with sanitizers
@ -37,19 +32,14 @@ BuildRequires: rust
%bcond_with rhsm
%endif
# RHEL8 doesn't ship zchunk today. See also the comments
# in configure.ac around this as libdnf/librepo need to be in
# sync, and today we bundle libdnf but not librepo.
%if 0%{?rhel} && 0%{?rhel} <= 8
# 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}
%bcond_with zchunk
%else
%bcond_without zchunk
%endif
%if 0%{?fedora} >= 34
%define sqlite_rpmdb_default "--enable-sqlite-rpmdb-default"
%endif
# For the autofiles bits below
BuildRequires: python3-devel
# We always run autogen.sh
@ -57,11 +47,10 @@ 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)
BuildRequires: pkgconfig(ostree-1) >= 2020.7
BuildRequires: pkgconfig(ostree-1) >= 2021.5
BuildRequires: pkgconfig(polkit-gobject-1)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(rpm) >= 4.14.0
@ -85,41 +74,54 @@ BuildRequires: pkgconfig(check)
# but duplicating to be clear)
BuildRequires: pkgconfig(libsolv)
# We need g++ for libdnf
BuildRequires: gcc-c++
# These are build deps which aren't strictly required in Koji/Brew builds, but
# are required for git builds. Since they're few and tiny, we just add it here
# to keep it part of `dnf builddep`.
BuildRequires: jq
#########################################################################
# libdnf build deps #
# #
# Copy/pasted from libdnf/libdnf.spec. Removed the irrelevant bits like #
# valgrind, rhsm, swig, python, and sanitizer stuff. #
#########################################################################
# more libdnf build deps (see libdnf's spec for versions; maintain ordering)
%global libsolv_version 0.7.17
%global libmodulemd_version 2.11.2-2
%global librepo_version 1.13.0
%global swig_version 3.0.12
BuildRequires: swig >= %{swig_version}
BuildRequires: pkgconfig(modulemd-2.0) >= %{libmodulemd_version}
BuildRequires: pkgconfig(librepo) >= %{librepo_version}
%global libsolv_version 0.7.21
%global libmodulemd_version 2.13.0
%global librepo_version 1.13.1
BuildRequires: cmake
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libsolv-devel >= %{libsolv_version}
BuildRequires: pkgconfig(json-c)
BuildRequires: pkgconfig(cppunit)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(smartcols)
%if %{with zchunk}
BuildRequires: pkgconfig(zck) >= 0.9.11
%endif
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
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.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(modulemd-2.0) >= %{libmodulemd_version}
BuildRequires: pkgconfig(smartcols)
BuildRequires: gettext
BuildRequires: gpgme-devel
# Runtime libdnf deps
Requires: libmodulemd%{?_isa} >= %{libmodulemd_version}
Requires: libsolv%{?_isa} >= %{libsolv_version}
Requires: librepo%{?_isa} >= %{librepo_version}
#########################################################################
# end of libdnf build deps #
#########################################################################
# For now...see https://github.com/projectatomic/rpm-ostree/pull/637
# and https://github.com/fedora-infra/fedmsg-atomic-composer/pull/17
# etc. We'll drop this dependency at some point in the future when
@ -128,6 +130,10 @@ Requires: ostree
Requires: bubblewrap
Requires: fuse
# For container functionality
# https://github.com/coreos/rpm-ostree/issues/3286
Recommends: skopeo
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description
@ -153,6 +159,9 @@ The %{name}-devel package includes the header files for %{name}-libs.
%prep
%autosetup -Sgit -n %{name}-%{version}
%if 0%{?__isa_bits} == 32
sed -ie 's,^lto = true,lto = false,' Cargo.toml
%endif
%build
env NOCONFIGURE=1 ./autogen.sh
@ -207,7 +216,7 @@ $PYTHON autofiles.py > files \
'%{_libexecdir}/rpm-ostree*' \
'%{_libexecdir}/libostree/ext/*' \
'%{_datadir}/polkit-1/actions/*.policy' \
'%{_datadir}/dbus-1/system-services' \
'%{_datadir}/dbus-1/system-services/*' \
'%{_datadir}/bash-completion/completions/*'
$PYTHON autofiles.py > files.lib \
@ -230,125 +239,326 @@ $PYTHON autofiles.py > files.devel \
%files devel -f files.devel
%changelog
* Thu Oct 05 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.10.117.g52714b51-3
* Sun Feb 25 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.3-1
- https://github.com/coreos/rpm-ostree/releases/tag/v2024.3
Backport https://github.com/coreos/rpm-ostree/commit/fe586621e5014d14f92b913338171a02ed29e6cc
Resolves: #RHEL-26186
* Wed Jan 24 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.2-1
- https://github.com/coreos/rpm-ostree/releases/tag/v2024.2
Resolves: #RHEL-11294
* Wed Jan 03 2024 Colin Walters <walters@verbum.org> - 2024.1-2
- https://github.com/coreos/rpm-ostree/releases/tag/v2024.1
Resolves: #RHEL-11294
* Mon Dec 18 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.12-1
- https://github.com/coreos/rpm-ostree/releases/tag/v2023.12
Resolves: #RHEL-11294
* Wed Dec 13 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.11-1
- https://github.com/coreos/rpm-ostree/releases/tag/v2023.11
Resolves: #RHEL-11294
* Thu Oct 05 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.8-3
- Use python macros and devel package
Resolves: #RHEL-2243
Resolves: #RHEL-11892
* Mon Aug 07 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.10.117.g52714b51-2
- Backport fb97c48f3 & eae7e1d8
https://github.com/coreos/rpm-ostree/commit/fb97c48f3cd070c1ad559f3f43f86ad6548f6b02
https://github.com/coreos/rpm-ostree/commit/eae7e1d8d692b5ce6d3d6eef29abbd7512ae4682
Resolves: rhbz#2229804
* Mon Oct 02 2023 Colin Walters <walters@verbum.org> - 2023.8-2
- https://github.com/coreos/rpm-ostree/releases/tag/v2023.8
https://issues.redhat.com/browse/RHEL-11294
* Sun Apr 30 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.10.117.g52714b51-1
- Sync to latest rhel8 branch
Resolves: rhbz#2192235
* Sat Aug 26 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.7-1
- https://github.com/coreos/rpm-ostree/releases/tag/v2023.7
Resolves: rhbz#2234352
* Thu Feb 16 2023 Colin Walters <walters@verbum.org> - 2022.10.112.g3d0ac35b-3
- Cherry pick
https://github.com/coreos/rpm-ostree/pull/4311/commits/a0f1275dfbd835b704355d095e610ac1f1254f25
Resolves: rhbz#2170579
* Fri Aug 25 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.6-1
- https://github.com/coreos/rpm-ostree/releases/tag/v2023.6
Resolves: rhbz#2234352
* Tue Feb 14 2023 Colin Walters <walters@verbum.org> - 2022.10.112.g3d0ac35b-2
- Sync to latest rhel8 branch
Resolves: rhbz#2169429
* Fri Jul 21 2023 Colin Walters <walters@verbum.org> - 2023.5-2
- Backport https://github.com/coreos/rpm-ostree/pull/4510
Related: rhbz#2224081
* Fri Oct 14 2022 Colin Walters <walters@verbum.org> - 2022.10.99.g0049dbdd-3
- Resolves: rhbz#2134630
* Thu Jun 22 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.5-1
- https://github.com/coreos/rpm-ostree/releases/tag/v2023.5
Resolves: rhbz#2216811
* Wed Sep 28 2022 Colin Walters <walters@verbum.org> - 2022.10.97.gade6df33-2
- Update to latest https://github.com/coreos/rpm-ostree/tree/rhel8 at commit
https://github.com/coreos/rpm-ostree/commit/ac182cb920f84946bb155e9cf061db7f5f26e917
- Resolves: rhbz#2122289
* Tue Jun 13 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.4-1
- https://github.com/coreos/rpm-ostree/releases/tag/v2023.4
Resolves: rhbz#2211486
* Wed Aug 31 2022 Colin Walters <walters@verbum.org> - 2022.10.94.g89f58028-2
- Update to latest https://github.com/coreos/rpm-ostree/tree/rhel8 at commit
https://github.com/coreos/rpm-ostree/commit/89f58028f0bea5b6fa59bdb3506078e09957ec00
- Resolves: rhbz#2122289
- Resolves: rhbz#2122299
* Mon Apr 24 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.3-1
- https://github.com/coreos/rpm-ostree/releases/tag/v2023.3
Resolves: rhbz#2189315
* Tue Aug 16 2022 Colin Walters <walters@verbum.org> - 2022.10.90.g4abaf4b4-4
- Update to latest https://github.com/coreos/rpm-ostree/tree/rhel8 at commit
https://github.com/coreos/rpm-ostree/commit/4abaf4b4
Resolves: rhbz#2118774
* Tue Mar 07 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2023.2-1
- https://github.com/coreos/rpm-ostree/releases/tag/v2023.2
Resolves: rhbz#2176213
* Tue Jul 19 2022 Colin Walters <walters@verbum.org> - 2022.10.86.gd8f0c67a-3
- Update to latest https://github.com/coreos/rpm-ostree/tree/rhel8 at commit
https://github.com/coreos/rpm-ostree/commit/d8f0c67a0eba32281c9f2782a286e06486a4b909
Resolves: rhbz#2105414
* Tue Dec 20 2022 Colin Walters <walters@verbum.org> - 2022.19-3
- https://github.com/coreos/rpm-ostree/releases/tag/v2022.19
Resolves: rhbz#2153460
* Wed Jun 15 2022 Colin Walters <walters@verbum.org> - 2022.2.8.gd50a74bd-2
- Update to latest rhel8 branch
https://github.com/coreos/rpm-ostree/pull/3749
https://github.com/coreos/rpm-ostree/pull/3751
Resolves: rhbz#2095528
* Wed Dec 14 2022 Colin Walters <walters@verbum.org> - 2022.18-2
- https://github.com/coreos/rpm-ostree/releases/tag/v2022.18
Resolves: rhbz#2153460
* Tue Nov 22 2022 Colin Walters <walters@verbum.org> - 2022.16-2
- Rebase to 2022.16
Resolves: rhbz#2144586
* Thu Oct 13 2022 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.14-1
- https://github.com/coreos/rpm-ostree/releases/tag/v2022.14
* Tue Sep 13 2022 Luca BRUNO <lucab@redhat.com> - 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 <walters@verbum.org> - 2022.12-2
- https://github.com/coreos/rpm-ostree/releases/tag/v2022.12
* Mon Jul 11 2022 Colin Walters <walters@verbum.org> - 2022.11-2
- https://github.com/coreos/rpm-ostree/releases/tag/v2022.11
Resolves: rhbz#2105405
* Thu Jun 09 2022 Jonathan Lebon <jonathan@jlebon.com> - 2022.8-3
- Backport https://github.com/coreos/rpm-ostree/pull/3721
Resolves: rhbz#2094085
* Thu Apr 21 2022 Colin Walters <walters@verbum.org> - 2022.8-2
- https://github.com/coreos/rpm-ostree/releases/tag/v2022.8
Resolves: rhbz#2077062
Resolves: rhbz#2023325
* Mon Apr 11 2022 Colin Walters <walters@verbum.org> - 2022.7-2
- https://github.com/coreos/rpm-ostree/releases/tag/v2022.7
* Mon Feb 07 2022 Colin Walters <walters@verbum.org> - 2022.2-2
- Rebase to 2022.2
* Mon Jan 10 2022 Colin Walters <walters@verbum.org> - 2022.1-2
- Rebase to 2022.1
Resolves: rhbz#2027476
* Tue Jan 11 2022 Colin Walters <walters@verbum.org> - 2022.1-2
- Rebase to 2022.1
Resolves: rhbz#2032594
* Wed Dec 01 2021 Colin Walters <walters@verbum.org> - 2021.14-3
- Drop zchunk dependency
Resolves: rhbz#2028167
* Wed Dec 15 2021 Colin Walters <walters@verbum.org> - 2021.14-3
- Rebase to 2021.14
Resolves: rhbz#2032594
* Mon Nov 29 2021 Colin Walters <walters@verbum.org> - 2021.14-2
- https://github.com/coreos/rpm-ostree/releases/tag/v2021.14
Resolves: rhbz#2027476
* Fri Jun 18 2021 Luca BRUNO <lucab@redhat.com> - 2021.5-2
- Backport _dbpath fixes, see
https://github.com/coreos/rpm-ostree/issues/2904
Resolves: rhbz#1973579
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2021.6-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Tue Jun 22 2021 Colin Walters <walters@verbum.org>
- https://github.com/coreos/rpm-ostree/releases/tag/v2021.6
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 2021.5-3
- Rebuilt for RHEL 9 BETA for openssl 3.0
Related: rhbz#1971065
* Tue Jun 01 2021 Colin Walters <walters@verbum.org> - 2021.5-2
- Support OpenSSL 3
* Wed May 12 2021 Luca BRUNO <lucab@lucabruno.net> - 2021.5-1
- New upstream version
https://github.com/coreos/rpm-ostree/releases/tag/v2021.5
Resolves: rhbz#1959874
* Tue Mar 30 2021 Colin Walters <walters@verbum.org> - 2020.7-4
- Backport https://github.com/coreos/rpm-ostree/pull/2386/commits/aa8e49aaeddfc5d38651fa08f46e059655818fd1
Resolves: #1944760
* Sun May 09 2021 Jeff Law <jlaw@tachyum.com> - 2021.4-4
- Re-enable LTO
* Thu Nov 05 2020 Colin Walters <walters@verbum.org> - 2020.7-2
- Update to 2020.7
Resolves: #1894061
* Wed Apr 28 2021 Colin Walters <walters@verbum.org> - 2021.4-3
- Backport another patch for https://pagure.io/fedora-infrastructure/issue/9909
* Tue Apr 27 2021 Colin Walters <walters@verbum.org> - 2021.4-2
- Backport patch for https://pagure.io/fedora-infrastructure/issue/9909
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2021.2-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Mon Apr 12 2021 Jonathan Lebon <jonathan@jlebon.com> - 2021.4-1
- https://github.com/coreos/rpm-ostree/releases/tag/v2021.4
* Wed Mar 17 2021 Colin Walters <walters@verbum.org> - 2021.3-2
- https://github.com/coreos/rpm-ostree/releases/tag/v2021.3
* Wed Feb 17 2021 Colin Walters <walters@verbum.org> - 2021.2-2
- https://github.com/coreos/rpm-ostree/releases/tag/v2021.2
* Wed Feb 10 2021 Colin Walters <walters@verbum.org> - 2021.1-4
- Backport patches from https://github.com/coreos/rpm-ostree/pull/2553
* Tue Jan 26 2021 Jonathan Lebon <jonathan@jlebon.com> - 2021.1-3
- Backport https://github.com/coreos/rpm-ostree/pull/2490 for rawhide
* Tue Jan 19 15:08:59 UTC 2021 Colin Walters <walters@verbum.org> - 2021.1-2
- https://github.com/coreos/rpm-ostree/releases/tag/v2021.1
* Fri Dec 11 19:13:03 UTC 2020 Colin Walters <walters@verbum.org> - 2020.10-3
- https://github.com/coreos/rpm-ostree/releases/tag/v2020.10
* Fri Dec 11 13:42:33 UTC 2020 Colin Walters <walters@verbum.org> - 2020.9-2
- https://github.com/coreos/rpm-ostree/releases/tag/v2020.9
* Sat Nov 14 14:51:20 UTC 2020 Colin Walters <walters@verbum.org> - 2020.8-1
- https://github.com/coreos/rpm-ostree/releases/tag/v2020.8
* Mon Nov 02 2020 Luca BRUNO <lucab@lucabruno.net> - 2020.7-1
- New upstream version
https://github.com/coreos/rpm-ostree/releases/tag/v2020.7
* Mon Nov 02 2020 Jeff Law <law@redhat.com> - 2020.6-2
- Fix invalid use of volatile caught by gcc-11
* Fri Oct 30 16:48:43 UTC 2020 Colin Walters <walters@verbum.org> - 2020.6-1
- https://github.com/coreos/rpm-ostree/releases/tag/v2020.6
* Wed Oct 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.5-2
- sysroot: Fix usage of sd_journal_send on 32 bit (gh#2276)
* Tue Sep 15 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.5-1
- New upstream version
https://github.com/coreos/rpm-ostree/releases/tag/v2020.5
* Mon Aug 17 2020 Colin Walters <walters@verbum.org> - 2020.4.15.g8b0bcd7b-2
- Update to latest upstream git for
https://bugzilla.redhat.com/show_bug.cgi?id=1865397
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2020.4-2
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 29 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.4-1
- New upstream version
https://github.com/coreos/rpm-ostree/releases/tag/v2020.4
Resolves: #1861786
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2020.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jun 30 2020 Jeff Law <aw@redhat.com> - 2020.3-2
- Disable LTO
* Fri Jun 19 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.3-1
- New upstream version
https://github.com/coreos/rpm-ostree/releases/tag/v2020.3
* Fri May 15 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.2-3
- Backport https://github.com/coreos/rpm-ostree/pull/2096
See https://github.com/coreos/fedora-coreos-tracker/issues/481
* Fri May 15 2020 Colin Walters <walters@verbum.org> - 2020.2-2
- https://github.com/coreos/rpm-ostree/releases/tag/v2020.2
Resolves: #1827712
* Tue Mar 03 2020 Colin Walters <walters@verbum.org> - 2019.6-8
- Backport patches for initramfs /etc
Resolves: #1808459
* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 2020.1.80.g3ec5e287-2
- Rebuild (json-c)
* Thu Feb 27 2020 Colin Walters <walters@verbum.org> - 2019.6-7
- Backport f295f543064f1a0b5833fefccd6bb203b3527623
Resolves: #1807487
* Mon Apr 20 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.1.80.g3ec5e287-1
- git master snapshot for using strict mode and lockfile-repos in FCOS:
https://github.com/coreos/rpm-ostree/pull/1858
https://github.com/coreos/rpm-ostree/pull/2058
https://github.com/coreos/fedora-coreos-tracker/issues/454
* Thu Dec 05 2019 Jonathan Lebon <jlebon@redhat.com> - 2019.6-6
- Backport dracut mknod patch for FIPS:
* Fri Mar 13 2020 Colin Walters <walters@verbum.org> - 2020.1.21.ge9011530-2
- Backport https://github.com/coreos/rpm-ostree/pull/2015
See https://github.com/coreos/fedora-coreos-tracker/issues/343
* Thu Feb 27 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.1.21.ge9011530-1
- git master snapshot for using base initramfs kargs in RHCOS:
https://github.com/coreos/rpm-ostree/pull/1998
https://github.com/coreos/rpm-ostree/pull/1997
https://bugzilla.redhat.com/show_bug.cgi?id=1806588
* Wed Feb 05 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.1-1
- New upstream version
* Tue Feb 04 2020 Jonathan Lebon <jonathan@jlebon.com> - 2019.7.31.g70c38563-1
- git master snapshot for Silverblue rawhide compose fixes
https://pagure.io/releng/failed-composes/issue/717
https://pagure.io/releng/failed-composes/issue/929
https://github.com/rpm-software-management/libdnf/pull/885
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2019.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jan 09 2020 Jonathan Lebon <jonathan@jlebon.com> - 2019.7-2
- Backport patch for Silverblue composes:
https://pagure.io/releng/failed-composes/issue/717
* Thu Dec 19 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.7-1
- New upstream version
* Sat Dec 14 2019 Jeff Law <law@redhat.com> - 2019.6.24.gfec61ce5-2
- Fix missing #includes for gcc-10
* Thu Oct 31 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.6.27.g3b8a1ec6-1
- git master snapshot for dracut cpio cap_mknod fix:
https://github.com/coreos/rpm-ostree/pull/1946
* Thu Oct 31 2019 Jonathan Lebon <jlebon@redhat.com> - 2019.6-5
- Backport HMAC patch for FIPS:
* Thu Oct 31 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.6.24.gfec61ce5-1
- git master snapshot for HMAC path fix for FIPS:
https://github.com/coreos/rpm-ostree/pull/1934
* Fri Oct 18 2019 Colin Walters <walters@verbum.org> - 2019.6-4
- Backport zchunk patch
* Wed Sep 25 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.6-1
- New upstream version
* Tue Oct 15 2019 Colin Walters <walters@verbum.org> - 2019.6-3
- https://github.com/coreos/rpm-ostree/releases/tag/v20196
- Backport zstd patch
* Thu Aug 22 2019 Colin Walters <walters@verbum.org> - 2019.5.7.gcac5aa41-3
- New upstream git snapshot, mainly for backporting the arch-includes conditionals
to aid Fedora CoreOS on s390x.
* Fri May 17 2019 Jonathan Lebon <jlebon@redhat.com> - 2019.3-3
- Rebuild for rhel-8.1.0 branch
* Wed Jul 31 2019 Stephen Gallagher <sgallagh@redhat.com> - 2019.5-2
- Fix libmodulemd dependencies
* Fri Mar 29 2019 Colin Walters <walters@verbum.org> - 2019.3-2
- Backport patch for pivot rebases
* Thu Jul 25 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.5-1
- New upstream version
* Fri Jul 19 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.4.39.g8d90d03d-1
- git master snapshot for --parent and lockfile overrides
https://github.com/projectatomic/rpm-ostree/pull/1871
https://github.com/projectatomic/rpm-ostree/pull/1867
* Fri Jul 12 2019 Colin Walters <walters@verbum.org> - 2019.4.28.g44395673-3
- Update rpmostree-rust.h in sources
* Fri Jul 12 2019 Colin Walters <walters@verbum.org> - 2019.4.28.g44395673-2
- Update with git snapshot for zstd support
* Wed Jul 10 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.4.27.gb381e029-1
- git master snapshot for add-commit-metadata
https://github.com/projectatomic/rpm-ostree/pull/1865/
* Fri Jun 14 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.4.15.gbbc9aa9f-1
- git master snapshot for OSTree layers
https://github.com/projectatomic/rpm-ostree/pull/1830/
* Mon Jun 10 22:13:22 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2019.4.10.gc1cc0827-3
- Rebuild for RPM 4.15
* Mon Jun 10 15:42:05 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2019.4.10.gc1cc0827-2
- Rebuild for RPM 4.15
* Thu Jun 06 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.4.10.gc1cc0827-1
- git master snapshot for lockfile
https://github.com/projectatomic/rpm-ostree/pull/1745/
* Tue May 28 2019 Dusty Mabe <dusty@dustymabe.com> - 2019.4-3
- Add back in ppc64le and ppc64
* Thu May 23 2019 Dusty Mabe <dusty@dustymabe.com> - 2019.4-2
- Backport patch for db diff --format=json
* Tue May 21 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.4-1
- New upstream version
* Mon May 06 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.3.5.g0da9f997-2
- Add temporary hack to avoid UTF-8 for Bodhi
https://pagure.io/releng/issue/8330
* Tue Apr 09 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.3.5.g0da9f997-1
- git master snapshot to test coreos-continuous tag
* Wed Mar 27 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.3-1
- New upstream version
@ -377,9 +587,6 @@ $PYTHON autofiles.py > files.devel \
* Sun Oct 28 2018 Jonathan Lebon <jonathan@jlebon.com> - 2018.9-1
- New upstream version
* Mon Oct 15 2018 Jonathan Lebon <jonathan@jlebon.com> - 2018.8-2
- Add new source and patch to drop cbindgen requirement
* Tue Sep 11 2018 Jonathan Lebon <jonathan@jlebon.com> - 2018.8-1
- New upstream version

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (rpm-ostree-2024.3.tar.xz) = 6ec05ab6145a761d8d77fc28a59e88413db3693075ece4364717a6cc751b805c6b7f00a1798f2945a83bfca3309558f55dabb4efa391aacecd0deaedca9fa718

9
tests/tests.yml Normal file
View File

@ -0,0 +1,9 @@
- hosts: localhost
roles:
- role: standard-test-basic
tags:
- classic
tests:
- simple:
dir: .
run: "rpm-ostree --help"