Skip to content

FPGA: upgrade OPAE to v.1.5.0-2 #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 16, 2020
Merged

FPGA: upgrade OPAE to v.1.5.0-2 #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 0 additions & 98 deletions demo/opae-nlb-demo/0001-OPAE-in-containers-don-t-enumerate-missing-device.patch
View file
Open in desktop

This file was deleted.

11 changes: 4 additions & 7 deletions demo/opae-nlb-demo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,21 @@ FROM ${CLEAR_LINUX_BASE} as builder
ARG CLEAR_LINUX_VERSION=

RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION} && \
swupd bundle-add wget c-basic devpkg-json-c devpkg-util-linux devpkg-hwloc doxygen patch
swupd bundle-add wget c-basic devpkg-json-c devpkg-util-linux devpkg-hwloc devpkg-tbb git
# Fetch dependencies and source code
ARG OPAE_RELEASE=1.4.0-1
ARG OPAE_RELEASE=1.5.0-2

# workaround for a swupd failure discussed in https://github.com/clearlinux/distribution/issues/831
RUN ldconfig
RUN mkdir -p /usr/src/opae && \
cd /usr/src/opae && \
wget https://github.com/OPAE/opae-sdk/archive/${OPAE_RELEASE}.tar.gz && \
tar xf *.tar.gz
wget -q https://github.com/OPAE/opae-sdk/archive/${OPAE_RELEASE}.tar.gz -O- | tar -zx

# Build OPAE
ADD 0001-OPAE-in-containers-don-t-enumerate-missing-device.patch /usr/src/opae/opae-sdk-${OPAE_RELEASE}
RUN cd /usr/src/opae/opae-sdk-${OPAE_RELEASE} && \
patch -p1 < 0001-OPAE-in-containers-don-t-enumerate-missing-device.patch && \
mkdir build && \
cd build && \
cmake .. -DBUILD_ASE=0 -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=true && \
cmake -DCMAKE_BUILD_TYPE=Release -DOPAE_BUILD_LIBOPAE_PY=OFF .. && \
make xfpga nlb0 nlb3

# Install clean os-core and libstdcpp bundle in target directory
Expand Down