From 163b7111b5790912cee3f04cf1c81d6b1f27ee01 Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Fri, 18 Dec 2020 23:37:12 -0800 Subject: [PATCH] Revert "Remove unnecessary sudo authority in build Makefile (#6237)" This reverts commit 07b4aaf47342e3c4d09d2b74731787a20dc1e9f6. --- src/sonic-build-hooks/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sonic-build-hooks/Makefile b/src/sonic-build-hooks/Makefile index 786af9056..7221d7900 100644 --- a/src/sonic-build-hooks/Makefile +++ b/src/sonic-build-hooks/Makefile @@ -19,7 +19,7 @@ DPKGTOOL = $(shell which dpkg-deb) # If the depk-deb not installed, use the docker container to make the debian package ifeq ($(shell which dpkg-deb),) -BUILD_COMMAND=docker run --user $(shell id -u):$(shell id -g) --rm -v $(shell pwd):/build debian:buster bash -c 'cd /build; dpkg-deb --build $(TMP_DIR)/$(SONIC_BUILD_HOOKS) $(SONIC_BUILD_HOOKS_TARGET)' +BUILD_COMMAND=docker run --rm -v $(shell pwd):/build debian:buster bash -c "cd build; dpkg-deb --build $(TMP_DIR)/$(SONIC_BUILD_HOOKS) $(SONIC_BUILD_HOOKS_TARGET)" else BUILD_COMMAND=dpkg-deb --build $(TMP_DIR)/$(SONIC_BUILD_HOOKS) $(SONIC_BUILD_HOOKS_TARGET) endif @@ -27,13 +27,13 @@ endif DEPENDS := $(shell find scripts hooks debian -type f) $(SONIC_BUILD_HOOKS_TARGET): $(DEPENDS) @rm -rf $(BUILDINFO_DIR)/$(SONIC_BUILD_HOOKS) $(TMP_DIR) - @mkdir -p $(DEBIAN_DIR) $(SCRIPTS_PATH) $(HOOKS_PATH) $(SYMBOL_LINK_PATH) $(TRUSTED_GPG_PATH) $(BUILDINFO_DIR) - @chmod 0775 $(DEBIAN_DIR) + @mkdir -p $(DEBIAN_DIR) $(SCRIPTS_PATH) $(HOOKS_PATH) $(SYMBOL_LINK_PATH) $(TRUSTED_GPG_PATH) @cp debian/* $(DEBIAN_DIR)/ @cp scripts/* $(SCRIPTS_PATH)/ @cp hooks/* $(HOOKS_PATH)/ @for url in $$(echo $(TRUSTED_GPG_URLS) | sed 's/[,;]/ /g'); do wget -q "$$url" -P "$(TRUSTED_GPG_PATH)/"; done @for f in $(SYMBOL_LINKS); do ln -s $(SYMBOL_LINKS_SRC_DIR)/$$f $(SYMBOL_LINK_PATH)/$$f; done @$(BUILD_COMMAND) + @sudo chmod a+rw $(SONIC_BUILD_HOOKS_TARGET) all: $(SONIC_BUILD_HOOKS_TARGET)