summaryrefslogtreecommitdiff
path: root/build-recipe-arch
diff options
context:
space:
mode:
authorshuai.fu <shuai01.fu@samsung.com>2017-04-22 13:43:02 +0800
committershuai.fu <shuai01.fu@samsung.com>2017-04-22 13:44:05 +0800
commit794c348d0165d1406fd603d958bcbfc1fe62fa49 (patch)
tree7a54881bcad7dcc862eec79ada03b9e3500909c0 /build-recipe-arch
parente3da5fcdb300a12c57e4b0828f9fcc50140f48fd (diff)
downloadbuild-794c348d0165d1406fd603d958bcbfc1fe62fa49.tar.gz
build-794c348d0165d1406fd603d958bcbfc1fe62fa49.tar.bz2
build-794c348d0165d1406fd603d958bcbfc1fe62fa49.zip
Update to upstream 20160629
Change-Id: Idc31c269aec94e852b30885dee65a827b318b7a3 Signed-off-by: shuai.fu <shuai01.fu@samsung.com>
Diffstat (limited to 'build-recipe-arch')
-rw-r--r--build-recipe-arch7
1 files changed, 5 insertions, 2 deletions
diff --git a/build-recipe-arch b/build-recipe-arch
index 2fe6159..5a00114 100644
--- a/build-recipe-arch
+++ b/build-recipe-arch
@@ -23,7 +23,7 @@
recipe_setup_arch() {
TOPDIR=/usr/src/packages
- rm -rf "$BUILD_ROOT$TOPDIR"
+ test "$DO_INIT_TOPDIR" = false || rm -rf "$BUILD_ROOT$TOPDIR"
mkdir -p "$BUILD_ROOT$TOPDIR"
mkdir -p "$BUILD_ROOT$TOPDIR/OTHER"
mkdir -p "$BUILD_ROOT$TOPDIR/SOURCES"
@@ -41,7 +41,10 @@ recipe_setup_arch() {
recipe_prepare_arch() {
echo "Preparing sources..."
- _arch_recipe_makepkg -so "2>&1" ">/dev/null"
+ if ! _arch_recipe_makepkg -so "2>&1" ">/dev/null" ; then
+ echo "failed to prepare sources"
+ cleanup_and_exit 1
+ fi
}
recipe_build_arch() {