File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -19,21 +19,21 @@ DPKGTOOL = $(shell which dpkg-deb)
1919
2020# If the depk-deb not installed, use the docker container to make the debian package
2121ifeq ($(shell which dpkg-deb) ,)
22- 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 ) '
22+ 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 ) "
2323else
2424BUILD_COMMAND =dpkg-deb --build $(TMP_DIR ) /$(SONIC_BUILD_HOOKS ) $(SONIC_BUILD_HOOKS_TARGET )
2525endif
2626
2727DEPENDS := $(shell find scripts hooks debian -type f)
2828$(SONIC_BUILD_HOOKS_TARGET ) : $(DEPENDS )
2929 @rm -rf $(BUILDINFO_DIR ) /$(SONIC_BUILD_HOOKS ) $(TMP_DIR )
30- @mkdir -p $(DEBIAN_DIR ) $(SCRIPTS_PATH ) $(HOOKS_PATH ) $(SYMBOL_LINK_PATH ) $(TRUSTED_GPG_PATH ) $(BUILDINFO_DIR )
31- @chmod 0775 $(DEBIAN_DIR )
30+ @mkdir -p $(DEBIAN_DIR ) $(SCRIPTS_PATH ) $(HOOKS_PATH ) $(SYMBOL_LINK_PATH ) $(TRUSTED_GPG_PATH )
3231 @cp debian/* $(DEBIAN_DIR ) /
3332 @cp scripts/* $(SCRIPTS_PATH ) /
3433 @cp hooks/* $(HOOKS_PATH ) /
3534 @for url in $$(echo $(TRUSTED_GPG_URLS ) | sed 's/[,;]/ /g' ) ; do wget -q " $$ url" -P " $( TRUSTED_GPG_PATH) /" ; done
3635 @for f in $(SYMBOL_LINKS ) ; do ln -s $(SYMBOL_LINKS_SRC_DIR ) /$$ f $(SYMBOL_LINK_PATH ) /$$ f; done
3736 @$(BUILD_COMMAND )
37+ @sudo chmod a+rw $(SONIC_BUILD_HOOKS_TARGET )
3838
3939all : $(SONIC_BUILD_HOOKS_TARGET )
You can’t perform that action at this time.
0 commit comments