vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove json-glib in the remaining places

Browse source 
Signed-off-by: Alexander Larsson <alexl@redhat.com>
This commit is contained in:
Alexander Larsson 2017-06-02 16:18:27 +02:00
parent f4b3e90141
commit 2507ba6453
4 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Dockerfile
View file

@ -19,7 +19,6 @@ RUN apt-get update && apt-get install -y \
protobuf-compiler \ protobuf-compiler \
python-minimal \ python-minimal \
libglib2.0-dev \ libglib2.0-dev \
libjson-glib-dev \
libapparmor-dev \ libapparmor-dev \
btrfs-tools \ btrfs-tools \
libdevmapper1.02.1 \ libdevmapper1.02.1 \

2
README.md
View file

@ -61,7 +61,6 @@ yum install -y \
libseccomp-devel \ libseccomp-devel \
libselinux-devel \ libselinux-devel \
pkgconfig \ pkgconfig \
json-glib-devel \
runc runc
``` ```
@ -79,7 +78,6 @@ apt install -y \
libseccomp-dev \ libseccomp-dev \
libselinux1-dev \ libselinux1-dev \
pkg-config \ pkg-config \
libjson-glib-dev \
runc runc
``` ```

2
conmon/Makefile
View file

@ -1,7 +1,7 @@
src = $(wildcard *.c) src = $(wildcard *.c)
obj = $(src:.c=.o) obj = $(src:.c=.o)
override LIBS += $(shell pkg-config --libs glib-2.0 json-glib-1.0) override LIBS += $(shell pkg-config --libs glib-2.0)
override CFLAGS += -std=c99 -Os -Wall -Wextra $(shell pkg-config --cflags glib-2.0) override CFLAGS += -std=c99 -Os -Wall -Wextra $(shell pkg-config --cflags glib-2.0)
conmon: $(obj) conmon: $(obj)

2
contrib/test/crio-integration-playbook.yaml
View file

@ -44,7 +44,6 @@
- libassuan-devel - libassuan-devel
- libgpg-error-devel - libgpg-error-devel
- pkgconfig - pkgconfig
- json-glib-devel
- skopeo-containers - skopeo-containers
async: 600 async: 600
poll: 10 poll: 10
@ -71,7 +70,6 @@
- libassuan-devel - libassuan-devel
- libgpg-error-devel - libgpg-error-devel
- pkgconfig - pkgconfig
- json-glib-devel
- skopeo-containers - skopeo-containers
async: 600 async: 600
poll: 10 poll: 10