From b9d6eb0678efcb030ebccc2319ca408d5bdb14fb Mon Sep 17 00:00:00 2001 From: lguohan Date: Mon, 9 Aug 2021 13:48:18 -0700 Subject: [PATCH] [openssh]: move build dep installation to sonic-slave-buster (#8381) install build dep causes dpkg lock issue in parallel build Signed-off-by: Guohan Lu --- sonic-slave-buster/Dockerfile.j2 | 2 ++ src/openssh/Makefile | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2 index 3cc41bf045..cc91fe3c20 100644 --- a/sonic-slave-buster/Dockerfile.j2 +++ b/sonic-slave-buster/Dockerfile.j2 @@ -350,6 +350,8 @@ RUN apt-get update && apt-get install -y \ libsystemd-dev \ pkg-config +RUN apt-get -y build-dep openssh + # Build fix for ARMHF buster libsairedis {%- if CONFIGURED_ARCH == "armhf" %} # Install doxygen build dependency packages diff --git a/src/openssh/Makefile b/src/openssh/Makefile index 0fd8642b12..be05c6ffd6 100644 --- a/src/openssh/Makefile +++ b/src/openssh/Makefile @@ -19,7 +19,6 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : stg import -s ../patch/series # Build package - sudo http_proxy=$(http_proxy) apt-get -y build-dep openssh dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR) popd