diff options
| author | Keiichi Watanabe <keiichiw@chromium.org> | 2020-04-10 20:14:28 +0900 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-17 20:53:07 +0000 |
| commit | d8d9556184d1eb84879045283b2b1a68f1b56fd2 (patch) | |
| tree | 9f689458c422a0d6a09b18f83cd27fcc1bc5336b | |
| parent | 5cf5af601edffbc6707b20f5f3dc13a7d520fcd3 (diff) | |
| download | crosvm-d8d9556184d1eb84879045283b2b1a68f1b56fd2.tar crosvm-d8d9556184d1eb84879045283b2b1a68f1b56fd2.tar.gz crosvm-d8d9556184d1eb84879045283b2b1a68f1b56fd2.tar.bz2 crosvm-d8d9556184d1eb84879045283b2b1a68f1b56fd2.tar.lz crosvm-d8d9556184d1eb84879045283b2b1a68f1b56fd2.tar.xz crosvm-d8d9556184d1eb84879045283b2b1a68f1b56fd2.tar.zst crosvm-d8d9556184d1eb84879045283b2b1a68f1b56fd2.zip | |
docker: Put libvda.pc under /pkgconfig/
Put a dummy pc file for libvda under /docker/pkgconfig/ instead of generating at the runtime. This is a fix for CL:2133987, but shouldn't change any behavior. BUG=none TEST=build_crosvm_base.sh && build_crosvm.sh with CL:1973973 Change-Id: Ifd7677abf14346ca2e7a9bc48b5ebb6c519b78aa Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2145533 Tested-by: Keiichi Watanabe <keiichiw@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
| -rw-r--r-- | docker/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/pkgconfig/libvda.pc | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 1bd1086..995ff9b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -124,9 +124,6 @@ RUN git clone https://chromium.googlesource.com/chromiumos/platform2 $PLATFORM2_ && cp librendernodehost.a /lib \ && git clean -f -# Create a dummy pc file for libvda to run 'cargo check' with video features. -RUN echo "Name: libvda_pc\nDescription:\nVersion:0.1\nLibs: -lvda" > /usr/lib/pkgconfig/libvda.pc - # Set up sysroot from which system_api proto files are built. ENV SYSROOT=/sysroot RUN mkdir -p $SYSROOT/usr/include/chromeos/dbus/trunks \ @@ -134,7 +131,8 @@ RUN mkdir -p $SYSROOT/usr/include/chromeos/dbus/trunks \ $SYSROOT/usr/include/chromeos/dbus/trunks # Inform pkg-config where libraries we install are placed. -COPY pkgconfig/* /usr/lib/pkgconfig +# Also, copy a dummy libvda.pc to compile crosvm with video features. +COPY pkgconfig/* /usr/lib/pkgconfig/ # Reduces image size and prevents accidentally using /scratch files RUN rm -r /scratch /usr/bin/meson diff --git a/docker/pkgconfig/libvda.pc b/docker/pkgconfig/libvda.pc new file mode 100644 index 0000000..ee57864 --- /dev/null +++ b/docker/pkgconfig/libvda.pc @@ -0,0 +1,4 @@ +Name: libvda +Description: CrOS VDA Connection Library +Version: 0.1 +Libs: -lvda |