Skip to content
Snippets Groups Projects
Commit 3bcef442 authored by Victor Chong's avatar Victor Chong Committed by Jérôme Forissier
Browse files

Move `define expand-env-var` to common.mk


Signed-off-by: default avatarVictor Chong <victor.chong@linaro.org>
Acked-by: default avatarJerome Forissier <jerome.forissier@linaro.org>
parent 05bb4ed3
No related branches found
No related tags found
No related merge requests found
...@@ -117,6 +117,13 @@ endif ...@@ -117,6 +117,13 @@ endif
define KERNEL_VERSION define KERNEL_VERSION
$(shell cd $(LINUX_PATH) && $(MAKE) --no-print-directory kernelversion) $(shell cd $(LINUX_PATH) && $(MAKE) --no-print-directory kernelversion)
endef endef
# Read stdin, expand ${VAR} environment variables, output to stdout
# http://superuser.com/a/302847
define expand-env-var
awk '{while(match($$0,"[$$]{[^}]*}")) {var=substr($$0,RSTART+2,RLENGTH -3);gsub("[$$]{"var"}",ENVIRON[var])}}1'
endef
DEBUG ?= 0 DEBUG ?= 0
################################################################################ ################################################################################
......
...@@ -243,12 +243,6 @@ strace-cleaner: strace-clean ...@@ -243,12 +243,6 @@ strace-cleaner: strace-clean
################################################################################ ################################################################################
# Root FS # Root FS
################################################################################ ################################################################################
# Read stdin, expand ${VAR} environment variables, output to stdout
# http://superuser.com/a/302847
define expand-env-var
awk '{while(match($$0,"[$$]{[^}]*}")) {var=substr($$0,RSTART+2,RLENGTH -3);gsub("[$$]{"var"}",ENVIRON[var])}}1'
endef
.PHONY: filelist-tee .PHONY: filelist-tee
filelist-tee: filelist-tee-common filelist-tee: filelist-tee-common
env TOP=$(ROOT) $(expand-env-var) <$(PATCHES_PATH)/rootfs/initramfs-add-files.txt >> $(GEN_ROOTFS_FILELIST) env TOP=$(ROOT) $(expand-env-var) <$(PATCHES_PATH)/rootfs/initramfs-add-files.txt >> $(GEN_ROOTFS_FILELIST)
......
...@@ -258,12 +258,6 @@ strace-cleaner: strace-clean ...@@ -258,12 +258,6 @@ strace-cleaner: strace-clean
################################################################################ ################################################################################
# Root FS # Root FS
################################################################################ ################################################################################
# Read stdin, expand ${VAR} environment variables, output to stdout
# http://superuser.com/a/302847
define expand-env-var
awk '{while(match($$0,"[$$]{[^}]*}")) {var=substr($$0,RSTART+2,RLENGTH -3);gsub("[$$]{"var"}",ENVIRON[var])}}1'
endef
.PHONY: filelist-tee .PHONY: filelist-tee
filelist-tee: filelist-tee-common filelist-tee: filelist-tee-common
env TOP=$(ROOT) $(expand-env-var) <$(PATCHES_PATH)/rootfs/initramfs-add-files.txt >> $(GEN_ROOTFS_FILELIST) env TOP=$(ROOT) $(expand-env-var) <$(PATCHES_PATH)/rootfs/initramfs-add-files.txt >> $(GEN_ROOTFS_FILELIST)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment