mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-01 14:55:10 +00:00
Code Issues Releases Wiki Activity

This patch adds a 'make dist' target to all the apparmor packages, which

Browse Source 
creates a tarball i(and specfile) similar to 'make tarball' except that
it uses svn export to pull the latest committed version rather than the
currently contents of the tree (as make tarball does). This is to make
pristine checkins to SUSE's autobuild system and the openSUSE
buildservice easier.
This commit is contained in:
Steve Beattie
2006-10-31 14:08:34 +00:00
parent 36b6bb11bf
commit 59f30353a1
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/Make.rules
View File

@@ -39,7 +39,7 @@ VERSION=2.0
TESTBUILDDIR=$(shell [ -f ${HOME}/.rpmmacros ] && awk '/^%_topdir/ {print $$2}' ${HOME}/.rpmmacros) TESTBUILDDIR=$(shell [ -f ${HOME}/.rpmmacros ] && awk '/^%_topdir/ {print $$2}' ${HOME}/.rpmmacros)
ifdef BUILDDIR ifdef BUILDDIR
#BUILDDIR:=$(BUILDDIR,/=) #BUILDDIR:=$(BUILDDIR,/=)
else else
BUILDDIR=$(shell if [ -d "${TESTBUILDDIR}" ] ; then \ BUILDDIR=$(shell if [ -d "${TESTBUILDDIR}" ] ; then \
echo ${TESTBUILDDIR} | sed "s^/$$^^" ; \ echo ${TESTBUILDDIR} | sed "s^/$$^^" ; \
elif [ -d "/usr/src/redhat" ] ; then \ elif [ -d "/usr/src/redhat" ] ; then \
@@ -80,6 +80,9 @@ RPMARG=--define "_topdir ${BUILDDIR}" \
REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \ REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \
/usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \ /usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \
fi) fi)
REPO_URL=$(shell if [ -x /usr/bin/svn ] ; then \
/usr/bin/svn info . 2> /dev/null | grep "^URL:" | sed "s/^URL: //" ; \
fi)
ifdef EXTERNAL_PACKAGE ifdef EXTERNAL_PACKAGE
RPMARG+=--define "_sourcedir $(shell pwd)" RPMARG+=--define "_sourcedir $(shell pwd)"
@@ -87,7 +90,7 @@ endif
ifndef SPECFILE ifndef SPECFILE
SPECFILE = $(NAME).spec SPECFILE = $(NAME).spec
endif endif
RELEASE = $(shell rpm -q --specfile --define "_sourcedir ." ${RPMARG} --qf "%{RELEASE}" ${SPECFILE}) RELEASE = $(shell rpm -q --specfile --define "_sourcedir ." ${RPMARG} --qf "%{RELEASE}" ${SPECFILE})
RELEASE_DIR = $(NAME)-$(VERSION) RELEASE_DIR = $(NAME)-$(VERSION)
TARBALL = $(NAME)-$(VERSION)-${REPO_VERSION}.tar.gz TARBALL = $(NAME)-$(VERSION)-${REPO_VERSION}.tar.gz
@@ -138,6 +141,14 @@ ${TARBALL}: clean ${SPECFILE}
.PHONY: tarball .PHONY: tarball
tarball: clean $(TARBALL) tarball: clean $(TARBALL)
.PHONY: dist
dist: clean $(SPECFILE)
-rm -rf $(RELEASE_DIR)
svn export $(REPO_URL) $(RELEASE_DIR)
$(TAR) -f $(TARBALL) $(RELEASE_DIR)
rm -rf $(RELEASE_DIR)
endif endif
.PHONY: version .PHONY: version