Merge branch 'master' into devel

Change-Id: I7c0fcdcea01a7e066f17fb29e43a2e48c2e7a8d5

diff --git a/README b/README
index ac21af8..204ee57 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
-This  is  a tool to build binary packages in a safe and reproducible
+This   is a tool to build binary packages in a safe and reproducible
 way. The default is to build in a chroot sandbox, but it also
 supports building in a virtual machine for better security.
 

diff --git a/build b/build
index cdeac3d..fb572fe 100755 (executable)
--- a/build
+++ b/build
@@ -518,7 +518,7 @@ setmemorylimit() {
     if test -n "$VM_IMAGE" -o -n "$RUNNING_IN_VM" ; then
                return
     fi
-    arch=`uname -p`
+       arch=`uname -p`
     if [ $arch == "x86_64" ];then
         echo "on X86_64, no limit mem size"
                return
@@ -528,12 +528,12 @@ setmemorylimit() {
     while read mem; do
     case "$mem" in
         MemTotal:*)
-               set -- $mem
-               eval "limit=\$(($2/3*4))"
+       set -- $mem
+       eval "limit=\$(($2/3*4))"
         ;;
         SwapTotal:*)
-               set -- $mem
-               eval "limit=\$(($2/3*4+$limit))"
+       set -- $mem
+       eval "limit=\$(($2/3*4+$limit))"
         ;;
     esac
     done < <(cat /proc/meminfo) # cat for proc stuff

diff --git a/createrepomddeps b/createrepomddeps
index 8ef9ddf..4347005 100755 (executable)
--- a/createrepomddeps
+++ b/createrepomddeps
@@ -90,7 +90,7 @@ for my $url (@ARGV) {
     $dir = "$cachedir/$repoid/";
     $baseurl .= '/' unless $baseurl =~ /\/$/;
     mkpath("${dir}repodata");
-       #my $sem;
+    #my $sem;
        #my $key = IPC::SysV::ftok($dir, '1');
        #if ($sem = IPC::Semaphore->new($key, 1, S_IRUSR | S_IWUSR | IPC_CREAT | IPC_EXCL)) {
        #  $sem->setval(0, 1);
@@ -101,9 +101,9 @@ for my $url (@ARGV) {
        #$sem->op(0, -1, SEM_UNDO);
        #if (!-f "${dir}repodata/repomd.xml") {
          system($INC[0].'/download', "${dir}repodata", "${baseurl}repodata/repomd.xml");
-       #}
-       #$sem->op(0, 1, SEM_UNDO);
-       #$sem->remove();
+      #}
+      #$sem->op(0, 1, SEM_UNDO);
+         #$sem->remove();
   } else {
     $dir = $url;
   }
@@ -147,7 +147,7 @@ for my $url (@ARGV) {
          die("download failed\n");
        }
       } else {
-       die("inconsistent repodata in $url\n");
+       die("inconsistent repodata in $url\n");
       }
     }
        #$sem->op(0, 1, SEM_UNDO);

diff --git a/debian/changelog b/debian/changelog
index 97d2a12..0d04215 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,7 +49,7 @@ build (20160629-tizen20170630) unstable; urgency=high
 
 build (20160629-tizen20170428) unstable; urgency=high
 
-  * update upstream version to 20160629
+  * update to version 20160629
 
  -- Fu Shuai <shuai01.fu@samsung.com>  Fri, 5 May 2017 10:30:00 +0800
 
@@ -91,6 +91,7 @@ build (20150115-tizen20160302) unstable; urgency=high
 
  -- Fan Jiankang <jiankang.fan@samsung.com>  Wed, 2 Mar 2016 19:30:22 +0200
 
+
 build (2013.11.12-tizen20140815) unstable; urgency=high
 
   * update to version 2013.11.12

diff --git a/init_buildsystem b/init_buildsystem
index 5149b29..43ac57a 100755 (executable)
--- a/init_buildsystem
+++ b/init_buildsystem
@@ -995,7 +995,7 @@ for PKG in $MAIN_LIST ; do
     if test -e "$BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF" -a ! -s "$BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF" ; then
        # preinstallimage package, make sure it's in the image
        if ! test -e "$BUILD_ROOT"/.preinstall_image/$PKG ; then
