From: Chanho Park <chanho61.park@samsung.com>
Date: Thu, 7 Aug 2014 10:51:51 +0000 (+0900)
Subject: force enable DO_CUMULATE
X-Git-Tag: accepted/tizen/3.0.m2/base/20170104.081950^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_ivi;p=platform%2Fupstream%2Fbuild.git

force enable DO_CUMULATE

We can't use cumulative install because we don't use %suse_version macro.
However, our build system is based on openSUSE Build service and we use
always newer suse version than 1220. Thus, we can always enable cumulative
install instead of defining the suse_version. I think it's better than
we touch the suse_version macro manually.[1]

[1]: https://review.tizen.org/gerrit/#/c/25292/

Change-Id: I7673db1660945bb80e8c49a183b76927ae340e45
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
---

diff --git a/init_buildsystem b/init_buildsystem
index 351671e..92a7010 100755
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -1061,16 +1061,12 @@ test -x /usr/bin/rpmquery && RPMCHECKOPTS_HOST="--nodigest --nosignature"
 
 test -x $BUILD_ROOT/sbin/ldconfig && chroot $BUILD_ROOT /sbin/ldconfig 2>&1
 
-typeset -ri suse_version=$(chroot $BUILD_ROOT rpm --eval '%{?suse_version}' 2>/dev/null)
 typeset -i num cumulate=-1
 typeset -a CUMULATED_LIST=()
 typeset -a CUMULATED_PIDS=()
 typeset -a CUMULATED_HMD5=()
 
-DO_CUMULATE=
-if ((suse_version > 1220)) ; then
-    DO_CUMULATE=true
-fi
+DO_CUMULATE=true
 
 MAIN_LIST="$PACKAGES_TO_INSTALL $PACKAGES_TO_CBINSTALL"
 test -n "$DO_CUMULATE" && MAIN_LIST="$MAIN_LIST CUMULATED"