From e84839054932a23e20fb788532f731cff6f82577 Mon Sep 17 00:00:00 2001 From: Amadeusz Żołnowski Date: Sun, 17 Jan 2016 14:45:44 +0000 Subject: app-backup/burp: Terminate compile phase on error Because exit status of sub call to make gets lost, ebuild proceeds to next phase even on failure. This results in installing all files except of binaries. Patch first level Makefile to exit with 1 on failure. Package-Manager: portage-2.2.26 --- app-backup/burp/burp-1.3.48.ebuild | 3 ++- app-backup/burp/burp-1.3.8.ebuild | 3 ++- app-backup/burp/burp-1.4.40.ebuild | 3 ++- .../burp/files/1.3.48-non-zero-or-build-failure.patch | 13 +++++++++++++ app-backup/burp/files/1.3.8-non-zero-or-build-failure.patch | 13 +++++++++++++ .../burp/files/1.4.40-non-zero-or-build-failure.patch | 13 +++++++++++++ 6 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 app-backup/burp/files/1.3.48-non-zero-or-build-failure.patch create mode 100644 app-backup/burp/files/1.3.8-non-zero-or-build-failure.patch create mode 100644 app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch (limited to 'app-backup') diff --git a/app-backup/burp/burp-1.3.48.ebuild b/app-backup/burp/burp-1.3.48.ebuild index 9d2da509b6c3..98b74238a8c6 100644 --- a/app-backup/burp/burp-1.3.48.ebuild +++ b/app-backup/burp/burp-1.3.48.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -35,6 +35,7 @@ RDEPEND="${DEPEND} DOCS=( CONTRIBUTORS DONATIONS UPGRADING ) PATCHES=( + "${FILESDIR}/${PV}-non-zero-or-build-failure.patch" "${FILESDIR}/${PV}-bedup-conf-path.patch" "${FILESDIR}/${PV}-tinfo.patch" "${FILESDIR}/${PV}-0001-Set-default_md-sha256-in-CA.cnf.patch" diff --git a/app-backup/burp/burp-1.3.8.ebuild b/app-backup/burp/burp-1.3.8.ebuild index 3a529b986f46..d2819507f885 100644 --- a/app-backup/burp/burp-1.3.8.ebuild +++ b/app-backup/burp/burp-1.3.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -34,6 +34,7 @@ RDEPEND="${DEPEND} DOCS=( CONTRIBUTORS DONATIONS UPGRADING ) PATCHES=( + "${FILESDIR}/${PV}-non-zero-or-build-failure.patch" "${FILESDIR}/${PV}-bedup-conf-path.patch" "${FILESDIR}/${PV}-0001-Set-default_md-sha256-in-CA.cnf.patch" ) diff --git a/app-backup/burp/burp-1.4.40.ebuild b/app-backup/burp/burp-1.4.40.ebuild index 16d59fdf0494..4acadd868b91 100644 --- a/app-backup/burp/burp-1.4.40.ebuild +++ b/app-backup/burp/burp-1.4.40.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -35,6 +35,7 @@ RDEPEND="${DEPEND} DOCS=( CONTRIBUTORS DONATIONS UPGRADING ) PATCHES=( + "${FILESDIR}/${PV}-non-zero-or-build-failure.patch" "${FILESDIR}/${PV}-bedup-conf-path.patch" "${FILESDIR}/${PV}-tinfo.patch" ) diff --git a/app-backup/burp/files/1.3.48-non-zero-or-build-failure.patch b/app-backup/burp/files/1.3.48-non-zero-or-build-failure.patch new file mode 100644 index 000000000000..2c570486ce02 --- /dev/null +++ b/app-backup/burp/files/1.3.48-non-zero-or-build-failure.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index ac22a24..f99ce96 100755 +--- a/Makefile.in ++++ b/Makefile.in +@@ -40,7 +40,7 @@ all: Makefile + @for I in ${all_subdirs}; \ + do (cd $$I; echo "==>Entering directory `pwd`"; \ + $(MAKE) $@ || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \ +- echo ""; echo "";)); \ ++ echo ""; echo ""; exit 1;)) || exit 1; \ + done + + depend: diff --git a/app-backup/burp/files/1.3.8-non-zero-or-build-failure.patch b/app-backup/burp/files/1.3.8-non-zero-or-build-failure.patch new file mode 100644 index 000000000000..2c570486ce02 --- /dev/null +++ b/app-backup/burp/files/1.3.8-non-zero-or-build-failure.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index ac22a24..f99ce96 100755 +--- a/Makefile.in ++++ b/Makefile.in +@@ -40,7 +40,7 @@ all: Makefile + @for I in ${all_subdirs}; \ + do (cd $$I; echo "==>Entering directory `pwd`"; \ + $(MAKE) $@ || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \ +- echo ""; echo "";)); \ ++ echo ""; echo ""; exit 1;)) || exit 1; \ + done + + depend: diff --git a/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch b/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch new file mode 100644 index 000000000000..2c570486ce02 --- /dev/null +++ b/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index ac22a24..f99ce96 100755 +--- a/Makefile.in ++++ b/Makefile.in +@@ -40,7 +40,7 @@ all: Makefile + @for I in ${all_subdirs}; \ + do (cd $$I; echo "==>Entering directory `pwd`"; \ + $(MAKE) $@ || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \ +- echo ""; echo "";)); \ ++ echo ""; echo ""; exit 1;)) || exit 1; \ + done + + depend: -- cgit v1.2.3-65-gdbad