Skip to content

Conversation

@cgwalters
Copy link
Member

There's quite a lot of changes here...I'm hopeful this fixes compatibility with clang, although I can't reproduce the build failure locally.

@jmarrero
Copy link
Member

  --   Package dependency requirement 'librepo >= 1.18.0' could not be satisfied.
  Package 'librepo' has version '1.14.5', required version is '>= 1.18.0'
  -- Configuring incomplete, errors occurred!

@cgwalters
Copy link
Member Author

Ah yes we should probably use https://github.com/rpm-software-management/libdnf/commits/rhel-9.6 or so

@cgwalters
Copy link
Member Author

Or of course switch to just cherry picking changes for rhel-9, or create a rhel-9 branch here upstream.

There's quite a lot of changes here...I'm hopeful this fixes
compatibility with clang, although I can't reproduce the
build failure locally.

Update submodule: libdnf

Signed-off-by: Colin Walters <walters@verbum.org>
@cgwalters cgwalters changed the title libdnf: Upgrade to latest libdnf: Upgrade to latest rhel-9.6 Oct 28, 2024
@openshift-ci
Copy link

openshift-ci bot commented Oct 28, 2024

@cgwalters: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/kola-upgrade e331dfd link true /test kola-upgrade
ci/prow/fcos-e2e e331dfd link true /test fcos-e2e
ci/prow/images e331dfd link true /test images

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@jmarrero
Copy link
Member

jmarrero commented Nov 1, 2024

I can get the original error from:

FROM registry.fedoraproject.org/fedora-toolbox:40
RUN mkdir /development
WORKDIR /development
RUN dnf builddep ostree rpm-ostree clang -y
RUN git clone https://github.com/coreos/rpm-ostree.git && \
    cd /development/rpm-ostree && ./ci/clang-build-check.sh

Downgrading clag does nothing for me. Now that I can reproduce it in a container will try to find if there is any specific libdnf branch/commit that works.

@cgwalters
Copy link
Member Author

So what bit me is the fact that we don't rebuild libdnf unless you make clean...build system bugs are the worst

@cgwalters
Copy link
Member Author

Ummm...I think what happened here is rpm dropped support for pgp in rpm-software-management/rpm#2984

So there's no maintained libdnf that builds on both fedora and rhel9 which definitely puts us in a pickle. I dunno. I guess we could also just fork at this point.

@cgwalters
Copy link
Member Author

So in theory in would be good to sync to this branch for rhel but for now let's put off that tech debt unless there's a reason to because it would force us to fork here which has nontrivial implications.

@cgwalters cgwalters closed this Nov 6, 2024
@cgwalters
Copy link
Member Author

If we do do this PR we'll also want

diff --git a/rust/libdnf-sys/Cargo.toml b/rust/libdnf-sys/Cargo.toml
index f0a4c291..641c41ea 100644
--- a/rust/libdnf-sys/Cargo.toml
+++ b/rust/libdnf-sys/Cargo.toml
@@ -34,6 +34,7 @@ sqlite3 = "3"
 modulemd = { name = "modulemd-2.0", version = "2" }
 jsonc = { name = "json-c", version = "0" }
 glib = { name = "glib-2.0", version = "2" }
+libselinux = { version = "3.6" }
 zck = { version = "0.9", optional = true }
 librhsm = { version = "0.0.3", feature = "rhsm" }

jmarrero added a commit to jmarrero/rpm-ostree that referenced this pull request Nov 6, 2024
coreos#5137

Avoids forking for rhel9 for now as we don't need a clang build for Fedora or RHEL.

Will fix in the future when forking for rhel9 is unavoidable

rhel9 fork would look as described in: coreos#5140
jmarrero added a commit to jmarrero/rpm-ostree that referenced this pull request Nov 6, 2024
This workaround coreos#5137
by avoiding forking for rhel9 for now, we don't need a clang build for Fedora or RHEL.
Will fix in the future when forking for rhel9 is unavoidable
rhel9 fork would look as described in: coreos#5140
jmarrero added a commit to jmarrero/rpm-ostree that referenced this pull request Nov 6, 2024
This works around coreos#5137
by avoiding forking for rhel9 for now, we don't need a clang build for Fedora or RHEL.
Will fix in the future when forking for rhel9 is unavoidable
rhel9 fork would look as described in: coreos#5140
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants