From 5223c08d05b59dfc49b4a5bd1a28e28511473e57 Mon Sep 17 00:00:00 2001 From: Thomas Gazagnaire Date: Thu, 30 Mar 2017 19:22:41 +0200 Subject: [PATCH] miragesdk: fix the compilation of the calf Signed-off-by: Thomas Gazagnaire --- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/miragesdk/src/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index db4daa0ae..61a23587c 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -19,7 +19,7 @@ system: command: [/usr/bin/binfmt, -dir, /etc/binfmt.d/, -mount, /binfmt_misc] - name: dhcp-client network_mode: host - image: "mobylinux/dhcp-client:d545cabade15a525f56fb411641f2b0630357a53" + image: "mobylinux/dhcp-client:da4e4b37ecd11ce411b0b45bde988281c2b35e3a" capabilities: - CAP_NET_ADMIN # to bring eth0 up - CAP_NET_RAW # to read /dev/eth0 diff --git a/projects/miragesdk/src/Makefile b/projects/miragesdk/src/Makefile index 88a8bc1c2..77d343e57 100644 --- a/projects/miragesdk/src/Makefile +++ b/projects/miragesdk/src/Makefile @@ -36,9 +36,9 @@ enter-dev: .dev $(CALF_OBJS): $(CALF_FILES) mkdir -p obj/bin ( cd obj && \ - tar -C ../calf -cf - $(CALF_FILES:calf/%=%) | \ + tar -C ../dhcp-client/calf -cf - $(CALF_FILES:dhcp-client/calf/%=%) | \ docker run --rm -i --log-driver=none $(MIRAGE_COMPILE) -o dhcp-client-calf | \ - tar xf - ) && \ + tar xf - || exit 1) && \ touch $@ $(OBJS): .build $(FILES) @@ -47,7 +47,7 @@ $(OBJS): .build $(FILES) docker run --rm --net=none --log-driver=none -i $(IMAGE):build tar -cf - $(OBJS:obj/%=/%) | tar xf - ) && \ touch $@ -hash: Dockerfile.build Dockerfile.pkg $(FILES) $(CALF_FILES) .build +hash: Makefile Dockerfile.build Dockerfile.pkg $(FILES) $(CALF_FILES) .build { cat $^; \ docker run --rm --entrypoint sh $(IMAGE):build -c 'cat /lib/apk/db/installed'; \ docker run --rm --entrypoint sh $(IMAGE):build -c 'opam list'; } \