mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 08:24:42 +01:00
toplevel: drop exclusion of deprecated directory from tarball creation
After removing the tools that had lingered in the deprecated directory for too long, don't exclude the deprecated/ subdirectory from tarball creation, as SUSE needs access to the deprecated perl modules for YaST. Add a make variable for adding back in exclusions if needed.
This commit is contained in:
parent
52955d1e98
commit
cbf8a59ef1
1 changed files with 6 additions and 2 deletions
8
Makefile
8
Makefile
|
@ -27,12 +27,16 @@ __SETUP_DIR?=.
|
||||||
# embedded in ${VERSION}
|
# embedded in ${VERSION}
|
||||||
TAG_VERSION=$(subst ~,-,${VERSION})
|
TAG_VERSION=$(subst ~,-,${VERSION})
|
||||||
|
|
||||||
|
# Add exclusion entries arguments for tar here, of the form:
|
||||||
|
# --exclude dir_to_exclude --exclude other_dir
|
||||||
|
TAR_EXCLUSIONS=
|
||||||
|
|
||||||
.PHONY: tarball
|
.PHONY: tarball
|
||||||
tarball: clean
|
tarball: clean
|
||||||
REPO_VERSION=`$(value REPO_VERSION_CMD)` ; \
|
REPO_VERSION=`$(value REPO_VERSION_CMD)` ; \
|
||||||
make export_dir __EXPORT_DIR=${RELEASE_DIR} __REPO_VERSION=$${REPO_VERSION} ; \
|
make export_dir __EXPORT_DIR=${RELEASE_DIR} __REPO_VERSION=$${REPO_VERSION} ; \
|
||||||
make setup __SETUP_DIR=${RELEASE_DIR} ; \
|
make setup __SETUP_DIR=${RELEASE_DIR} ; \
|
||||||
tar --exclude deprecated -cvzf ${RELEASE_DIR}.tar.gz ${RELEASE_DIR}
|
tar ${TAR_EXCLUSIONS} -cvzf ${RELEASE_DIR}.tar.gz ${RELEASE_DIR}
|
||||||
|
|
||||||
.PHONY: snapshot
|
.PHONY: snapshot
|
||||||
snapshot: clean
|
snapshot: clean
|
||||||
|
@ -40,7 +44,7 @@ snapshot: clean
|
||||||
SNAPSHOT_DIR=apparmor-${VERSION}~$${REPO_VERSION} ;\
|
SNAPSHOT_DIR=apparmor-${VERSION}~$${REPO_VERSION} ;\
|
||||||
make export_dir __EXPORT_DIR=$${SNAPSHOT_DIR} __REPO_VERSION=$${REPO_VERSION} ; \
|
make export_dir __EXPORT_DIR=$${SNAPSHOT_DIR} __REPO_VERSION=$${REPO_VERSION} ; \
|
||||||
make setup __SETUP_DIR=$${SNAPSHOT_DIR} ; \
|
make setup __SETUP_DIR=$${SNAPSHOT_DIR} ; \
|
||||||
tar --exclude deprecated -cvzf $${SNAPSHOT_DIR}.tar.gz $${SNAPSHOT_DIR} ;
|
tar ${TAR_EXCLUSIONS} -cvzf $${SNAPSHOT_DIR}.tar.gz $${SNAPSHOT_DIR} ;
|
||||||
|
|
||||||
|
|
||||||
.PHONY: export_dir
|
.PHONY: export_dir
|
||||||
|
|
Loading…
Add table
Reference in a new issue