From: Philippe Coval Date: Sat, 23 Jul 2016 04:52:30 +0000 (+0200) Subject: tizen: Dereference sqlite3 symlinks before building X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=016b0075b3c0607351954914d6ee038d0d702c92;p=contrib%2Fiotivity.git tizen: Dereference sqlite3 symlinks before building If existing sqlite3 files (not dead links) are present it will use them and prevent downloading at buildtime and break if running in a "disconnected environment" like Tizen GBS (chroot). Typically, if files are not part of packaging, this is the error message you'll face: *** Checking for installation of SQLite 3.8.11.1 *** Download /home/abuild/rpmbuild/BUILD/iotivity-1.1.1/extlibs/sqlite3/sqlite-amalgamation-3081101.zip from https://www.sqlite.org/2015/sqlite-amalgamation-3081101.zip Downloading ... scons: *** [https://www.sqlite.org/2015/sqlite-amalgamation-3081101.zip] Stop. Here are some examples of failed jenkins sessions: - https://gerrit.iotivity.org/gerrit/#/c/9609/1/ - https://build.iotivity.org/ci/job/iotivity-verify-tizen/364/consoleText Bug: https://jira.iotivity.org/browse/IOT-820 Change-Id: I59ac88807a2d9222e94b841d99a9163765e8596c Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/9641 Tested-by: jenkins-iotivity Reviewed-by: Trevor Bramwell Reviewed-by: Ashwini Kumar Reviewed-by: Habib Virji Reviewed-by: Uze Choi (cherry picked from commit 76be2fe7e4d52a21a721cfa312cd3274741bf5aa) Reviewed-on: https://gerrit.iotivity.org/gerrit/9651 Reviewed-by: Ziran Sun Reviewed-by: Jon A. Cruz --- diff --git a/gbsbuild.sh b/gbsbuild.sh index 0a3cd39..84fe3ac 100755 --- a/gbsbuild.sh +++ b/gbsbuild.sh @@ -32,7 +32,7 @@ rm -rf $sourcedir/tmp/extlibs/tinycbor/tinycbor/.git cp -R ./extlibs/cjson $sourcedir/tmp/extlibs cp -R ./extlibs/gtest $sourcedir/tmp/extlibs cp -R ./extlibs/tinydtls $sourcedir/tmp/extlibs -cp -R ./extlibs/sqlite3 $sourcedir/tmp/extlibs +cp -LR ./extlibs/sqlite3 $sourcedir/tmp/extlibs cp -R ./extlibs/timer $sourcedir/tmp/extlibs cp -R ./extlibs/rapidxml $sourcedir/tmp/extlibs cp -R ./resource $sourcedir/tmp