Fix merge issue for modified interface and keep_packages

Change-Id: Ide2e1c040291a3cf1cb35be14a10fcb0f874fe43
Signed-off-by: jiankang.fan <jiankang.fan@samsung.com>

diff --git a/build-recipe-spec b/build-recipe-spec
index c7acbabc7612338093aa339f9de2b7a2364440a3..c9a948c9a98d3d2876ea126b84d61f976b00ad9f 100644 (file)
--- a/build-recipe-spec
+++ b/build-recipe-spec
@@ -145,7 +145,7 @@ recipe_build_spec() {
         toshellscript $rpmbuild \
                 "${definesnstuff[@]}" \
                 "${rpmbopts[@]}" \
-                "$TOPDIR/SOURCES/$SPECFILE" \
+                "$TOPDIR/SOURCES/$RECIPEFILE" \
                 > $BUILD_ROOT/.build.command
     else
         rpmbopts[${#rpmbopts[@]}]='--short-circuit'
@@ -158,7 +158,7 @@ recipe_build_spec() {
             shellquote $rpmbuild  \
                     "${definesnstuff[@]}" \
                     "${rpmbopts[@]}" $opt \
-                    "$TOPDIR/SOURCES/$SPECFILE" \
+                    "$TOPDIR/SOURCES/$RECIPEFILE" \
                     >> $BUILD_ROOT/.build.command
             echo >>$BUILD_ROOT/.build.command
             [ "$opt" == "$BUILD_RPM_BUILD_STAGE" ] && break

diff --git a/init_buildsystem b/init_buildsystem
index f2d794a9d8c9189c3cd2153b001a10fbc425998b..3ea3052426c71a8ccb6aa5bed032bd354be41e60 100755 (executable)
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -51,6 +51,7 @@ TMPFILE=$BUILD_ROOT/tmpfile
 # should RPMs be installed with --force ?
 USE_FORCE=false
 PREPARE_VM=
+KEEP_PACKS=
 USEUSEDFORBUILD=
 LIST_STATE=
 RPMLIST=
@@ -65,6 +66,10 @@ while test -n "$1" ; do
            shift
            PREPARE_VM=true
            ;;
+       --keep-packs)
+           shift
+           KEEP_PACKS=true
+           ;;
        --create-build-binaries)
            shift
            CREATE_BUILD_BINARIES=true
@@ -905,7 +910,7 @@ if [ -z "$KEEP_PACKS" ]; then
         PKG=${PKG##*/}
         test "$PKG" = "*" && continue
         echo "deleting $PKG"
-        rpm_e "$PKG"
+        pkg_erase
         check_exit
     done
     rm -rf "$BUILD_ROOT/.init_b_cache/todelete"