Compare commits
No commits in common. "imports/c8s/rpm-ostree-2022.2-2.el8" and "c8" have entirely different histories.
imports/c8
...
c8
|
@ -1 +1 @@
|
|||
SOURCES/rpm-ostree-2022.2.tar.xz
|
||||
SOURCES/rpm-ostree-2022.10.117.g52714b51.tar.xz
|
||||
|
|
|
@ -1 +1 @@
|
|||
1bcee7eba384617fb49922310275f708a97a2fcf SOURCES/rpm-ostree-2022.2.tar.xz
|
||||
43d5b34cf6b8c77fc2f17429dcc1d385c885b032 SOURCES/rpm-ostree-2022.10.117.g52714b51.tar.xz
|
||||
|
|
|
@ -0,0 +1,48 @@
|
|||
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
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
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
|
||||
|
|
@ -3,14 +3,17 @@
|
|||
|
||||
Summary: Hybrid image/package system
|
||||
Name: rpm-ostree
|
||||
Version: 2022.2
|
||||
Release: 2%{?dist}
|
||||
Version: 2022.10.117.g52714b51
|
||||
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.
|
||||
# in the upstream git. It also contains vendored Rust sources. This is generated from the "rhel8" branch.
|
||||
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
|
||||
|
||||
ExclusiveArch: %{rust_arches}
|
||||
|
||||
BuildRequires: make
|
||||
|
@ -24,6 +27,15 @@ BuildRequires: rust
|
|||
|
||||
# Enable ASAN + UBSAN
|
||||
%bcond_with sanitizers
|
||||
# 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
|
||||
|
||||
# RHEL8 doesn't ship zchunk today. See also the comments
|
||||
# in configure.ac around this as libdnf/librepo need to be in
|
||||
|
@ -39,7 +51,7 @@ BuildRequires: rust
|
|||
%endif
|
||||
|
||||
# For the autofiles bits below
|
||||
BuildRequires: /usr/bin/python3
|
||||
BuildRequires: python3-devel
|
||||
# We always run autogen.sh
|
||||
BuildRequires: autoconf automake libtool git
|
||||
# For docs
|
||||
|
@ -94,6 +106,14 @@ BuildRequires: pkgconfig(smartcols)
|
|||
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
|
||||
%if %{with rhsm}
|
||||
BuildRequires: pkgconfig(librhsm) >= 0.0.3
|
||||
%endif
|
||||
|
||||
# Runtime libdnf deps
|
||||
Requires: libmodulemd%{?_isa} >= %{libmodulemd_version}
|
||||
|
@ -142,7 +162,8 @@ env NOCONFIGURE=1 ./autogen.sh
|
|||
%if 0%{?build_rustflags:1}
|
||||
export RUSTFLAGS="%{build_rustflags}"
|
||||
%endif
|
||||
%configure --disable-silent-rules --enable-gtk-doc %{?sqlite_rpmdb_default} %{?with_sanitizers:--enable-sanitizers}
|
||||
%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
|
||||
|
||||
|
@ -172,8 +193,8 @@ for line in sys.argv[1:]:
|
|||
else:
|
||||
sys.stderr.write('{0} did not match any files\n'.format(line))
|
||||
EOF
|
||||
PYTHON=python3
|
||||
if ! test -x /usr/bin/python3; then
|
||||
PYTHON='%{python3}'
|
||||
if ! test -x '%{python3}'; then
|
||||
PYTHON=python2
|
||||
fi
|
||||
$PYTHON autofiles.py > files \
|
||||
|
@ -184,6 +205,7 @@ $PYTHON autofiles.py > files \
|
|||
'%{_sysconfdir}/rpm-ostreed.conf' \
|
||||
'%{_prefix}/lib/systemd/system/*' \
|
||||
'%{_libexecdir}/rpm-ostree*' \
|
||||
'%{_libexecdir}/libostree/ext/*' \
|
||||
'%{_datadir}/polkit-1/actions/*.policy' \
|
||||
'%{_datadir}/dbus-1/system-services' \
|
||||
'%{_datadir}/bash-completion/completions/*'
|
||||
|
@ -208,6 +230,59 @@ $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
|
||||
- Use python macros and devel package
|
||||
Resolves: #RHEL-2243
|
||||
|
||||
* 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
|
||||
|
||||
* Sun Apr 30 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 2022.10.117.g52714b51-1
|
||||
- Sync to latest rhel8 branch
|
||||
Resolves: rhbz#2192235
|
||||
|
||||
* 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
|
||||
|
||||
* Tue Feb 14 2023 Colin Walters <walters@verbum.org> - 2022.10.112.g3d0ac35b-2
|
||||
- Sync to latest rhel8 branch
|
||||
Resolves: rhbz#2169429
|
||||
|
||||
* Fri Oct 14 2022 Colin Walters <walters@verbum.org> - 2022.10.99.g0049dbdd-3
|
||||
- Resolves: rhbz#2134630
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
* 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 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
|
||||
|
||||
* 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
|
||||
|
||||
* Mon Feb 07 2022 Colin Walters <walters@verbum.org> - 2022.2-2
|
||||
- Rebase to 2022.1
|
||||
|
||||
|
|
Loading…
Reference in New Issue