From 0a0e69cf49038a6aa7341838f41395996e81f27f Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Fri, 16 Dec 2016 20:20:15 +0000 Subject: [PATCH] Detect unexpected REMOVED from apt-get install --- slave.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slave.mk b/slave.mk index e23620376725..9b609cb16b2f 100644 --- a/slave.mk +++ b/slave.mk @@ -255,7 +255,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .pl mkdir -p $($*.gz_PATH)/python-wheels $(LOG) sudo mount --bind $(DEBS_PATH) $($*.gz_PATH)/deps $(LOG) sudo mount --bind $(PYTHON_WHEELS_PATH) $($*.gz_PATH)/python-wheels $(LOG) - sed 's/SED_DPKG/RUN cd deps \&\& dpkg -i $(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_DEPENDS),RDEPENDS))\n" | awk '!a[$$0]++') || apt-get -y install -f/g' $($*.gz_PATH)/Dockerfile.template > $($*.gz_PATH)/Dockerfile + sed 's/SED_DPKG/RUN cd deps \&\& dpkg -i $(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_DEPENDS),RDEPENDS))\n" | awk '!a[$$0]++') || { o=$$(apt-get -y install -f | tee \/dev\/tty); !(echo $$o | grep "The following packages will be REMOVED:"); }/g' $($*.gz_PATH)/Dockerfile.template > $($*.gz_PATH)/Dockerfile docker build --no-cache -t $* $($*.gz_PATH) $(LOG) docker save $* | gzip -c > $@ $(FOOTER)