Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scripts/BuildScripts/BuildCommon.mk: unique names for development images #248

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

scripts/BuildScripts/BuildCommon.mk: unique names for development images #248

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions scripts/BuildScripts/BuildCommon.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,15 @@ PRAWNOS_SUITE := Shiba
endif

PRAWNOS_GIT_SHA := $(shell git rev-parse HEAD)
PRAWNOS_GIT_BRANCH := $(shell git branch --show-current)

# If we're not on masteer, append the branch name/sha1 to the imagename
ifeq ($(PRAWNOS_GIT_BRANCH),master)
PRAWNOS_IMAGE := $(PRAWNOS_ROOT)/PrawnOS-$(PRAWNOS_SUITE)-$(TARGET).img
else
PRAWNOS_IMAGE := $(PRAWNOS_ROOT)/PrawnOS-$(PRAWNOS_SUITE)-$(TARGET)-git-$(PRAWNOS_GIT_BRANCH)-$(PRAWNOS_GIT_SHA).img
endif

PRAWNOS_IMAGE_GIT := $(PRAWNOS_ROOT)/PrawnOS-$(PRAWNOS_SUITE)-$(TARGET)-git-$(PRAWNOS_GIT_SHA).img
PRAWNOS_IMAGE_GIT_GZ := $(PRAWNOS_IMAGE_GIT).gz
PRAWNOS_IMAGE_BASE := $(PRAWNOS_IMAGE)-BASE
Expand Down