mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2024-12-14 11:57:51 +00:00
Code Activity

Use a specific released version of intel-cmt-cat

Browse source 
This makes the build more deterministic. Previously, nfd just blindly
took the tip revision from intel-cmt-cat master branch which could brake
the build without any changes in nfd itself.
This commit is contained in:
Markus Lehtonen 2018-03-28 15:37:39 +03:00
parent 1314a5f4c0
commit 0440c8eabc
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile
View file

@ -7,7 +7,7 @@ WORKDIR /go/src/github.com/kubernetes-incubator/node-feature-discovery
ENV PATH="/go/src/github.com/kubernetes-incubator/node-feature-discovery/rdt-discovery:${PATH}" ENV PATH="/go/src/github.com/kubernetes-incubator/node-feature-discovery/rdt-discovery:${PATH}"
ENV CMT_CAT_SRCDIR="/go/src/github.com/kubernetes-incubator/node-feature-discovery/intel-cmt-cat" ENV CMT_CAT_VERSION="v1.2.0"
ARG NFD_VERSION ARG NFD_VERSION
@ -16,9 +16,9 @@ RUN case $(dpkg --print-architecture) in \
echo "skip rdt on Arm64 platform" \ echo "skip rdt on Arm64 platform" \
;; \ ;; \
*) \ *) \
git clone --depth 1 https://github.com/01org/intel-cmt-cat.git \ git clone --depth 1 -b $CMT_CAT_VERSION https://github.com/01org/intel-cmt-cat.git && \
&& cd intel-cmt-cat/lib; make install \ make -C intel-cmt-cat/lib install && \
&& cd ../../rdt-discovery; make \ make -C rdt-discovery \
;; \ ;; \
esac esac

2
rdt-discovery/Makefile
View file

@ -1,6 +1,6 @@
CC=gcc CC=gcc
LIBDIR=/usr/local/lib LIBDIR=/usr/local/lib
INCDIR=$(CMT_CAT_SRCDIR)/lib/ INCDIR=../intel-cmt-cat/lib/
LDFLAGS=-L$(LIBDIR) LDFLAGS=-L$(LIBDIR)
LDLIBS=-lpqos LDLIBS=-lpqos