Hello community, here is the log from the commit of package android-tools for openSUSE:Factory checked in at 2013-03-08 09:07:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/android-tools (Old) and /work/SRC/openSUSE:Factory/.android-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "android-tools", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes 2013-01-29 06:43:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.android-tools.new/android-tools.changes 2013-03-08 09:07:20.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 14 19:39:22 UTC 2013 - [email protected] + +- Update to version 4.2.2_r2 + * no changelog available +- Remove provide section from package + +------------------------------------------------------------------- Old: ---- core-4.2.1_r1.tar.bz2 extras-4.2.1_r1.tar.bz2 New: ---- core-4.2.2_r1.tar.bz2 extras-4.2.2_r1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ android-tools.spec ++++++ --- /var/tmp/diff_new_pack.9jBYaU/_old 2013-03-08 09:07:21.000000000 +0100 +++ /var/tmp/diff_new_pack.9jBYaU/_new 2013-03-08 09:07:21.000000000 +0100 @@ -17,7 +17,7 @@ Name: android-tools -Version: 4.2.1_r1 +Version: 4.2.2_r1 Release: 0 Summary: Android platform tools (adb, fastboot) License: Apache-2.0 and BSD-3-Clause @@ -42,9 +42,6 @@ BuildRequires: zlib-devel Requires: udev -Provides: adb -Provides: fastboot - %if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 %define _udevprefix /usr/lib %else @@ -70,7 +67,7 @@ %install install -d -m 0755 %{buildroot}%{_bindir} install -D -m 0644 %{SOURCE5} %{buildroot}%{_udevprefix}/udev/rules.d/51-android.rules -%make_install DESTDIR=%{buildroot} BINDIR=%{_bindir} +make install DESTDIR=%{buildroot} BINDIR=%{_bindir} %files %defattr(-,root,root) ++++++ core-4.2.1_r1.tar.bz2 -> core-4.2.2_r1.tar.bz2 ++++++ ++++++ extras-4.2.1_r1.tar.bz2 -> extras-4.2.2_r1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extras/ext4_utils/contents.c new/extras/ext4_utils/contents.c --- old/extras/ext4_utils/contents.c 2012-10-20 00:46:35.000000000 +0200 +++ new/extras/ext4_utils/contents.c 2012-12-19 00:27:26.000000000 +0100 @@ -44,11 +44,6 @@ len += dentry_len; } - /* include size of the dentry used to pad until the end of the block */ - if (len % info.block_size + 8 > info.block_size) - len += info.block_size - (len % info.block_size); - len += 8; - return len; } @@ -160,11 +155,8 @@ } } - dentry = (struct ext4_dir_entry_2 *)(data + offset); - dentry->inode = 0; - dentry->rec_len = len - offset; - dentry->name_len = 0; - dentry->file_type = EXT4_FT_UNKNOWN; + /* pad the last dentry out to the end of the block */ + dentry->rec_len += len - offset; return inode_num; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/extras/ext4_utils/make_ext4fs.c new/extras/ext4_utils/make_ext4fs.c --- old/extras/ext4_utils/make_ext4fs.c 2012-10-20 00:46:35.000000000 +0200 +++ new/extras/ext4_utils/make_ext4fs.c 2012-12-19 00:27:26.000000000 +0100 @@ -104,18 +104,30 @@ { int entries = 0; struct dentry *dentries; - struct dirent **namelist; + struct dirent **namelist = NULL; struct stat stat; int ret; int i; u32 inode; u32 entry_inode; u32 dirs = 0; + bool needs_lost_and_found = false; - entries = scandir(full_path, &namelist, filter_dot, (void*)alphasort); - if (entries < 0) { - error_errno("scandir"); - return EXT4_ALLOCATE_FAILED; + if (full_path) { + entries = scandir(full_path, &namelist, filter_dot, (void*)alphasort); + if (entries < 0) { + error_errno("scandir"); + return EXT4_ALLOCATE_FAILED; + } + } + + if (dir_inode == 0) { + /* root directory, check if lost+found already exists */ + for (i = 0; i < entries; i++) + if (strcmp(namelist[i]->d_name, "lost+found") == 0) + break; + if (i == entries) + needs_lost_and_found = true; } dentries = calloc(entries, sizeof(struct dentry)); @@ -195,6 +207,34 @@ } free(namelist); + if (needs_lost_and_found) { + /* insert a lost+found directory at the beginning of the dentries */ + struct dentry *tmp = calloc(entries + 1, sizeof(struct dentry)); + memset(tmp, 0, sizeof(struct dentry)); + memcpy(tmp + 1, dentries, entries * sizeof(struct dentry)); + dentries = tmp; + + dentries[0].filename = strdup("lost+found"); + asprintf(&dentries[0].path, "%s/lost+found", dir_path); + dentries[0].full_path = NULL; + dentries[0].size = 0; + dentries[0].mode = S_IRWXU; + dentries[0].file_type = EXT4_FT_DIR; + dentries[0].uid = 0; + dentries[0].gid = 0; +#ifdef HAVE_SELINUX + if (sehnd) { + char *sepath = NULL; + asprintf(&sepath, "/%s", dentries[0].path); + if (selabel_lookup(sehnd, &dentries[0].secon, sepath, dentries[0].mode) < 0) + error("cannot lookup security context for %s", dentries[0].path); + free(sepath); + } +#endif + entries++; + dirs++; + } + inode = make_directory(dir_inode, entries, dentries, dirs); for (i = 0; i < entries; i++) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
