diff options
| author | fushuai <shuai01.fu@samsung.com> | 2017-10-12 17:43:34 +0800 |
|---|---|---|
| committer | jingui.ren <jingui.ren@samsung.com> | 2017-10-19 11:36:18 +0800 |
| commit | ad8fd29e5f70a316affaca5b36541c2a2171d505 (patch) | |
| tree | b380b94180e4a6532dcdc5d2586c89e89f649e2b | |
| parent | e0a630f2b06e8187845b87b6eeea9e861abec3ad (diff) | |
| download | build-ad8fd29e5f70a316affaca5b36541c2a2171d505.tar.gz build-ad8fd29e5f70a316affaca5b36541c2a2171d505.tar.bz2 build-ad8fd29e5f70a316affaca5b36541c2a2171d505.zip | |
solve gbs build issue of rpm package not install (Tizen:2.4 project) and reuse last build environment failed.
Bugs : https://bugs.tizen.org/browse/DEVT-345
Change-Id: Ie98f094039ed9cc776e5c8bd7b323e9662f7892b
Signed-off-by: fushuai <shuai01.fu@samsung.com>
| -rw-r--r-- | Build/Rpm.pm | 2 | ||||
| -rw-r--r-- | build-pkg-rpm | 10 | ||||
| -rwxr-xr-x | init_buildsystem | 15 |
3 files changed, 14 insertions, 13 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 bf319a7..e8e2c52 100755 --- 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 |