solve gbs build issue of rpm package not install (Tizen:2.4 project) and reuse last...

Bugs : https://bugs.tizen.org/browse/DEVT-345

Change-Id: Ie98f094039ed9cc776e5c8bd7b323e9662f7892b
Signed-off-by: fushuai <shuai01.fu@samsung.com>

diff --git a/Build/Rpm.pm b/Build/Rpm.pm
index 25a8e9cd2ee62da28817c9600c241ab801dd57cd..d475184d8fa95cee5e73318955d8b515d666fef0 100644 (file)
--- 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 fc6a4219b0dfd7356dc55a55ea244d9c9c3b9cff..8b9f7a2a2fc048cd850a233fe44fb6d7b21e35a1 100644 (file)
--- 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 bf319a78d06505cc0e57f68d189429fb68716a30..e8e2c52f8921b4dc691f59f36e615acddfc9000e 100755 (executable)
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -1059,12 +1059,23 @@ for PKG in $MAIN_LIST ; do
        fi
        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
     fi
-    
+
     # install the package
     echo "installing ${PKGID%% *}"
     if ! test "$BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF" -ef "$BUILD_ROOT/.init_b_cache/$PKG.$PSUF" ; then