Skip to content

Commit

Permalink
Fully qualify libcap name in official toolchain script (#5724)
Browse files Browse the repository at this point in the history
Avoid a naming collision between `libcap` and `libcap-ng` when using the `find` command to select a delta rpm in `build_official_toolchain_rpms.sh`. A proper fix should follow to always use the fully qualified path by setting a default value for `$2`  that copies `$1` in the chroot function calls.
  • Loading branch information
dmcilvaney authored Jun 21, 2023
1 parent e04bb4e commit d3979a0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions toolkit/scripts/toolchain/build_official_toolchain_rpms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ build_rpm_in_chroot_no_install xz
build_rpm_in_chroot_no_install zstd
build_rpm_in_chroot_no_install lz4
build_rpm_in_chroot_no_install m4
build_rpm_in_chroot_no_install libcap
build_rpm_in_chroot_no_install libcap libcap # Use full naming since we have a collision with libcap-ng
build_rpm_in_chroot_no_install popt
build_rpm_in_chroot_no_install tar
build_rpm_in_chroot_no_install gawk
Expand Down Expand Up @@ -586,7 +586,7 @@ copy_rpm_subpackage python3-jinja2

# systemd-bootstrap requires libcap, xz, kbd, kmod, util-linux, meson, intltool, python3-jinja2
# gperf is also needed, but is installed earlier
chroot_and_install_rpms libcap
chroot_and_install_rpms libcap libcap # Use full naming since we have a collision with libcap-ng
chroot_and_install_rpms lz4
chroot_and_install_rpms xz
chroot_and_install_rpms kbd
Expand Down

0 comments on commit d3979a0

Please sign in to comment.