mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 00:14:44 +01:00
Merge from trunk commit rev 1734:This patch adjusts the tag make
target to use a separate version with '~' replaced by '-'. This is needed for mirroring to git as git can't handle '~'s embedded in tag or branch names. Tested by setting up a separate tag_version target like so: tag_version: echo ${TAG_VERSION} Nominated-By: Steve Beattie <sbeattie@ubuntu.com> Acked-By: John Johansen <john.johansen@canonical.com>
This commit is contained in:
parent
d99e4232e5
commit
ab63cb9142
1 changed files with 7 additions and 1 deletions
8
Makefile
8
Makefile
|
@ -24,6 +24,11 @@ REPO_URL?=lp:apparmor/2.6
|
|||
RELEASE_DIR=apparmor-${VERSION}
|
||||
__SETUP_DIR?=.
|
||||
|
||||
# We create a separate version for tags because git can't handle tags
|
||||
# with embedded ~s in them. No spaces around '-' or they'll get
|
||||
# embedded in ${VERSION}
|
||||
TAG_VERSION=$(subst ~,-, ${VERSION})
|
||||
|
||||
.PHONY: tarball
|
||||
tarball: clean
|
||||
REPO_VERSION=`$(value REPO_VERSION_CMD)` ; \
|
||||
|
@ -56,4 +61,5 @@ setup:
|
|||
|
||||
.PHONY: tag
|
||||
tag:
|
||||
bzr tag apparmor_${VERSION}
|
||||
bzr tag apparmor_${TAG_VERSION}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue