From 5279379eac7c29d98b9775c477c7a416c293b588 Mon Sep 17 00:00:00 2001 From: Chanho Park Date: Thu, 7 Aug 2014 19:51:51 +0900 Subject: [PATCH] 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 --- init_buildsystem | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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" -- 2.7.4