Skip to content

Commit

Permalink
libsolv: Fix ftbfs due to split/dev now installing /usr/share/cmake
Browse files Browse the repository at this point in the history
We no longer need to manually install /usr/share/cmake because
the split/dev pipeline now does this for us. But since libsolv tries
to anyway, it now fails to build. This is fallout from:
  chainguard-dev/melange#1693

Our manual install was moving it into /usr/lib instead of /usr/share.
/usr/share is where upstream installs it. /usr/share seems to be an
OK choice with split/dev now explicitly supporting it. So let's
avoid unnecessarily diverging from upstream and leave it under
/usr/share.

Fixes: #38649

Signed-off-by: dann frazier <[email protected]>
  • Loading branch information
dannf committed Jan 25, 2025
1 parent 46fb10a commit 82b979f
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions libsolv.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: libsolv
version: 0.7.31
epoch: 0
epoch: 1
description: Library for solving packages and reading repositories
copyright:
- license: BSD-3-Clause
Expand Down Expand Up @@ -41,9 +41,6 @@ subpackages:
- name: libsolv-dev
pipeline:
- uses: split/dev
- runs: |
mkdir -p "${{targets.subpkgdir}}"/usr/lib/
mv "${{targets.destdir}}"/usr/share/cmake "${{targets.subpkgdir}}"/usr/lib/
description: libsolv dev
test:
pipeline:
Expand Down

0 comments on commit 82b979f

Please sign in to comment.