Skip to content

Commit 2bd09a0

Browse files
committed
Fix Build Failure
Add command to remove libusbx which is a conflict dependency with libusb-1 Add command to install libnet and libnet-devel Add command to install EPICS modules compatible libusb-1 and libusb-devel-1 versions
1 parent f6c38f1 commit 2bd09a0

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

docker/Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,22 @@ RUN yum update -y && \
4040
sudo meld tk dejavu-sans-mono-fonts gnome-terminal xterm xmessage evince eog firefox java openldap-clients && \
4141
# These packages are not found in the initial install so try again
4242
yum install -y zeromq-devel git2u meld && \
43+
#install libnet library for EPICS module builds
44+
yum install -y libnet libnet-devel && \
4345
# clean up caches
4446
yum clean all && \
4547
# nasty hack to avoid overlay filesystem problems with --userns=keep-id
4648
# hopefully can be removed when this PR is released and deployed at DLS
4749
# https://github.com/containers/fuse-overlayfs/pull/381
4850
rm -fr /var/lib/yum/yumdb/*
4951

50-
# install the required libusb developer library
51-
RUN curl -SL https://rpmfind.net/linux/opensuse/distribution/leap/15.5/repo/oss/x86_64/libusb-1_0-devel-1.0.24-150400.3.3.1.x86_64.rpm -o /tmp/libusb-devel-1.rpm && \
52-
yum install /tmp/libusb-devel-1.rpm && \
52+
#install the required libusb developer library
53+
RUN yum remove -y libusbx && \
54+
curl -SL http://rpmfind.net/linux/opensuse/distribution/leap/15.5/repo/oss/x86_64/libusb-1_0-0-1.0.24-150400.3.3.1.x86_64.rpm -o /tmp/libusb-1.rpm && \
55+
yum install -y /tmp/libusb-1.rpm && \
56+
rm /tmp/libusb-1.rpm && \
57+
curl -SL https://rpmfind.net/linux/opensuse/distribution/leap/15.5/repo/oss/x86_64/libusb-1_0-devel-1.0.24-150400.3.3.1.x86_64.rpm -o /tmp/libusb-devel-1.rpm && \
58+
yum install -y /tmp/libusb-devel-1.rpm && \
5359
rm /tmp/libusb-devel-1.rpm
5460

5561
# full sudo rights inside the container

0 commit comments

Comments
 (0)