-               echo "Package $PKG is missing from the preinstall image"
+           echo "Package $PKG is missing from the preinstall image"
            cleanup_and_exit 1
        fi
        read PKG_HDRMD5 PKGID < "$BUILD_ROOT"/.preinstall_image/$PKG
@@ -1006,23 +1006,23 @@ for PKG in $MAIN_LIST ; do
 
     # get the hdrmd5 if we want to create a preinstall image
     PKG_HDRMD5=
-       if test -d "$BUILD_ROOT"/.preinstall_image -a ! -e "$BUILD_ROOT"/.preinstall_image/$PKG ; then
+    if test -d "$BUILD_ROOT"/.preinstall_image -a ! -e "$BUILD_ROOT"/.preinstall_image/$PKG ; then
        PKG_HDRMD5=`perl -I$BUILD_DIR -MBuild -e 'print Build::queryhdrmd5($ARGV[0])' "$BUILD_ROOT"/.init_b_cache/rpms/$PKG.$PSUF`
-    test -n "$PKG_HDRMD5" || cleanup_and_exit 1
+       test -n "$PKG_HDRMD5" || cleanup_and_exit 1
     fi
 
-       test -L "$BUILD_ROOT"/.init_b_cache/rpms/$PKG.$PSUF || continue
+    test -L "$BUILD_ROOT"/.init_b_cache/rpms/$PKG.$PSUF || continue
 
     # check if we can keep an already installed package
-       if test "$VERIFY_BUILD_SYSTEM" != true -a -f "$BUILD_ROOT"/.init_b_cache/rpms/$PKG.id -a -f "$BUILD_ROOT"/.init_b_cache/alreadyinstalled/$PKG ; then
+    if test "$VERIFY_BUILD_SYSTEM" != true -a -f "$BUILD_ROOT"/.init_b_cache/rpms/$PKG.id -a -f "$BUILD_ROOT"/.init_b_cache/alreadyinstalled/$PKG ; then
        read PKGID < "$BUILD_ROOT"/.init_b_cache/rpms/$PKG.id
        read OLDPKGID < "$BUILD_ROOT"/.init_b_cache/alreadyinstalled/$PKG
        if test "$PKGID" = "$OLDPKGID" ; then
            echo "keeping ${PKGID%% *}"
            rm -f "$BUILD_ROOT"/.init_b_cache/$PKG.$PSUF
-               echo "$PKGID" > "$BUILD_ROOT"/installed-pkg/$PKG
-               test -n "$PKG_HDRMD5" && echo "$PKG_HDRMD5 $PKGID" > "$BUILD_ROOT"/.preinstall_image/$PKG
-               continue
+           echo "$PKGID" > "$BUILD_ROOT"/installed-pkg/$PKG
+           test -n "$PKG_HDRMD5" && echo "$PKG_HDRMD5 $PKGID" > "$BUILD_ROOT"/.preinstall_image/$PKG
+           continue
        fi
     fi
 
@@ -1030,16 +1030,16 @@ for PKG in $MAIN_LIST ; do
    if test "$PSUF" != "rpm" ; then
        PKGID=$(perl -I$BUILD_DIR -MBuild -e Build::showquery "$BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF" buildid)
    else
-       ep=$(rpm -qp --qf "%{EPOCH}" "'$BUILD_ROOT'/.init_b_cache/rpms/$PKG.$PSUF") 
-          if test "$ep" != "(none)"; then
+       ep=$(rpm -qp --qf "%{EPOCH}" "'$BUILD_ROOT'/.init_b_cache/rpms/$PKG.$PSUF")
+       if test "$ep" != "(none)"; then
            RPMIDFMT_EP="%{NAME}-%{EPOCH}:%{VERSION}-%{RELEASE} %{BUILDTIME}-%{ARCH}\n"
