QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix handling TEMPLATE_LABEL when calculating template name

Browse Source 
Yet another case of make not passing exported variables to $(shell ...)
(https://savannah.gnu.org/bugs/?10593). Here it applies when
builder.conf was loaded in the same make instance - make
--eval='include builder.conf' call from check-release-status script.

QubesOS/qubes-issues#3935
This commit is contained in:
Marek Marczykowski-Górecki 2018-06-28 13:53:09 +02:00
parent 6dbed7ec3b
commit 47ea5b90ea
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -23,7 +23,9 @@ TEMPLATE_ENV_WHITELIST += \
CENTOS_MIRROR EPEL_MIRROR QUBES_MIRROR
# Make sure names are < 32 characters, process aliases
fix_up := $(shell TEMPLATE_NAME=$(TEMPLATE_NAME) ./builder_fix_filenames)
fix_up := $(shell TEMPLATE_NAME=$(TEMPLATE_NAME) \
TEMPLATE_LABEL="$(TEMPLATE_LABEL)" \
./builder_fix_filenames)
TEMPLATE_NAME := $(word 1,$(fix_up))
export TEMPLATE_NAME