mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 22:26:31 +00:00
build: fix umask test
Some shells' builtin umask does not print 2 leading 0's for the umask. Switching to bash is done anyway. This patch switches to bash before the umask test. Signed-off-by: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
052b46c6dc
commit
3f4c72c607
10
Makefile
10
Makefile
@ -24,6 +24,11 @@
|
|||||||
# You shouldn't need to mess with anything beyond this point...
|
# You shouldn't need to mess with anything beyond this point...
|
||||||
#--------------------------------------------------------------
|
#--------------------------------------------------------------
|
||||||
|
|
||||||
|
# we want bash as shell
|
||||||
|
SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
|
||||||
|
else if [ -x /bin/bash ]; then echo /bin/bash; \
|
||||||
|
else echo sh; fi; fi)
|
||||||
|
|
||||||
# Trick for always running with a fixed umask
|
# Trick for always running with a fixed umask
|
||||||
UMASK = 0022
|
UMASK = 0022
|
||||||
ifneq ($(shell umask),$(UMASK))
|
ifneq ($(shell umask),$(UMASK))
|
||||||
@ -227,11 +232,6 @@ else
|
|||||||
Q = @
|
Q = @
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# we want bash as shell
|
|
||||||
SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
|
|
||||||
else if [ -x /bin/bash ]; then echo /bin/bash; \
|
|
||||||
else echo sh; fi; fi)
|
|
||||||
|
|
||||||
# kconfig uses CONFIG_SHELL
|
# kconfig uses CONFIG_SHELL
|
||||||
CONFIG_SHELL := $(SHELL)
|
CONFIG_SHELL := $(SHELL)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user