-                  PKGID=`rpm -qp --qf "${RPMIDFMT_EP}" $RPMCHECKOPTS_HOST "'$BUILD_ROOT'/.init_b_cache/rpms/$PKG.$PSUF"`
-          else
-                  PKGID=`rpm -qp --qf "${RPMIDFMT}" $RPMCHECKOPTS_HOST "'$BUILD_ROOT'/.init_b_cache/rpms/$PKG.$PSUF"`
+           PKGID=`rpm -qp --qf "${RPMIDFMT_EP}" $RPMCHECKOPTS_HOST "'$BUILD_ROOT'/.init_b_cache/rpms/$PKG.$PSUF"`
+       else
+           PKGID=`rpm -qp --qf "${RPMIDFMT}" $RPMCHECKOPTS_HOST "'$BUILD_ROOT'/.init_b_cache/rpms/$PKG.$PSUF"`
        fi
    fi
 
-       if test -f "$BUILD_ROOT"/.init_b_cache/alreadyinstalled/$PKG ; then
+    if test -f "$BUILD_ROOT"/.init_b_cache/alreadyinstalled/$PKG ; then
        read OLDPKGID < "$BUILD_ROOT"/.init_b_cache/alreadyinstalled/$PKG
        if test "$PKGID" != "$OLDPKGID" ; then
            echo "deleting unwanted ${OLDPKGID%% *}"
@@ -1067,7 +1067,7 @@ for PKG in $MAIN_LIST ; do
     # 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"
+           test -e "$i" && ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS --justdb"
        done
     fi
 
@@ -1080,13 +1080,14 @@ for PKG in $MAIN_LIST ; do
     echo "installing ${PKGID%% *}"
     if ! test "$BUILD_ROOT/.init_b_cache/rpms/$PKG.$PSUF" -ef "$BUILD_ROOT/.init_b_cache/$PKG.$PSUF" ; then
        rm -f "$BUILD_ROOT"/.init_b_cache/$PKG.$PSUF
-    cp "$BUILD_ROOT"/.init_b_cache/rpms/$PKG.$PSUF "$BUILD_ROOT"/.init_b_cache/$PKG.$PSUF || cleanup_and_exit 1
-       fi
+       cp "$BUILD_ROOT"/.init_b_cache/rpms/$PKG.$PSUF "$BUILD_ROOT"/.init_b_cache/$PKG.$PSUF || cleanup_and_exit 1
+    fi
     pkg_install
     check_exit
-       rm -f "$BUILD_ROOT"/.init_b_cache/$PKG.$PSUF
-       echo "$PKGID" > "$BUILD_ROOT"/installed-pkg/$PKG
-       test -n "$PKG_HDRMD5" && echo "$PKG_HDRMD5 $PKGID" > "$BUILD_ROOT"/.preinstall_image/$PKG
+    rm -f "$BUILD_ROOT"/.init_b_cache/$PKG.$PSUF
+    echo "$PKGID" > "$BUILD_ROOT"/installed-pkg/$PKG
+    test -n "$PKG_HDRMD5" && echo "$PKG_HDRMD5 $PKGID" > "$BUILD_ROOT"/.preinstall_image/$PKG
+
 done
 
 # do post-installation work

diff --git a/packaging/build.changes b/packaging/build.changes
index 44b30ee..fb5f4e6 100644 (file)
--- a/packaging/build.changes
+++ b/packaging/build.changes
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------
-Wed Oct 31 09:30:00 CST 2018 - jingui.ren@samsung.com
+Thu Oct 31 09:30:00 CST 2018 - jingui.ren@samsung.com
 
 - Update tizen version to tizen20181031
 - Speed up the download packages when use https
@@ -43,7 +43,7 @@ Fri Jun 30 10:30:00 CST 2017 - y0169.zhang@samsung.com
 -------------------------------------------------------------------
 Fri May 5 10:30:00 CST 2017 - shuai01.fu@samsung.com
 
-- update upstream 20160629
+- update to version 20160629
 
 -------------------------------------------------------------------
 Wed Apr 5 19:00:00 KST 2017 - sk7.park@samsung.com