From 5b52fa254b3a940bffc3ec94963543b1d8753db2 Mon Sep 17 00:00:00 2001
From: "jingui.ren" <jingui.ren@samsung.com>
Date: Wed, 12 Sep 2018 16:48:19 +0800
Subject: add --replacefiles to ignore rpm installing file conflicts

Change-Id: I1b86904ba53853ca90436647f90d539a17134e7b
---
 build-pkg-rpm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-pkg-rpm b/build-pkg-rpm
index 2c385cc..82e046d 100644
--- a/build-pkg-rpm
+++ b/build-pkg-rpm
@@ -109,7 +109,7 @@ pkg_cumulate_rpm() {
 }
 
 pkg_install_rpm() {
-    ( cd "$BUILD_ROOT" && chroot "$BUILD_ROOT" rpm --ignorearch --nodeps -U --oldpackage --ignoresize $RPMCHECKOPTS \
+    ( cd "$BUILD_ROOT" && chroot "$BUILD_ROOT" rpm --ignorearch --replacefiles --nodeps -U --oldpackage --ignoresize $RPMCHECKOPTS \
 		$ADDITIONAL_PARAMS .init_b_cache/$PKG.rpm 2>&1 || \
 	  touch "$BUILD_ROOT"/exit ) | \
 	      grep -v "^warning:.*saved as.*rpmorig$"
-- 
cgit v1.2.3