From dc733de690e48b58a02e4e4a07a9199bde00ec57 Mon Sep 17 00:00:00 2001
From: fushuai <shuai01.fu@samsung.com>
Date: Thu, 12 Oct 2017 17:43:34 +0800
Subject: [PATCH] Fix https://bugs.tizen.org/browse/DEVT-345

Change-Id: Ie98f094039ed9cc776e5c8bd7b323e9662f7892b
Signed-off-by: fushuai <shuai01.fu@samsung.com>
---
 Build/Rpm.pm     |  2 +-
 build-pkg-rpm    | 10 ----------
 init_buildsystem | 11 +++++++++++
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Build/Rpm.pm b/Build/Rpm.pm
index 25a8e9c..d475184 100644
--- a/Build/Rpm.pm
+++ b/Build/Rpm.pm
@@ -1084,7 +1084,7 @@ sub queryinstalled {
 
   $root = '' if !defined($root) || $root eq '/';
   local *F;
-  my $dochroot = $root ne '' && !$opts{'nochroot'} && !$< && (-x "$root/usr/bin/rpm" || -x "$root/bin/rpm") ? 1 : 0;
+  my $dochroot = $root ne '' && !$opts{'nochroot'} && !$< ? 1 : 0;
   my $pid = open(F, '-|');
   die("fork: $!\n") unless defined $pid;
   if (!$pid) {
diff --git a/build-pkg-rpm b/build-pkg-rpm
index fc6a421..8b9f7a2 100644
--- a/build-pkg-rpm
+++ b/build-pkg-rpm
@@ -109,16 +109,6 @@ pkg_cumulate_rpm() {
 }
 
 pkg_install_rpm() {
-    export ADDITIONAL_PARAMS=
-    if test "$USE_FORCE" = true ; then
-	export ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS --force"
-    fi
-    # work around for cross-build installs, we must not overwrite the running rpm
-    if test "$PKG" = rpm ; then
-	for i in $BUILD_ROOT/.init_b_cache/preinstalls/rpm-x86-* ; do
-	    test -e "$i" && ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS --justdb"
-	done
-    fi
     ( cd $BUILD_ROOT && chroot $BUILD_ROOT rpm --ignorearch --nodeps -U --oldpackage --ignoresize $RPMCHECKOPTS \
 		$ADDITIONAL_PARAMS .init_b_cache/$PKG.rpm 2>&1 || \
 	  touch $BUILD_ROOT/exit ) | \
diff --git a/init_buildsystem b/init_buildsystem
index 76b9e85..fdfa5ca 100755
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -1060,6 +1060,17 @@ for PKG in $MAIN_LIST ; do
 	check_exit
     fi
     
+    export ADDITIONAL_PARAMS=
+    if test "$USE_FORCE" = true ; then
+       export ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS --force"
+    fi
+    # work around for cross-build installs, we must not overwrite the running rpm
+    if test "$PKG" = rpm ; then
+       for i in $BUILD_ROOT/.init_b_cache/preinstalls/rpm-x86-* ; do
+           test -e "$i" && ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS --justdb"
+       done
+    fi
+
     if pkg_cumulate ; then
 	echo "cumulate ${PKGID%% *}"
 	continue
-- 
2.7.4