On 12/09/2016 11:44 PM, Steve Beattie wrote:
> One thing I noticed while testing the patch that creates the tech doc at
> build time is that the snapshot/tarball builds use some shell constructs
> that end up causing failures at various stages to be ignored. The
> following patch addresses that.
>
> Signed-off-by: Steve Beattie <st...@nxnw.org>
Acked-by: John Johansen <john.johan...@canonical.com>
> ---
> Makefile | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> Index: b/Makefile
> ===================================================================
> --- a/Makefile
> +++ b/Makefile
> @@ -39,18 +39,18 @@ TAR_EXCLUSIONS=
>
> .PHONY: tarball
> tarball: clean
> - REPO_VERSION=`$(value REPO_VERSION_CMD)` ; \
> - make export_dir __EXPORT_DIR=${RELEASE_DIR}
> __REPO_VERSION=$${REPO_VERSION} ; \
> - make setup __SETUP_DIR=${RELEASE_DIR} ; \
> + REPO_VERSION=`$(value REPO_VERSION_CMD)` && \
> + make export_dir __EXPORT_DIR=${RELEASE_DIR}
> __REPO_VERSION=$${REPO_VERSION} && \
> + make setup __SETUP_DIR=${RELEASE_DIR} && \
> tar ${TAR_EXCLUSIONS} -cvzf ${RELEASE_DIR}.tar.gz ${RELEASE_DIR}
>
> .PHONY: snapshot
> snapshot: clean
> $(eval REPO_VERSION:=$(shell $(value REPO_VERSION_CMD)))
> $(eval SNAPSHOT_NAME=apparmor-$(VERSION)~$(REPO_VERSION))
> - make export_dir __EXPORT_DIR=${SNAPSHOT_NAME}
> __REPO_VERSION=${REPO_VERSION} ; \
> - make setup __SETUP_DIR=${SNAPSHOT_NAME} ; \
> - tar ${TAR_EXCLUSIONS} -cvzf ${SNAPSHOT_NAME}.tar.gz ${SNAPSHOT_NAME} ;
> + make export_dir __EXPORT_DIR=${SNAPSHOT_NAME}
> __REPO_VERSION=${REPO_VERSION} && \
> + make setup __SETUP_DIR=${SNAPSHOT_NAME} && \
> + tar ${TAR_EXCLUSIONS} -cvzf ${SNAPSHOT_NAME}.tar.gz ${SNAPSHOT_NAME}
>
> .PHONY: coverity
> coverity: snapshot
>
>
>
>
--
AppArmor mailing list
AppArmor@lists.ubuntu.com
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/apparmor
