1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From c8e566e33e7233fae71e34c492eea26e2f76c86f Mon Sep 17 00:00:00 2001
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Date: Fri, 23 Mar 2018 12:05:18 +0200
Subject: [PATCH 2/8] tests: Fix build errors in docker environment
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
At the moment building of umockdev is failing but we do not need it
since all needed changes were incorporated upstream and packaged at
least for debian/testing. This saves us time building umockdev in the
container out of sources.
---
tests/Dockerfile | 2 ++
tests/docker-build.sh | 10 +---------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/tests/Dockerfile b/tests/Dockerfile
index 6a767b7..92652ea 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -6,6 +6,8 @@ RUN apt-get update -q && apt-get install -y \
gir1.2-glib-2.0 \
gir1.2-gudev-1.0 \
python3-gi \
+ umockdev \
+ gir1.2-umockdev-1.0 \
locales \
pkg-config \
udev \
diff --git a/tests/docker-build.sh b/tests/docker-build.sh
index c317a4d..fc08e31 100644
--- a/tests/docker-build.sh
+++ b/tests/docker-build.sh
@@ -5,15 +5,7 @@ set -e
# Print executed commands
set -x
-# Building in /usr/local/src
-pushd ..
-# Required commits are: bd14fb6 and 88d2cc3
-git clone https://github.com/martinpitt/umockdev.git
-pushd umockdev
-./autogen.sh --prefix=/usr && make -j4 && make install && popd
-popd
-
-echo "Returning to " `pwd`
+echo "Building in " `pwd`
rm -rf build && mkdir build
cd build && cmake .. && cmake --build .
--
2.38.1
|
