Upload tizen_2.2 source

Change-Id: I1333bafd39ddf23b89a182140afca1b3ddae0f59

diff --git a/Makefile b/Makefile
index 228b37daf9c0853e5f6c77b18481820ca7b7dec1..6e4e500cbd135f059d960fd42c382d2f9e5a0d21 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ ifeq ($(HOST_OS),linux)
        LOCAL_UTIL_SRC := src/utils_unix.c
        LOCAL_OTHER_SRC := src/fdevent.c src/fdevent_unix.c
        LOCAL_LFLAGS := -lrt -lpthread
-       LOCAL_CFLAGS := -DOS_LINUX -DHAVE_FORKEXEC -DHAVE_TERMIO_H -DHAVE_SYMLINKS -DSDB_HOST=1 -DSDB_HOST_ON_TARGET=1
+       LOCAL_CFLAGS := -DOS_LINUX -DHAVE_FORKEXEC -DHAVE_TERMIO_H -DHAVE_SYMLINKS -DSDB_HOST=1 -DSDB_HOST_ON_TARGET=1 -D_FILE_OFFSET_BITS=64
 endif
 
 ifeq ($(HOST_OS),darwin)

diff --git a/package/changelog b/package/changelog
index f6558420d5a754bc0ceea5759a9c3e23256832b4..e4825941ee64eacc24ccbd99344775a40750fd03 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,9 @@
+* 2.2.16
+- fixed build script for tsudo
+== ho.namkoong <ho.namkoong@samsung.com> 2013-07-15
+* 2.2.15
+- give abs path to tsudo
+== ho.namkoong <ho.namkoong@samsung.com> 2013-07-12
 * 2.2.14
 - Change PATH_MAX in Windows 256 -> 4096
 == ho.namkoong <ho.namkoong@samsung.com> 2013-07-11

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 9c4ccd47eab039b93c94c0c1edbcc621dea055b3..731fb11cbb472e2cd9b5bf1203b513ef42831d30 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.2.14
+Version:2.2.16
 Source:sdb
 Maintainer:Kangho Kim <kh5325.kim@samsung.com>, Yoonki Park<yoonki.park@samsung.com>, Hyunsik Noh<hyunsik.noh@samsung.com>, Gun Kim<gune.kim@samsung.com>, Ho Namkoong<ho.namkoong@samsung.com>, Taeyoung Son<taeyoung2.son@samsung.com>
 

diff --git a/package/sdb.install.linux b/package/sdb.install.linux
index 8a410efd64d85c5c1e30dcb5c22cf34a7133854f..456cba75d3a1fd23442caeea859c1ab5acfdca35 100755 (executable)
--- a/package/sdb.install.linux
+++ b/package/sdb.install.linux
@@ -34,18 +34,20 @@ echo "" >> $TMP_FILE
 echo "# Samsung" >> $TMP_FILE
 echo "SUBSYSTEMS==\"usb\", ATTRS{idVendor}==\"04e8\", ATTRS{idProduct}==\"6864\", MODE=\"0666\", GROUP=\"plugdev\"" >> $TMP_FILE
 echo "SUBSYSTEMS==\"usb\", ATTRS{idVendor}==\"04e8\", ATTRS{idProduct}==\"6863\", MODE=\"0666\", GROUP=\"plugdev\"" >> $TMP_FILE
+
 chmod +x $TMP_FILE
+CURRENT_DIR=`pwd`
 
 if [ -z "$TSUDO" ]; then
     if [ -f /usr/bin/gksudo ]
-        then gksudo mv ${TMP_FILE} /etc/udev/rules.d/
+        then gksudo mv ${CURRENT_DIR}/${TMP_FILE} /etc/udev/rules.d/
         else if [ -f /usr/bin/sudo ]
-            then sudo mv ${TMP_FILE} /etc/udev/rules.d/
+            then sudo mv ${CURRENT_DIR}/${TMP_FILE} /etc/udev/rules.d/
         fi
     fi
     exit 0
 else
-    $TSUDO -m "Enter your password to install sdb." mv ${TMP_FILE} /etc/udev/rules.d/
+    $TSUDO -m "Enter your password to install sdb." mv ${CURRENT_DIR}/${TMP_FILE} /etc/udev/rules.d/
     exit 0
 fi
 

diff --git a/package/sdb.remove.linux b/package/sdb.remove.linux
index 96166427c68783fd68671074b46f18e188c74fd3..b849590fb019912b136225d4d9bfdf991598ba27 100755 (executable)
--- a/package/sdb.remove.linux
+++ b/package/sdb.remove.linux
@@ -6,7 +6,7 @@ rm -rf ${INSTALLED_PATH}/${SDB_PATH}
 s=`cat ${HOME}/.bashrc | grep -n "## Tizen SDK configuration" | cut -f1 -d":"`
 
 if [ "x${s}" = "x" ] ; then
-       exit 1
+       exit 0
 fi
 
 if [ ${s} -ge 0 ] ; then

diff --git a/src/transport.c b/src/transport.c
index 588e463784d54011f4fa9aa2c5ce0118d0d1b2fd..51a6abd39d5279623dfb921a632cb69b51f8e08f 100755 (executable)
--- a/src/transport.c
+++ b/src/transport.c
@@ -738,12 +738,13 @@ static void transport_unref_locked(atransport *t)
         remove_transport(t);
 
         /* update tizen specific device name */
-        for (tmp = t->next; tmp && tmp != &transport_list &&
-                tmp->type == kTransportUsb; tmp = tmp->next) {
-            D("update tizen specific device name: %s\n", tmp->device_name);
-            if (tmp->device_name && sscanf(tmp->device_name, "device-%d", &nr) == 1) {
-                free(tmp->device_name);
-                asprintf(&tmp->device_name, "device-%d", nr - 1);
+        for (tmp = t->next; tmp && tmp != &transport_list; tmp = tmp->next) {
+            if (tmp->type == kTransportUsb) {
+                D("update tizen specific device name: %s\n", tmp->device_name);
+                if (tmp->device_name && sscanf(tmp->device_name, "device-%d", &nr) == 1) {
+                    free(tmp->device_name);
+                    asprintf(&tmp->device_name, "device-%d", nr - 1);
+                }
             }
         }
     } else {

diff --git a/src/usb_linux.c b/src/usb_linux.c
index 4bbeb31424b133983818f849d1c147ee92dd57ca..499b0c39308847e039f7cfb8a3d6b0fab67fccc8 100755 (executable)
--- a/src/usb_linux.c
+++ b/src/usb_linux.c
@@ -591,11 +591,10 @@ static void register_device(const char *dev_name,
         D("[ usb open read-only %s fd = %d]\n", usb->fname, usb->desc);
     } else {
         D("[ usb open %s fd = %d]\n", usb->fname, usb->desc);
-        /* tizen specific */
+        // TODO: verify reset is really needed!
         n = ioctl(usb->desc, USBDEVFS_RESET);
         if(n != 0) {
             D("[ usb reset failed %s fd = %d]\n", usb->fname, usb->desc);
-            goto fail;
         }
         n = ioctl(usb->desc, USBDEVFS_SETCONFIGURATION, &bConfigurationValue);
         if (n != 0) {
@@ -606,7 +605,6 @@ static void register_device(const char *dev_name,
         n = ioctl(usb->desc, USBDEVFS_CLAIMINTERFACE, &interface);
         if(n != 0) {
             D("[ usb claim failed %s fd = %d]\n", usb->fname, usb->desc);
-            goto fail;
         }
     }