Skip to content

Commit

Permalink
Set default RELEASE variable
Browse files Browse the repository at this point in the history
If builder.conf is generated by setup script, it is set, but otherwise
it isn't. And because of this, various scripts guess release version
based on repository dir name. Lets have it in one place.

QubesOS/qubes-issues#3935
  • Loading branch information
marmarek committed Jun 17, 2018
1 parent 8b8f4a4 commit e4eeb05
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ VERBOSE ?= 0
COMPONENTS ?= builder

LINUX_REPO_BASEDIR ?= $(SRC_DIR)/linux-yum/current-release
# set default RELEASE based on LINUX_REPO_BASEDIR, assuming it was set to
# something sensible (not the value above)
RELEASE ?= $(patsubst r%,%,$(lastword $(subst /, ,$(LINUX_REPO_BASEDIR))))
INSTALLER_COMPONENT ?= installer-qubes-os
BACKEND_VMM ?= xen
KEYRING_DIR_GIT ?= $(BUILDER_DIR)/keyrings/git
Expand Down Expand Up @@ -808,7 +811,7 @@ post-update-repo-%:
done; \
for repo in `echo $$repos_to_update|tr ' ' '\n'|sort|uniq`; do \
[ -z "$$repo" ] && continue; \
(cd $$repo/.. && ./update_repo-$*.sh `basename $$repo`); \
(cd $$repo/.. && ./update_repo-$*.sh r$(RELEASE)); \
done

template-name:
Expand Down

0 comments on commit e4eeb05

Please sign in to comment.