From: SoonKyu Park <sk7.park@samsung.com>
Date: Wed, 27 Jul 2016 05:31:25 +0000 (+0900)
Subject: Merge branch 'master' into devel
X-Git-Tag: upstream/20160629~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff8a73941e06041ee512d257746a0e919f5016ca;p=tools%2Fbuild.git

Merge branch 'master' into devel

Change-Id: Icb33675a10834315944ddc5e5711857086facf4e
---

ff8a73941e06041ee512d257746a0e919f5016ca
diff --cc build
index 80571bf,ea39ae0..500bd8a
--- a/build
+++ b/build
@@@ -487,16 -422,11 +422,16 @@@ setupccache() 
      fi
  }
  
 -setupicecream() {
 -    if test "$icecream" -eq 0 ; then
 -	rm -rf "$BUILD_ROOT/var/run/icecream"
 +setupicecream()
 +{
 +    local icecreamdir="/var/run/icecream"
 +    if test `readlink "$BUILD_ROOT/var/run"` = '/run' ; then
 +        icecreamdir="/run/icecream"
 +    fi
 +    if [ "$icecream" -eq 0 ]; then
 +	rm -rf "$BUILD_ROOT$icecreamdir"
  	rm -f "$BUILD_ROOT/etc/profile.d/build_icecream.sh"
- 	return
+ 	return 0
      fi
  
      if ! chroot "$BUILD_ROOT" rpm -q icecream >/dev/null 2>/dev/null; then
@@@ -523,26 -452,23 +457,25 @@@
  	-o "$BUILD_ROOT/usr/bin/gcc" -nt "$BUILD_ROOT/$icecc_vers" \
  	-o "$BUILD_ROOT/usr/bin/g++" -nt "$BUILD_ROOT/$icecc_vers" \
  	-o "$BUILD_ROOT/usr/bin/as" -nt "$BUILD_ROOT/$icecc_vers" \
- 	-o "$BUILD_ROOT/lib/libc.so.6" -nt "$BUILD_ROOT/$icecc_vers" ]
+ 	-o "$BUILD_ROOT/lib/libc.so.6" -nt "$BUILD_ROOT/$icecc_vers"
      then
 -	rm -rf "$BUILD_ROOT/var/run/icecream"
 -	mkdir -p "$BUILD_ROOT/var/run/icecream"
 -	if test -e "$BUILD_ROOT"/usr/bin/create-env ; then
 -	    createenv=/usr/bin/create-env
 -	elif test -e "$BUILD_ROOT"/usr/lib/icecc/icecc-create-env ; then
 -	    createenv="/usr/lib/icecc/icecc-create-env /usr/bin/gcc /usr/bin/g++" # XXX
 -	elif test -e "$BUILD_ROOT"/usr/lib64/icecc/icecc-create-env ; then
 -	    createenv="/usr/lib64/icecc/icecc-create-env /usr/bin/gcc /usr/bin/g++" # XXX
 +	rm -rf "$BUILD_ROOT$icecreamdir"
 +	mkdir -p "$BUILD_ROOT$icecreamdir"
 +	if [ -e "$BUILD_ROOT"/usr/bin/create-env ]; then
 +	  createenv=/usr/bin/create-env
 +	elif [ -e "$BUILD_ROOT"/usr/lib/icecc/icecc-create-env ]; then
 +	  createenv="/usr/lib/icecc/icecc-create-env /usr/bin/gcc /usr/bin/g++" # XXX
 +	elif [ -e "$BUILD_ROOT"/usr/lib64/icecc/icecc-create-env ]; then
 +	  createenv="/usr/lib64/icecc/icecc-create-env /usr/bin/gcc /usr/bin/g++" # XXX
  	else
- 	  echo "create-env not found"
- 	  false
- 	  return
+ 	    echo "create-env not found"
+ 	    return 1
  	fi
 -	chroot $BUILD_ROOT bash -c "cd /var/run/icecream; $createenv" || cleanup_and_exit 1
 -	icecc_vers=(`shopt -s nullglob; echo $BUILD_ROOT/var/run/icecream/*.tar.{bz2,gz}`)
 +        echo "creating new env in '$icecreamdir'"
 +	chroot $BUILD_ROOT bash -c "cd $icecreamdir; $createenv" || cleanup_and_exit 1
 +	icecc_vers=(`shopt -s nullglob; echo $BUILD_ROOT/$icecreamdir/*.tar.{bz2,gz}`)
  	icecc_vers=${icecc_vers//$BUILD_ROOT/}
 +	echo "created icecream environment $icecc_vers"
      else
  	echo "reusing existing icecream environment $icecc_vers"
      fi
diff --cc debian/changelog
index c44d629,f16624f..e424793
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,9 @@@
- build (2015.01.15-tizen20160315) unstable; urgency=high
+ build (20150115-tizen20160302) unstable; urgency=high
  
-   * just update version to 2015.01.15 
- 
-  -- Jiankang Fan <jiankang.fan@samsung.com>  Tue, 15 Mar 2016 19:30:22 +0200
+   * update to version 20150115
  
+  -- 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