diff options
| author | Jussi Laako <jussi.laako@linux.intel.com> | 2014-03-10 16:44:09 +0200 |
|---|---|---|
| committer | Jussi Laako <jussi.laako@linux.intel.com> | 2014-03-10 16:44:09 +0200 |
| commit | b539cb740dad93950d9d89ec321c1b9622ccdab5 (patch) | |
| tree | 1daa996bd516f68c458367be96c4188b6effbda0 /tools | |
| parent | 1fd618eee96db111f3eea0806eccb8cf2ad91106 (diff) | |
| download | gsignond-b539cb740dad93950d9d89ec321c1b9622ccdab5.tar.gz gsignond-b539cb740dad93950d9d89ec321c1b9622ccdab5.tar.bz2 gsignond-b539cb740dad93950d9d89ec321c1b9622ccdab5.zip | |
Update to upstream 1.0.1
Change-Id: Ibda71ee45e57dd921e49d36ffb57c3b23e972179
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/prepare-tizen.sh | 11 | ||||
| -rwxr-xr-x | tools/setup-and-start-daemon.sh | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/tools/prepare-tizen.sh b/tools/prepare-tizen.sh index 7c4f4e2..c94ad1c 100755 --- a/tools/prepare-tizen.sh +++ b/tools/prepare-tizen.sh @@ -14,10 +14,11 @@ echo "CURR dir = $currdir" mkdir -p $2 && \ cd $2 && \ -git rm -r * && \ +git rm -r *; rm -rf packaging; tar -xzvf $currdir/$1 -C $2 --strip-components 1 && \ mkdir -p packaging && \ -cd packaging && \ -cp -f ../dists/rpm/gsignond-tizen.spec gsignond.spec && \ -cp -f ../dists/rpm/gsignond-tizen.changes gsignond.changes && \ -cd .. && git add *; +cp -f dists/rpm/gsignond-tizen.spec packaging/gsignond.spec && \ +cp -f dists/rpm/gsignond-tizen.changes packaging/gsignond.changes && \ +cp -f dists/rpm/gsignond-tizen.manifest packaging/gsignond.manifest && \ +cp $currdir/.gitignore $2/ && \ +git add -f *; diff --git a/tools/setup-and-start-daemon.sh b/tools/setup-and-start-daemon.sh index 62dc071..8795cc6 100755 --- a/tools/setup-and-start-daemon.sh +++ b/tools/setup-and-start-daemon.sh @@ -5,7 +5,7 @@ with_gdb=0 if test $# -ge 1 ; then if test "$1" == "--with-duma" ; then with_duma=1 - with_gdb=1 + with_gdb=0 else with_duma=0 if test "$1" == "--with-gdb" ; then @@ -23,13 +23,13 @@ else export SSO_KEYCHAIN_SYSCTX="$SRC_HOME/test/daemon/.libs/daemontest" fi export SSO_BIN_DIR=$SRC_HOME/src/daemon/.libs -export SSO_PLUGINS_DIR=$SRC_HOME/src/plugins/.libs +export SSO_GPLUGINS_DIR=$SRC_HOME/src/plugins/.libs export LD_LIBRARY_PATH="$SRC_HOME/src/daemon/plugins/plugind/.libs:$SRC_HOME/src/daemon/plugins/.libs" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SRC_HOME/src/common/.libs:$SRC_HOME/src/common/db/.libs:$SRC_HOME/src/daemon/.libs:$SRC_HOME/src/daemon/db/.libs:$SRC_HOME/src/daemon/dbus/.libs" export G_MESSAGES_DEBUG="all" # Clean db -rm -rf /tmp/gsignond +#rm -rf /tmp/gsignond echo "--------------------------" echo "with_duma: $with_duma" @@ -40,7 +40,7 @@ if test $with_duma -eq 1 ; then export DUMA_PROTECT_FREE=1 export DUMA_PROTECT_BELOW=1 - LD_PRELOAD="libduma.so" $SRC_HOME/src/daemon/.libs/gsignond & + LD_PRELOAD="libduma.so" $SRC_HOME/src/daemon/.libs/gsignond if test $with_gdb -eq 1 ; then sudo gdb --pid=`pidof gsignond` |