subject:"\[arch\-commits\] Commit in android\-tools\/trunk \(PKGBUILD\)"

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2020-10-08 Thread Anatol Pomozov via arch-commits

Date: Thursday, October 8, 2020 @ 16:49:59
  Author: anatolik
Revision: 721781

Remove ruby makedep as we do not generate ninja.build file from the *.rb script 
anymore

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-08 16:37:15 UTC (rev 721780)
+++ PKGBUILD2020-10-08 16:49:59 UTC (rev 721781)
@@ -14,7 +14,7 @@
 optdepends=('python: for mkbootimg script'
 'python2: for unpack_bootimg & avbtool scripts')
 # it depends on 'vim' because of 'xxd' tool.
-makedepends=(git clang gtest ruby cmake ninja go vim)
+makedepends=(git clang gtest cmake ninja go vim)
 provides=(fastboot adb)
 conflicts=(fastboot adb)
 source=(git+https://android.googlesource.com/platform/frameworks/base#tag=$_tag

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2020-10-08 Thread Anatol Pomozov via arch-commits

Date: Thursday, October 8, 2020 @ 16:36:30
  Author: anatolik
Revision: 721779

upgpkg: android-tools 30.0.4-2: Use compilation flags provided by makepkg

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-08 16:04:44 UTC (rev 721778)
+++ PKGBUILD2020-10-08 16:36:30 UTC (rev 721779)
@@ -4,7 +4,7 @@
 
 pkgname=android-tools
 pkgver=30.0.4
-pkgrel=1
+pkgrel=2
 _tag=platform-tools-$pkgver
 pkgdesc='Android platform tools'
 arch=(x86_64)
@@ -29,7 +29,7 @@
 
git+https://android.googlesource.com/platform/external/e2fsprogs#tag=$_tag
 git+https://android.googlesource.com/platform/external/avb#tag=$_tag
 
git+https://android.googlesource.com/platform/external/boringssl#tag=$_tag
-   build.ninja # copied from 
https://github.com/anatol/android-platform-tools-build
+build.ninja # copied from 
https://github.com/anatol/android-platform-tools-build
 # deployagent.jar is a library built from Android sources.
 # Building this java library requires a lot of dependencies:
 #  java, protobuf-java, dex compiler, Android base libs.
@@ -83,6 +83,12 @@
   cd "$srcdir"/boringssl
   patch -p1 < ../boringssl-disable-thirdpartydeps.patch
   mkdir -p "$srcdir"/boringssl/src/build
+
+  cd "$srcdir"
+  sed "s/CFLAGS =.*/CFLAGS = $CFLAGS/" -i build.ninja
+  sed "s/CPPFLAGS =.*/CPPFLAGS = $CPPFLAGS/" -i build.ninja
+  sed "s/CXXFLAGS =.*/CXXFLAGS = $CXXFLAGS/" -i build.ninja
+  sed "s/LDFLAGS =.*/LDFLAGS = $LDFLAGS/" -i build.ninja
 }
 
 build() {

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2020-08-01 Thread Anatol Pomozov via arch-commits

Date: Sunday, August 2, 2020 @ 01:52:08
  Author: anatolik
Revision: 667571

Use space instead of tabs for consistency

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-02 01:51:34 UTC (rev 667570)
+++ PKGBUILD2020-08-02 01:52:08 UTC (rev 667571)
@@ -45,7 +45,7 @@
 deployagent.jar
 # we disable mDNS functionality as it does not compile with the Arch system 
version of the library
 fix_build_core.patch
-   fix_libziparchive.patch
+fix_libziparchive.patch
 boringssl-disable-thirdpartydeps.patch
 bash_completion.fastboot)
 # Bash completion file was taken from 
https://github.com/mbrubeck/android-completion

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2020-08-01 Thread Anatol Pomozov via arch-commits

Date: Sunday, August 2, 2020 @ 01:51:34
  Author: anatolik
Revision: 667570

Use space instead of tabs for consistency

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-02 01:46:09 UTC (rev 667569)
+++ PKGBUILD2020-08-02 01:51:34 UTC (rev 667570)
@@ -21,8 +21,8 @@
 
git+https://android.googlesource.com/platform/frameworks/native#tag=$_tag
 git+https://android.googlesource.com/platform/system/core#tag=$_tag
 git+https://android.googlesource.com/platform/system/extras#tag=$_tag
-   git+https://android.googlesource.com/platform/system/libbase#tag=$_tag
-   
git+https://android.googlesource.com/platform/system/libziparchive#tag=$_tag
+git+https://android.googlesource.com/platform/system/libbase#tag=$_tag
+
git+https://android.googlesource.com/platform/system/libziparchive#tag=$_tag
 
git+https://android.googlesource.com/platform/system/tools/mkbootimg#tag=$_tag
 
git+https://android.googlesource.com/platform/external/selinux#tag=$_tag
 
git+https://android.googlesource.com/platform/external/f2fs-tools#tag=$_tag

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2020-05-17 Thread Filipe Laíns via arch-commits

Date: Sunday, May 17, 2020 @ 23:40:28
  Author: ffy00
Revision: 629147

upgpkg: android-tools 30.0.0-2 (protobuf 3.12 rebuild)

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-17 23:40:09 UTC (rev 629146)
+++ PKGBUILD2020-05-17 23:40:28 UTC (rev 629147)
@@ -4,7 +4,7 @@
 
 pkgname=android-tools
 pkgver=30.0.0
-pkgrel=1
+pkgrel=2
 tag=platform-tools-$pkgver
 pkgdesc='Android platform tools'
 arch=(x86_64)
@@ -73,7 +73,7 @@
   sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' unpack_bootimg.py
 
   cd "$srcdir"/boringssl
-  patch -p1 < ../../boringssl-disable-thirdpartydeps.patch
+  patch -p1 < ../boringssl-disable-thirdpartydeps.patch
   mkdir -p "$srcdir"/boringssl/src/build
 }

[arch-commits] Commit in android-tools/trunk (PKGBUILD generate_build.rb)

2020-03-04 Thread Anatol Pomozov via arch-commits

Date: Thursday, March 5, 2020 @ 00:47:50
  Author: anatolik
Revision: 590678

upgpkg: android-tools 29.0.6-1

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/generate_build.rb

---+
 PKGBUILD  |8 
 generate_build.rb |   11 +--
 2 files changed, 9 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-05 00:02:10 UTC (rev 590677)
+++ PKGBUILD2020-03-05 00:47:50 UTC (rev 590678)
@@ -3,8 +3,8 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=29.0.5
-pkgrel=2
+pkgver=29.0.6
+pkgrel=1
 tag=platform-tools-$pkgver
 pkgdesc='Android platform tools'
 arch=(x86_64)
@@ -14,7 +14,7 @@
 optdepends=('python: for mkbootimg script'
 'python2: for unpack_bootimg & avbtool scripts')
 # depend on 'vim' for 'xxd' tool.
-makedepends=(git clang gtest ruby cmake ninja go-pie vim)
+makedepends=(git clang gtest ruby cmake ninja go vim)
 provides=(fastboot adb)
 conflicts=(fastboot adb)
 _boringssl_commit=$(curl 
https://android.googlesource.com/platform/external/boringssl/+/refs/tags/$tag/BORINGSSL_REVISION?format=TEXT
 | base64 -d)
@@ -54,7 +54,7 @@
   'SKIP'
   'SKIP'
   'SKIP'
-  'acb02d8c048411fd21d00d57909a45aa6a6a6a7a'
+  '37992d0d7547b7deb703f3232ec124a4c6b96aef'
   'd9dfac30245faa0a96968b96f3acd9ad536f4910'
   '31779cd6c0df710be9589bd2ee4f697f59b100fd'
   '7004dbd0c193668827174880de6f8434de8ceaee')

Modified: generate_build.rb
===
--- generate_build.rb   2020-03-05 00:02:10 UTC (rev 590677)
+++ generate_build.rb   2020-03-05 00:47:50 UTC (rev 590678)
@@ -109,6 +109,7 @@
   transport.cpp
   transport_local.cpp
   transport_usb.cpp
+  types.cpp
 )
 libadbd = compile(expand("core/adb", adbdfiles), 
'-DPLATFORM_TOOLS_VERSION="\"$PLATFORM_TOOLS_VERSION\"" -DADB_HOST=1 
-Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include 
-Iboringssl/include -Icore/diagnose_usb/include')
 
@@ -158,6 +159,7 @@
   chrono_utils.cpp
   errors_unix.cpp
   file.cpp
+  liblog_symbols.cpp
   logging.cpp
   mapped_file.cpp
   parsenetaddress.cpp
@@ -169,16 +171,14 @@
 libbase = compile(expand("core/base", basefiles), "-DADB_HOST=1 
-Icore/base/include -Icore/include")
 
 logfiles = %w(
-  fake_log_device.cpp
-  fake_writer.cpp
   log_event_list.cpp
   log_event_write.cpp
-  logger_lock.cpp
   logger_name.cpp
   logger_write.cpp
   logprint.cpp
+  properties.cpp
 )
-liblog = compile(expand("core/liblog", logfiles), "-DLIBLOG_LOG_TAG=1006 
-D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include")
+liblog = compile(expand("core/liblog", logfiles), "-DLIBLOG_LOG_TAG=1006 
-D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include 
-Icore/base/include")
 
 cutilsfiles = %w(
   android_get_control_file.cpp
@@ -307,12 +307,11 @@
   debug.c
   ebitmap.c
   expand.c
-  genbools.c
-  genusers.c
   hashtab.c
   hierarchy.c
   kernel_to_common.c
   mls.c
+  optimize.c
   policydb.c
   policydb_convert.c
   policydb_public.c

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2019-12-06 Thread Anatol Pomozov via arch-commits

Date: Saturday, December 7, 2019 @ 06:49:14
  Author: anatolik
Revision: 536246

upgpkg: android-tools 29.0.5-2

protobuf 3.11 rebuild

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-12-07 06:29:07 UTC (rev 536245)
+++ PKGBUILD2019-12-07 06:49:14 UTC (rev 536246)
@@ -4,7 +4,7 @@
 
 pkgname=android-tools
 pkgver=29.0.5
-pkgrel=1
+pkgrel=2
 tag=platform-tools-$pkgver
 pkgdesc='Android platform tools'
 arch=(x86_64)

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2019-11-02 Thread Anatol Pomozov via arch-commits

Date: Saturday, November 2, 2019 @ 23:34:10
  Author: anatolik
Revision: 522400

Replace tab with spaces

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-02 23:22:10 UTC (rev 522399)
+++ PKGBUILD2019-11-02 23:34:10 UTC (rev 522400)
@@ -19,8 +19,8 @@
 conflicts=(fastboot adb)
 _boringssl_commit=$(curl 
https://android.googlesource.com/platform/external/boringssl/+/refs/tags/$tag/BORINGSSL_REVISION?format=TEXT
 | base64 -d)
 source=(git+https://android.googlesource.com/platform/frameworks/base#tag=$tag
-   git+https://android.googlesource.com/platform/frameworks/native#tag=$tag
-   git+https://android.googlesource.com/platform/system/core#tag=$tag
+
git+https://android.googlesource.com/platform/frameworks/native#tag=$tag
+git+https://android.googlesource.com/platform/system/core#tag=$tag
 git+https://android.googlesource.com/platform/system/extras#tag=$tag
 
git+https://android.googlesource.com/platform/system/tools/mkbootimg#tag=$tag
 git+https://android.googlesource.com/platform/external/selinux#tag=$tag
@@ -40,7 +40,7 @@
 #   lunch full-eng
 #   mmm system/core/adb/
 #   cp ./target/product/generic/system/framework/deployagent.jar .
-   deployagent.jar
+deployagent.jar
 fix_build_core.patch
 bash_completion.fastboot)
 # Bash completion file was taken from 
https://github.com/mbrubeck/android-completion

[arch-commits] Commit in android-tools/trunk (PKGBUILD fix_build_core.patch)

2019-10-13 Thread Anatol Pomozov via arch-commits

Date: Sunday, October 13, 2019 @ 16:12:13
  Author: anatolik
Revision: 515322

upgpkg: android-tools 29.0.4-2

FS#63370: reapply patch from upstream. It turned out platform-tools-29.0.4 tag 
does not contain the fix.

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/fix_build_core.patch

--+
 PKGBUILD |7 +--
 fix_build_core.patch |   21 +
 2 files changed, 22 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-13 16:06:27 UTC (rev 515321)
+++ PKGBUILD2019-10-13 16:12:13 UTC (rev 515322)
@@ -4,7 +4,7 @@
 
 pkgname=android-tools
 pkgver=29.0.4
-pkgrel=1
+pkgrel=2
 tag=platform-tools-$pkgver
 pkgdesc='Android platform tools'
 arch=(x86_64)
@@ -27,6 +27,7 @@
 
git+https://boringssl.googlesource.com/boringssl#commit=$_boringssl_commit
 generate_build.rb
 fix_build_core.patch
+fix_sparse_img.patch
 bash_completion.fastboot)
 # Bash completion file was taken from 
https://github.com/mbrubeck/android-completion
 sha1sums=('SKIP'
@@ -38,7 +39,8 @@
   'SKIP'
   'SKIP'
   'afca7974ad8658e52fd028ead12ad0a959d63273'
-  '6f3d6ca9112b0f2b3049febb46cf311ddc883567'
+  '9d35e4e9c4d1064783f3b1edaae0a2fae49493a4'
+  '2b57a4cf8012473c1a4fc6adae16573756272b02'
   '7004dbd0c193668827174880de6f8434de8ceaee')
 
 prepare() {
@@ -46,6 +48,7 @@
 
   cd "$srcdir"/core
   patch -p1 < ../fix_build_core.patch
+  patch -p1 < ../fix_sparse_img.patch # FS#63370
 
   cd "$srcdir"/avb
   sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' avbtool

Modified: fix_build_core.patch
===
--- fix_build_core.patch2019-10-13 16:06:27 UTC (rev 515321)
+++ fix_build_core.patch2019-10-13 16:12:13 UTC (rev 515322)
@@ -1,5 +1,5 @@
 diff --git a/adb/adb.cpp b/adb/adb.cpp
-index 24d4292d02..e4ad76b7c3 100644
+index 098ed38f30..d0b2e87e7c 100644
 --- a/adb/adb.cpp
 +++ b/adb/adb.cpp
 @@ -44,8 +44,6 @@
@@ -40,10 +40,10 @@
  usb_init();
  } else {
 diff --git a/adb/client/usb_libusb.cpp b/adb/client/usb_libusb.cpp
-index 53f01a0ce5..5be0d91085 100644
+index 53f01a0ce5..b4c3aadc28 100644
 --- a/adb/client/usb_libusb.cpp
 +++ b/adb/client/usb_libusb.cpp
-@@ -30,7 +31,7 @@
+@@ -30,7 +30,7 @@
  #include 
  #include 
  
@@ -53,7 +53,7 @@
  #include 
  #include 
 diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
-index 8923f409df..d245a577ff 100644
+index 8923f409df..5cadb9649b 100644
 --- a/fastboot/fastboot.cpp
 +++ b/fastboot/fastboot.cpp
 @@ -58,9 +58,7 @@
@@ -88,3 +88,16 @@
  std::vector mke2fs_args = {mke2fs_path.c_str(), "-t", 
"ext4", "-b"};
  
  std::string block_size_str = std::to_string(block_size);
+diff --git a/libcutils/include/cutils/threads.h 
b/libcutils/include/cutils/threads.h
+index ba4846e33b..f3fccc4895 100644
+--- a/libcutils/include/cutils/threads.h
 b/libcutils/include/cutils/threads.h
+@@ -33,8 +33,6 @@ extern "C" {
+ // Deprecated: use android::base::GetThreadId instead, which doesn't truncate 
on Mac/Windows.
+ //
+ 
+-extern pid_t gettid();
+-
+ //
+ // Deprecated: use `_Thread_local` in C or `thread_local` in C++.
+ //

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2019-09-30 Thread Anatol Pomozov via arch-commits

Date: Monday, September 30, 2019 @ 19:31:03
  Author: anatolik
Revision: 512281

upgpkg: android-tools 29.0.4-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-30 19:30:57 UTC (rev 512280)
+++ PKGBUILD2019-09-30 19:31:03 UTC (rev 512281)
@@ -3,8 +3,8 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=29.0.3
-pkgrel=2
+pkgver=29.0.4
+pkgrel=1
 tag=platform-tools-$pkgver
 pkgdesc='Android platform tools'
 arch=(x86_64)
@@ -27,7 +27,6 @@
 
git+https://boringssl.googlesource.com/boringssl#commit=$_boringssl_commit
 generate_build.rb
 fix_build_core.patch
-fix_sparse_img.patch
 bash_completion.fastboot)
 # Bash completion file was taken from 
https://github.com/mbrubeck/android-completion
 sha1sums=('SKIP'
@@ -40,7 +39,6 @@
   'SKIP'
   'afca7974ad8658e52fd028ead12ad0a959d63273'
   '6f3d6ca9112b0f2b3049febb46cf311ddc883567'
-  '2b57a4cf8012473c1a4fc6adae16573756272b02'
   '7004dbd0c193668827174880de6f8434de8ceaee')
 
 prepare() {
@@ -48,7 +46,6 @@
 
   cd "$srcdir"/core
   patch -p1 < ../fix_build_core.patch
-  patch -p1 < ../fix_sparse_img.patch # FS#63370
 
   cd "$srcdir"/avb
   sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' avbtool

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2019-09-18 Thread Anatol Pomozov via arch-commits

Date: Thursday, September 19, 2019 @ 04:19:59
  Author: anatolik
Revision: 511131

FS#63712: add python2 as an optional dependency

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-19 04:04:24 UTC (rev 511130)
+++ PKGBUILD2019-09-19 04:19:59 UTC (rev 511131)
@@ -11,7 +11,8 @@
 url='http://tools.android.com/'
 license=(Apache MIT)
 depends=(pcre2 libusb)
-optdepends=('python: for mkbootimg script')
+optdepends=('python: for mkbootimg script'
+'python2: for unpack_bootimg & avbtool scripts')
 makedepends=(git clang gtest ruby cmake ninja go-pie)
 provides=(fastboot adb)
 conflicts=(fastboot adb)

[arch-commits] Commit in android-tools/trunk (PKGBUILD fix_build_core.patch)

2019-09-18 Thread Anatol Pomozov via arch-commits

Date: Wednesday, September 18, 2019 @ 18:31:09
  Author: anatolik
Revision: 511091

Use pkgrel for adb/fastboot version, drop useless distro suffix

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/fix_build_core.patch

--+
 PKGBUILD |4 ++--
 fix_build_core.patch |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-18 18:28:10 UTC (rev 511090)
+++ PKGBUILD2019-09-18 18:31:09 UTC (rev 511091)
@@ -38,12 +38,12 @@
   'SKIP'
   'SKIP'
   'afca7974ad8658e52fd028ead12ad0a959d63273'
-  'e7f02cd6529dad54b4bdfd35e34b2cb9cb70cdd4'
+  '6f3d6ca9112b0f2b3049febb46cf311ddc883567'
   '2b57a4cf8012473c1a4fc6adae16573756272b02'
   '7004dbd0c193668827174880de6f8434de8ceaee')
 
 prepare() {
-  PLATFORM_TOOLS_VERSION="$pkgver" LDFLAGS='-Wl,-z,relro,-z,now' 
./generate_build.rb > build.ninja
+  PLATFORM_TOOLS_VERSION="$pkgver-$pkgrel" LDFLAGS='-Wl,-z,relro,-z,now' 
./generate_build.rb > build.ninja
 
   cd "$srcdir"/core
   patch -p1 < ../fix_build_core.patch

Modified: fix_build_core.patch
===
--- fix_build_core.patch2019-09-18 18:28:10 UTC (rev 511090)
+++ fix_build_core.patch2019-09-18 18:31:09 UTC (rev 511091)
@@ -16,7 +16,7 @@
  return android::base::StringPrintf(
  "Android Debug Bridge version %d.%d.%d\n"
 -"Version %s-%s\n"
-+"Version %s-ArchLinux\n"
++"Version %s\n"
  "Installed as %s\n",
  ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION,
 -PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str(),
@@ -71,7 +71,7 @@
  setvbuf(stderr, nullptr, _IONBF, 0);
  } else if (name == "version") {
 -fprintf(stdout, "fastboot version %s-%s\n", 
PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str());
-+fprintf(stdout, "fastboot version %s-ArchLinux\n", 
PLATFORM_TOOLS_VERSION);
++fprintf(stdout, "fastboot version %s\n", 
PLATFORM_TOOLS_VERSION);
  fprintf(stdout, "Installed as %s\n", 
android::base::GetExecutablePath().c_str());
  return 0;
  #if !defined(_WIN32)

[arch-commits] Commit in android-tools/trunk (PKGBUILD fix_sparse_img.patch)

2019-09-18 Thread Anatol Pomozov via arch-commits

Date: Wednesday, September 18, 2019 @ 17:36:39
  Author: anatolik
Revision: 511081

upgpkg: android-tools 29.0.3-2

FS#63370: fix a crash with flashing sparse images

Added:
  android-tools/trunk/fix_sparse_img.patch
Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 fix_sparse_img.patch |   38 ++
 2 files changed, 42 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-18 17:35:28 UTC (rev 511080)
+++ PKGBUILD2019-09-18 17:36:39 UTC (rev 511081)
@@ -4,7 +4,7 @@
 
 pkgname=android-tools
 pkgver=29.0.3
-pkgrel=1
+pkgrel=2
 tag=platform-tools-$pkgver
 pkgdesc='Android platform tools'
 arch=(x86_64)
@@ -26,6 +26,7 @@
 
git+https://boringssl.googlesource.com/boringssl#commit=$_boringssl_commit
 generate_build.rb
 fix_build_core.patch
+fix_sparse_img.patch
 bash_completion.fastboot)
 # Bash completion file was taken from 
https://github.com/mbrubeck/android-completion
 sha1sums=('SKIP'
@@ -38,6 +39,7 @@
   'SKIP'
   'afca7974ad8658e52fd028ead12ad0a959d63273'
   'e7f02cd6529dad54b4bdfd35e34b2cb9cb70cdd4'
+  '2b57a4cf8012473c1a4fc6adae16573756272b02'
   '7004dbd0c193668827174880de6f8434de8ceaee')
 
 prepare() {
@@ -45,6 +47,7 @@
 
   cd "$srcdir"/core
   patch -p1 < ../fix_build_core.patch
+  patch -p1 < ../fix_sparse_img.patch # FS#63370
 
   cd "$srcdir"/avb
   sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' avbtool

Added: fix_sparse_img.patch
===
--- fix_sparse_img.patch(rev 0)
+++ fix_sparse_img.patch2019-09-18 17:36:39 UTC (rev 511081)
@@ -0,0 +1,38 @@
+commit fbb9535aaea5ae4011f3c3edf4c00b27452f57ec
+Author: Tom Cherry 
+Date:   Tue Sep 17 13:34:04 2019 -0700
+
+fastboot: don't use sparse_file_import_auto() in load_buf_fd()
+
+load_buf_fd() attempts to find the size of the file that it is about
+to load by first calling sparse_file_import_auto() then using
+sparse_file_len() upon success or falling back to the file size on the
+filesystem on failure.
+
+This is problematic however as sparse_file_import_auto() creates a
+sparse_file out of the normal file, but does not resparse it, so an
+assertion fails during the sparse_file_len() call.
+
+This is fixed by using sparse_file_import() instead.  This will fail
+in the case that the file is not sparse and the call to
+sparse_file_len() will be properly skipped.
+
+Bug: 140538105
+Test: flash blueline factory image with assertions enabled in
+  libsparse/sparse.cpp
+
+Change-Id: I0283be33563a3301ce5b09bde41105a20f91086c
+
+diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
+index 4737ae4d66..a7fc628c43 100644
+--- a/fastboot/fastboot.cpp
 b/fastboot/fastboot.cpp
+@@ -874,7 +874,7 @@ static bool load_buf_fd(int fd, struct fastboot_buffer* 
buf) {
+ return false;
+ }
+ 
+-if (sparse_file* s = sparse_file_import_auto(fd, false, false)) {
++if (sparse_file* s = sparse_file_import(fd, false, false)) {
+ buf->image_size = sparse_file_len(s, false, false);
+ sparse_file_destroy(s);
+ } else {

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2019-08-30 Thread Filipe Laíns via arch-commits

Date: Friday, August 30, 2019 @ 07:54:42
  Author: ffy00
Revision: 505182

fix wrong python version in unpack_bootimg (29.0.2-2)

Fixes FS#63572

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-30 07:51:40 UTC (rev 505181)
+++ PKGBUILD2019-08-30 07:54:42 UTC (rev 505182)
@@ -4,7 +4,7 @@
 
 pkgname=android-tools
 pkgver=29.0.2
-pkgrel=1
+pkgrel=2
 tag=platform-tools-$pkgver
 pkgdesc='Android platform tools'
 arch=(x86_64)
@@ -54,6 +54,9 @@
   cd "$srcdir"/avb
   sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' avbtool
 
+  cd "$srcdir"/mkbootimg
+  sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' unpack_bootimg.py
+
   mkdir -p "$srcdir"/boringssl/build && cd "$srcdir"/boringssl/build && cmake 
-GNinja ..; ninja crypto/libcrypto.a
 }

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2019-08-30 Thread Filipe Laíns via arch-commits

Date: Friday, August 30, 2019 @ 07:47:00
  Author: ffy00
Revision: 505169

quote $srcdir and replace `` with $()

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-30 06:51:40 UTC (rev 505168)
+++ PKGBUILD2019-08-30 07:47:00 UTC (rev 505169)
@@ -15,7 +15,7 @@
 makedepends=(git clang gtest ruby cmake ninja go-pie)
 provides=(fastboot adb)
 conflicts=(fastboot adb)
-_boringssl_commit=`curl 
https://android.googlesource.com/platform/external/boringssl/+/refs/tags/$tag/BORINGSSL_REVISION?format=TEXT
 | base64 -d`
+_boringssl_commit=$(curl 
https://android.googlesource.com/platform/external/boringssl/+/refs/tags/$tag/BORINGSSL_REVISION?format=TEXT
 | base64 -d)
 source=(git+https://android.googlesource.com/platform/system/core#tag=$tag
 git+https://android.googlesource.com/platform/system/extras#tag=$tag
 
git+https://android.googlesource.com/platform/system/tools/mkbootimg#tag=$tag
@@ -45,16 +45,16 @@
 prepare() {
   PLATFORM_TOOLS_VERSION="$pkgver" LDFLAGS='-Wl,-z,relro,-z,now' 
./generate_build.rb > build.ninja
 
-  cd $srcdir/core
+  cd "$srcdir"/core
   patch -p1 < ../fix_build_core.patch
 
-  cd $srcdir/e2fsprogs
+  cd "$srcdir"/e2fsprogs
   patch -p1 < ../fix_build_e2fsprogs.patch
 
-  cd $srcdir/avb
+  cd "$srcdir"/avb
   sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' avbtool
 
-  mkdir -p $srcdir/boringssl/build && cd $srcdir/boringssl/build && cmake 
-GNinja ..; ninja crypto/libcrypto.a
+  mkdir -p "$srcdir"/boringssl/build && cd "$srcdir"/boringssl/build && cmake 
-GNinja ..; ninja crypto/libcrypto.a
 }
 
 build() {

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2019-08-15 Thread Anatol Pomozov via arch-commits

Date: Thursday, August 15, 2019 @ 18:11:42
  Author: anatolik
Revision: 499594

Build only library needed for android-tools compilation

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-15 18:11:36 UTC (rev 499593)
+++ PKGBUILD2019-08-15 18:11:42 UTC (rev 499594)
@@ -54,7 +54,7 @@
   cd $srcdir/avb
   sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' avbtool
 
-  mkdir -p $srcdir/boringssl/build && cd $srcdir/boringssl/build && cmake 
-GNinja ..; ninja
+  mkdir -p $srcdir/boringssl/build && cd $srcdir/boringssl/build && cmake 
-GNinja ..; ninja crypto/libcrypto.a
 }
 
 build() {

[arch-commits] Commit in android-tools/trunk (PKGBUILD generate_build.rb)

2019-08-10 Thread Anatol Pomozov via arch-commits

Date: Saturday, August 10, 2019 @ 18:53:10
  Author: anatolik
Revision: 498702

Remove unneeded include path

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/generate_build.rb

---+
 PKGBUILD  |2 +-
 generate_build.rb |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-10 18:39:18 UTC (rev 498701)
+++ PKGBUILD2019-08-10 18:53:10 UTC (rev 498702)
@@ -66,7 +66,7 @@
   ninja
 }
 
-package(){
+package() {
   install -m755 -d "$pkgdir"/usr/bin
   install -m755 -t "$pkgdir"/usr/bin fastboot adb mke2fs.android e2fsdroid 
ext2simg avb/avbtool
   install -Dm 755 mkbootimg/mkbootimg.py "$pkgdir"/usr/bin/mkbootimg

Modified: generate_build.rb
===
--- generate_build.rb   2019-08-10 18:39:18 UTC (rev 498701)
+++ generate_build.rb   2019-08-10 18:53:10 UTC (rev 498702)
@@ -176,7 +176,7 @@
   main.cpp
   fastboot_driver.cpp
 )
-libfastboot = compile(expand("core/fastboot", fastbootfiles), 
'-DPLATFORM_TOOLS_VERSION="\"$PLATFORM_TOOLS_VERSION\"" -D_GNU_SOURCE 
-D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb 
-Icore/libsparse/include -Imkbootimg/include/bootimg 
-Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include 
-Imkbootimg/include/bootimg/include/bootimg -Icore/fs_mgr/liblp/include 
-Icore/diagnose_usb/include')
+libfastboot = compile(expand("core/fastboot", fastbootfiles), 
'-DPLATFORM_TOOLS_VERSION="\"$PLATFORM_TOOLS_VERSION\"" -D_GNU_SOURCE 
-D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb 
-Icore/libsparse/include -Imkbootimg/include/bootimg 
-Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include 
-Icore/fs_mgr/liblp/include -Icore/diagnose_usb/include')
 
 fsmgrfiles = %w(
   liblp/reader.cpp

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2019-07-18 Thread Anatol Pomozov via arch-commits

Date: Friday, July 19, 2019 @ 00:16:54
  Author: anatolik
Revision: 491960

Calculate boringssl version dynamically

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-18 23:54:44 UTC (rev 491959)
+++ PKGBUILD2019-07-19 00:16:54 UTC (rev 491960)
@@ -14,8 +14,7 @@
 makedepends=(git clang gtest ruby cmake ninja go-pie)
 provides=(fastboot adb)
 conflicts=(fastboot adb)
-# keep the boringssl commit in sync with android tree 
https://android.googlesource.com/platform/external/boringssl/+/$pkgver/BORINGSSL_REVISION
-_boringssl_commit=45210dd4e21ace9d28cb76b3f83303fcdd2efcce
+_boringssl_commit=`curl 
https://android.googlesource.com/platform/external/boringssl/+/refs/tags/android-$pkgver/BORINGSSL_REVISION?format=TEXT
 | base64 -d`
 
source=(git+https://android.googlesource.com/platform/system/core#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/system/extras#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/external/selinux#tag=android-$pkgver

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2019-07-18 Thread Anatol Pomozov via arch-commits

Date: Thursday, July 18, 2019 @ 23:48:36
  Author: anatolik
Revision: 491955

FS#63200: use Android SDK version for the tools

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-18 21:42:20 UTC (rev 491954)
+++ PKGBUILD2019-07-18 23:48:36 UTC (rev 491955)
@@ -3,7 +3,7 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=9.0.0_r41
+pkgver=9.0.0_r45
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(x86_64)
@@ -43,7 +43,9 @@
   '7004dbd0c193668827174880de6f8434de8ceaee')
 
 prepare() {
-  PKGVER=$pkgver LDFLAGS='-Wl,-z,relro,-z,now' ./generate_build.rb > 
build.ninja
+  # for the Android version calculation see FS#63200
+  android_sdk_ver=`curl 
https://android.googlesource.com/platform/development/+/refs/tags/android-$pkgver/sdk/plat_tools_source.prop_template?format=TEXT
 | base64 -d | sed -n 's/^Pkg.Revision=\(.*\)$/\1/p'`
+  PKGVER="$android_sdk_ver-$pkgver" LDFLAGS='-Wl,-z,relro,-z,now' 
./generate_build.rb > build.ninja
 
   cd $srcdir/core
   patch -p1 < ../fix_build_core.patch

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2019-06-05 Thread Filipe Laíns via arch-commits

Date: Wednesday, June 5, 2019 @ 21:59:49
  Author: ffy00
Revision: 477250

upgpkg: android-tools 9.0.0_r41-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-05 21:54:24 UTC (rev 477249)
+++ PKGBUILD2019-06-05 21:59:49 UTC (rev 477250)
@@ -3,7 +3,7 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=9.0.0_r35
+pkgver=9.0.0_r41
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(x86_64)

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2019-06-03 Thread Filipe Laíns via arch-commits

Date: Monday, June 3, 2019 @ 20:59:33
  Author: ffy00
Revision: 476773

add fastboot and adb to provides

Up to now it wasn't really clear what package provided fastboot and adb, users 
would
end up going to the wiki just to find this out. This patch just enables pacman 
to
resolve requests where it is asked to install fastboot/adb.

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 ++
 1 file changed, 2 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-03 20:59:02 UTC (rev 476772)
+++ PKGBUILD2019-06-03 20:59:33 UTC (rev 476773)
@@ -12,6 +12,8 @@
 depends=(pcre2 libusb)
 optdepends=('python: for mkbootimg script')
 makedepends=(git clang gtest ruby cmake ninja go-pie)
+provides=(fastboot adb)
+conflicts=(fastboot adb)
 # keep the boringssl commit in sync with android tree 
https://android.googlesource.com/platform/external/boringssl/+/$pkgver/BORINGSSL_REVISION
 _boringssl_commit=45210dd4e21ace9d28cb76b3f83303fcdd2efcce
 
source=(git+https://android.googlesource.com/platform/system/core#tag=android-$pkgver

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2019-04-23 Thread Anatol Pomozov via arch-commits

Date: Tuesday, April 23, 2019 @ 22:21:17
  Author: anatolik
Revision: 453254

upgpkg: android-tools 9.0.0_r35-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-23 22:16:12 UTC (rev 453253)
+++ PKGBUILD2019-04-23 22:21:17 UTC (rev 453254)
@@ -3,8 +3,8 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=9.0.0_r30
-pkgrel=2
+pkgver=9.0.0_r35
+pkgrel=1
 pkgdesc='Android platform tools'
 arch=(x86_64)
 url='http://tools.android.com/'

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2019-01-24 Thread Anatol Pomozov via arch-commits

Date: Friday, January 25, 2019 @ 00:37:34
  Author: anatolik
Revision: 427677

upgpkg: android-tools 9.0.0_r30-2

Golang 1.11.5 secuity rebuild

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-25 00:14:38 UTC (rev 427676)
+++ PKGBUILD2019-01-25 00:37:34 UTC (rev 427677)
@@ -4,7 +4,7 @@
 
 pkgname=android-tools
 pkgver=9.0.0_r30
-pkgrel=1
+pkgrel=2
 pkgdesc='Android platform tools'
 arch=(x86_64)
 url='http://tools.android.com/'

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2019-01-19 Thread Anatol Pomozov via arch-commits

Date: Saturday, January 19, 2019 @ 20:26:28
  Author: anatolik
Revision: 424856

Add avbtool, enable RELRO for the binaries

Bump to the latest Android tag

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-19 19:03:18 UTC (rev 424855)
+++ PKGBUILD2019-01-19 20:26:28 UTC (rev 424856)
@@ -3,7 +3,7 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=9.0.0_r18
+pkgver=9.0.0_r30
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(x86_64)
@@ -19,6 +19,7 @@
 
git+https://android.googlesource.com/platform/external/selinux#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/external/f2fs-tools#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/external/e2fsprogs#tag=android-$pkgver
+
git+https://android.googlesource.com/platform/external/avb#tag=android-$pkgver
 
git+https://boringssl.googlesource.com/boringssl#commit=$_boringssl_commit
 generate_build.rb
 fix_build_core.patch
@@ -32,6 +33,7 @@
   'SKIP'
   'SKIP'
   'SKIP'
+  'SKIP'
   '238507086a99134820cc9900545cbff06772dc30'
   '62446582a96b3a39e5d91e3e2ef8b8b38a5a735e'
   'ec473160d7445f97bccabd1c32ac0ae2f77900c1'
@@ -39,7 +41,7 @@
   '7004dbd0c193668827174880de6f8434de8ceaee')
 
 prepare() {
-  PKGVER=$pkgver ./generate_build.rb > build.ninja
+  PKGVER=$pkgver LDFLAGS='-Wl,-z,relro,-z,now' ./generate_build.rb > 
build.ninja
 
   cd $srcdir/core
   patch -p1 < ../fix_build_core.patch
@@ -50,6 +52,9 @@
   cd $srcdir/e2fsprogs
   patch -p1 < ../fix_build_e2fsprogs.patch
 
+  cd $srcdir/avb
+  sed -i 's|/usr/bin/env python$|/usr/bin/env python2|g' avbtool
+
   mkdir -p $srcdir/boringssl/build && cd $srcdir/boringssl/build && cmake 
-GNinja ..; ninja
 }
 
@@ -59,6 +64,6 @@
 
 package(){
   install -m755 -d "$pkgdir"/usr/bin
-  install -m755 -t "$pkgdir"/usr/bin fastboot adb mke2fs.android e2fsdroid 
ext2simg core/mkbootimg/mkbootimg
+  install -m755 -t "$pkgdir"/usr/bin fastboot adb mke2fs.android e2fsdroid 
ext2simg core/mkbootimg/mkbootimg avb/avbtool
   install -Dm 644 bash_completion.fastboot 
"$pkgdir"/usr/share/bash-completion/completions/fastboot
 }

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2018-12-01 Thread Anatol Pomozov via arch-commits

Date: Saturday, December 1, 2018 @ 16:43:49
  Author: anatolik
Revision: 410703

upgpkg: android-tools 9.0.0_r18-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-01 16:33:48 UTC (rev 410702)
+++ PKGBUILD2018-12-01 16:43:49 UTC (rev 410703)
@@ -3,7 +3,7 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=9.0.0_r3
+pkgver=9.0.0_r18
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(x86_64)

[arch-commits] Commit in android-tools/trunk (PKGBUILD fix_build_e2fsprogs.patch)

2018-06-07 Thread Anatol Pomozov via arch-commits

Date: Thursday, June 7, 2018 @ 20:02:47
  Author: anatolik
Revision: 341893

upgpkg: android-tools 8.1.0_r33-1

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/fix_build_e2fsprogs.patch

---+
 PKGBUILD  |4 +--
 fix_build_e2fsprogs.patch |   49 
 2 files changed, 51 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-07 19:33:25 UTC (rev 341892)
+++ PKGBUILD2018-06-07 20:02:47 UTC (rev 341893)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=8.1.0_r7
+pkgver=8.1.0_r33
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(x86_64)
@@ -35,7 +35,7 @@
   '89c0b62805506c729f76c1aa3c901c4ea2e3bfbe'
   'e6ab688d0decfae64302d1402e1eee6678fc2549'
   'ec473160d7445f97bccabd1c32ac0ae2f77900c1'
-  '8ccb2ef791a5b517b4371af7f529f4e731ce7260'
+  'e0d19de229f1a41a066ddb7a84f8e56e67bbc8bc'
   '7004dbd0c193668827174880de6f8434de8ceaee')
 
 prepare() {

Modified: fix_build_e2fsprogs.patch
===
--- fix_build_e2fsprogs.patch   2018-06-07 19:33:25 UTC (rev 341892)
+++ fix_build_e2fsprogs.patch   2018-06-07 20:02:47 UTC (rev 341893)
@@ -1,3 +1,12 @@
+diff --git a/contrib/android/e2fsdroid.c b/contrib/android/e2fsdroid.c
+index f043822b..4d49bee4 100644
+--- a/contrib/android/e2fsdroid.c
 b/contrib/android/e2fsdroid.c
+@@ -1,3 +1,4 @@
++#define _GNU_SOURCE // for asprintf
+ #include 
+ #include 
+ #include 
 diff --git a/contrib/android/perms.c b/contrib/android/perms.c
 index 9ae8e586..433506fd 100644
 --- a/contrib/android/perms.c
@@ -41,3 +50,43 @@
  #else
  #ifdef __GNUC__
  #define _INLINE_ extern __inline__
+diff --git a/misc/create_inode.c b/misc/create_inode.c
+index 94c29b8d..6e59151c 100644
+--- a/misc/create_inode.c
 b/misc/create_inode.c
+@@ -403,7 +403,7 @@ static ssize_t my_pread(int fd, void *buf, size_t count, 
off_t offset)
+ }
+ #endif /* !defined HAVE_PREAD64 && !defined HAVE_PREAD */
+ 
+-static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file,
++static errcode_t e2_copy_file_range(ext2_filsys fs, int fd, ext2_file_t 
e2_file,
+off_t start, off_t end, char *buf,
+char *zerobuf)
+ {
+@@ -477,7 +477,7 @@ static errcode_t try_lseek_copy(ext2_filsys fs, int fd, 
struct stat *statbuf,
+ 
+   data_blk = data & ~(fs->blocksize - 1);
+   hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1);
+-  err = copy_file_range(fs, fd, e2_file, data_blk, hole_blk, buf,
++  err = e2_copy_file_range(fs, fd, e2_file, data_blk, hole_blk, 
buf,
+ zerobuf);
+   if (err)
+   return err;
+@@ -527,7 +527,7 @@ static errcode_t try_fiemap_copy(ext2_filsys fs, int fd, 
ext2_file_t e2_file,
+   }
+   for (i = 0, ext = ext_buf; i < fiemap_buf->fm_mapped_extents;
+i++, ext++) {
+-  err = copy_file_range(fs, fd, e2_file, ext->fe_logical,
++  err = e2_copy_file_range(fs, fd, e2_file, 
ext->fe_logical,
+ ext->fe_logical + ext->fe_length,
+ buf, zerobuf);
+   if (err)
+@@ -580,7 +580,7 @@ static errcode_t copy_file(ext2_filsys fs, int fd, struct 
stat *statbuf,
+   goto out;
+ #endif
+ 
+-  err = copy_file_range(fs, fd, e2_file, 0, statbuf->st_size, buf,
++  err = e2_copy_file_range(fs, fd, e2_file, 0, statbuf->st_size, buf,
+ zerobuf);
+ out:
+   ext2fs_free_mem();

[arch-commits] Commit in android-tools/trunk (PKGBUILD generate_build.rb)

2018-03-27 Thread Anatol Pomozov via arch-commits

Date: Tuesday, March 27, 2018 @ 17:45:55
  Author: anatolik
Revision: 312896

Format with rufo-0.3.0

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/generate_build.rb

---+
 PKGBUILD  |2 -
 generate_build.rb |   94 
 2 files changed, 45 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-27 17:02:21 UTC (rev 312895)
+++ PKGBUILD2018-03-27 17:45:55 UTC (rev 312896)
@@ -32,7 +32,7 @@
   'SKIP'
   'SKIP'
   'SKIP'
-  'caf4dd68f94e7c745b915778c3f33946c0478eae'
+  '89c0b62805506c729f76c1aa3c901c4ea2e3bfbe'
   'e6ab688d0decfae64302d1402e1eee6678fc2549'
   'ec473160d7445f97bccabd1c32ac0ae2f77900c1'
   '8ccb2ef791a5b517b4371af7f529f4e731ce7260'

Modified: generate_build.rb
===
--- generate_build.rb   2018-03-27 17:02:21 UTC (rev 312895)
+++ generate_build.rb   2018-03-27 17:45:55 UTC (rev 312896)
@@ -5,7 +5,7 @@
 # This script tries to mimic Android build rules.
 
 def expand(dir, files)
-  files.map{|f| File.join(dir,f)}
+  files.map { |f| File.join(dir, f) }
 end
 
 # Compiles sources to *.o files.
@@ -16,17 +16,17 @@
 ext = File.extname(s)
 
 case ext
-when '.c'
-  cc = 'cc'
-  lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
-when '.cpp', '.cc'
-  cc = 'cxx'
-  lang_flags = '-std=gnu++14 $CXXFLAGS $CPPFLAGS'
+when ".c"
+  cc = "cc"
+  lang_flags = "-std=gnu11 $CFLAGS $CPPFLAGS"
+when ".cpp", ".cc"
+  cc = "cxx"
+  lang_flags = "-std=gnu++14 $CXXFLAGS $CPPFLAGS"
 else
-raise "Unknown extension #{ext}"
+  raise "Unknown extension #{ext}"
 end
 
-output = s + '.o'
+output = s + ".o"
 outputs << output
 puts "build #{output}: #{cc} #{s}\ncflags = #{lang_flags} #{cflags}"
   end
@@ -38,24 +38,23 @@
 # lib - static library path relative to dir
 def subninja(dir, lib)
   puts "subninja #{dir}build.ninja"
-  return lib.each{|l| dir + l}
+  return lib.each { |l| dir + l }
 end
 
 # Links object files
 def link(output, objects, ldflags)
-  puts "build #{output}: link #{objects.join(' ')}\nldflags = #{ldflags} 
$LDFLAGS"
+  puts "build #{output}: link #{objects.join(" ")}\nldflags = #{ldflags} 
$LDFLAGS"
 end
 
 puts "# This set of commands generated by generate_build.rb script\n\n"
-puts "CC = #{ENV['CC'] || 'clang'}"
-puts "CXX = #{ENV['CXX'] || 'clang++'}\n\n"
-puts "CFLAGS = #{ENV['CFLAGS']}"
-puts "CXXFLAGS = #{ENV['CXXFLAGS']}"
-puts "LDFLAGS = #{ENV['LDFLAGS']}"
-puts "PKGVER = #{ENV['PKGVER']}\n\n"
+puts "CC = #{ENV["CC"] || "clang"}"
+puts "CXX = #{ENV["CXX"] || "clang++"}\n\n"
+puts "CFLAGS = #{ENV["CFLAGS"]}"
+puts "CXXFLAGS = #{ENV["CXXFLAGS"]}"
+puts "LDFLAGS = #{ENV["LDFLAGS"]}"
+puts "PKGVER = #{ENV["PKGVER"]}\n\n"
 
-
-puts """
+puts "" "
 rule cc
   command = $CC $cflags -c $in -o $out
 
@@ -66,7 +65,7 @@
   command = $CXX $ldflags $LDFLAGS $in -o $out
 
 
-"""
+" ""
 
 adbdfiles = %w(
   adb.cpp
@@ -85,7 +84,7 @@
   adb_auth_host.cpp
   shell_service_protocol.cpp
 )
-libadbd = compile(expand('core/adb', adbdfiles), '-DADB_VERSION="\"$PKGVER\"" 
-DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb 
-Icore/libcrypto_utils/include -Iboringssl/include')
+libadbd = compile(expand("core/adb", adbdfiles), '-DADB_VERSION="\"$PKGVER\"" 
-DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb 
-Icore/libcrypto_utils/include -Iboringssl/include')
 
 adbfiles = %w(
   console.cpp
@@ -102,7 +101,7 @@
   client/usb_libusb.cpp
   sysdeps/posix/network.cpp
 )
-libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 
-Icore/include -Icore/base/include -Icore/adb')
+libadb = compile(expand("core/adb", adbfiles), "-D_GNU_SOURCE -DADB_HOST=1 
-Icore/include -Icore/base/include -Icore/adb")
 
 basefiles = %w(
   file.cpp
@@ -113,7 +112,7 @@
   errors_unix.cpp
   test_utils.cpp
 )
-libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1 
-Icore/base/include -Icore/include')
+libbase = compile(expand("core/base", basefiles), "-DADB_HOST=1 
-Icore/base/include -Icore/include")
 
 logfiles = %w(
   log_event_write.c
@@ -129,7 +128,7 @@
   stderr_write.c
   logprint.c
 )
-liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1006 
-D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include')
+liblog = compile(expand("core/liblog", logfiles), "-DLIBLOG_LOG_TAG=1006 
-D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include")
 
 cutilsfiles = %w(
   load_file.c
@@ -144,25 +143,24 @@
   fs_config.cpp
   canned_fs_config.c
 )
-libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE 
-Icore/libcutils/include -Icore/include')
+libcutils = compile(expand("core/libcutils", cutilsfiles), "-D_GNU_SOURCE

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2017-10-15 Thread Anatol Pomozov

Date: Sunday, October 15, 2017 @ 19:10:52
  Author: anatolik
Revision: 262986

upgpkg: android-tools 8.0.0_r17-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-15 19:06:18 UTC (rev 262985)
+++ PKGBUILD2017-10-15 19:10:52 UTC (rev 262986)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=8.0.0_r11
+pkgver=8.0.0_r17
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@
 license=(Apache MIT)
 depends=(pcre2 libusb)
 optdepends=('python: for mkbootimg script')
-makedepends=(git clang gtest ruby cmake ninja go)
+makedepends=(git clang gtest ruby cmake ninja go-pie)
 _boringssl_commit=bbfe603519bc54fbc4c8dd87efe1ed385df550b4 # keep it in sync 
with android 
https://android.googlesource.com/platform/external/boringssl/+/$pkgver/BORINGSSL_REVISION
 
source=(git+https://android.googlesource.com/platform/system/core#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/system/extras#tag=android-$pkgver

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2017-09-18 Thread Anatol Pomozov

Date: Monday, September 18, 2017 @ 16:50:57
  Author: anatolik
Revision: 258759

upgpkg: android-tools 8.0.0_r11-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-18 15:18:47 UTC (rev 258758)
+++ PKGBUILD2017-09-18 16:50:57 UTC (rev 258759)
@@ -4,8 +4,8 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=8.0.0_r4
-pkgrel=2
+pkgver=8.0.0_r11
+pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
 url='http://tools.android.com/'

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2017-09-09 Thread Anatol Pomozov

Date: Sunday, September 10, 2017 @ 02:22:25
  Author: anatolik
Revision: 256718

FS#55565 build against pinned version of boringssl

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-10 01:35:30 UTC (rev 256717)
+++ PKGBUILD2017-09-10 02:22:25 UTC (rev 256718)
@@ -13,11 +13,12 @@
 depends=(pcre2 libusb)
 optdepends=('python: for mkbootimg script')
 makedepends=(git clang gtest ruby cmake ninja go)
+_boringssl_commit=bbfe603519bc54fbc4c8dd87efe1ed385df550b4 # keep it in sync 
with android 
https://android.googlesource.com/platform/external/boringssl/+/$pkgver/BORINGSSL_REVISION
 
source=(git+https://android.googlesource.com/platform/system/core#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/system/extras#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/external/selinux#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/external/f2fs-tools#tag=android-$pkgver
-git+https://boringssl.googlesource.com/boringssl
+
git+https://boringssl.googlesource.com/boringssl#commit=$_boringssl_commit
 generate_build.rb
 fix_build_core.patch
 fix_build_selinux.patch
@@ -42,7 +43,7 @@
   cd $srcdir/selinux
   patch -p1 < ../fix_build_selinux.patch
 
-  mkdir $srcdir/boringssl/build && cd $srcdir/boringssl/build && cmake -GNinja 
..; ninja
+  mkdir -p $srcdir/boringssl/build && cd $srcdir/boringssl/build && cmake 
-GNinja ..; ninja
 }
 
 build() {

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2017-09-08 Thread Anatol Pomozov

Date: Friday, September 8, 2017 @ 22:04:06
  Author: anatolik
Revision: 256453

upgpkg: android-tools 8.0.0_r4-2

Statically link against locally built BoringSSL

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-08 21:41:16 UTC (rev 256452)
+++ PKGBUILD2017-09-08 22:04:06 UTC (rev 256453)
@@ -5,7 +5,7 @@
 
 pkgname=android-tools
 pkgver=8.0.0_r4
-pkgrel=1
+pkgrel=2
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
 url='http://tools.android.com/'

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2017-08-28 Thread Anatol Pomozov

Date: Tuesday, August 29, 2017 @ 00:07:58
  Author: anatolik
Revision: 254699

boringssl build also requires Go

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-28 22:51:37 UTC (rev 254698)
+++ PKGBUILD2017-08-29 00:07:58 UTC (rev 254699)
@@ -12,7 +12,7 @@
 license=(Apache MIT)
 depends=(pcre2 libusb)
 optdepends=('python: for mkbootimg script')
-makedepends=(git clang gtest ruby cmake ninja)
+makedepends=(git clang gtest ruby cmake ninja go)
 
source=(git+https://android.googlesource.com/platform/system/core#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/system/extras#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/external/selinux#tag=android-$pkgver

[arch-commits] Commit in android-tools/trunk (PKGBUILD generate_build.rb)

2017-08-28 Thread Anatol Pomozov

Date: Monday, August 28, 2017 @ 20:53:33
  Author: anatolik
Revision: 254682

Build boringssl project from upstream

Currently Android tools are build against boringssl headers and linked with 
systems openssl
library. It is obviously wrong and we should follow Android practice of linking 
with boringssl.
Unfortunately boringssl from Android tree use *.bp files and there is no easy 
way to build just
boringssl library. So we build upstream boringssl using CMake and then 
statically link it with adb.

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/generate_build.rb

---+
 PKGBUILD  |   10 ++
 generate_build.rb |   38 ++
 2 files changed, 24 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-28 20:53:22 UTC (rev 254681)
+++ PKGBUILD2017-08-28 20:53:33 UTC (rev 254682)
@@ -10,14 +10,14 @@
 arch=(i686 x86_64)
 url='http://tools.android.com/'
 license=(Apache MIT)
-depends=(pcre2 libusb ruby ninja)
+depends=(pcre2 libusb)
 optdepends=('python: for mkbootimg script')
-makedepends=(git clang gtest)
+makedepends=(git clang gtest ruby cmake ninja)
 
source=(git+https://android.googlesource.com/platform/system/core#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/system/extras#tag=android-$pkgver
-
git+https://android.googlesource.com/platform/external/boringssl#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/external/selinux#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/external/f2fs-tools#tag=android-$pkgver
+git+https://boringssl.googlesource.com/boringssl
 generate_build.rb
 fix_build_core.patch
 fix_build_selinux.patch
@@ -28,7 +28,7 @@
   'SKIP'
   'SKIP'
   'SKIP'
-  '578973cebe0a496bf5e83d2c6dd2c29d283637e7'
+  '12b6bc1cbf850958850c3e4a5bc19d8b32f845b9'
   '45e41bab3633bb0be96b238aae3164a5c90721f1'
   'ec473160d7445f97bccabd1c32ac0ae2f77900c1'
   '7004dbd0c193668827174880de6f8434de8ceaee')
@@ -41,6 +41,8 @@
 
   cd $srcdir/selinux
   patch -p1 < ../fix_build_selinux.patch
+
+  mkdir $srcdir/boringssl/build && cd $srcdir/boringssl/build && cmake -GNinja 
..; ninja
 }
 
 build() {

Modified: generate_build.rb
===
--- generate_build.rb   2017-08-28 20:53:22 UTC (rev 254681)
+++ generate_build.rb   2017-08-28 20:53:33 UTC (rev 254682)
@@ -17,11 +17,11 @@
 
 case ext
 when '.c'
-cc = 'cc'
-   lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
+  cc = 'cc'
+  lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
 when '.cpp', '.cc'
-cc = 'cxx'
-   lang_flags = '-std=gnu++14 $CXXFLAGS $CPPFLAGS'
+  cc = 'cxx'
+  lang_flags = '-std=gnu++14 $CXXFLAGS $CPPFLAGS'
 else
 raise "Unknown extension #{ext}"
 end
@@ -34,6 +34,13 @@
   return outputs
 end
 
+# dir - directory where ninja file is located
+# lib - static library path relative to dir
+def subninja(dir, lib)
+  puts "subninja #{dir}build.ninja"
+  return lib.each{|l| dir + l}
+end
+
 # Links object files
 def link(output, objects, ldflags)
   puts "build #{output}: link #{objects.join(' ')}\nldflags = #{ldflags} 
$LDFLAGS"
@@ -120,7 +127,7 @@
   stderr_write.c
   logprint.c
 )
-liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1006 
-DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include')
+liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1006 
-D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include')
 
 cutilsfiles = %w(
   load_file.c
@@ -141,27 +148,18 @@
 )
 libdiagnoseusb = compile(expand('core/adb', diagnoseusbfiles), '-Icore/include 
-Icore/base/include')
 
-
 libcryptofiles = %w(
   android_pubkey.c
 )
 libcrypto = compile(expand('core/libcrypto_utils', libcryptofiles), 
'-Icore/libcrypto_utils/include -Iboringssl/include')
 
-boringsslfiles = %w(
-  crypto/bn/convert.c
-  crypto/bn/bn.c
-  crypto/bio/file.c
-  crypto/bytestring/cbb.c
-  crypto/buf/buf.c
-  crypto/mem.c
-  crypto/base64/base64.c
-)
-boringssl = compile(expand('boringssl/src', boringsslfiles), 
'-DBORINGSSL_ANDROID_SYSTEM -DOPENSSL_SMALL -DBORINGSSL_IMPLEMENTATION 
-Iboringssl/include')
+# TODO: make subninja working
+#boringssl = subninja('boringssl/build/', ['crypto/libcrypto.a'])
+boringssl = ['boringssl/build/crypto/libcrypto.a']
 
+link('adb', libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb + 
libcrypto + boringssl, '-lpthread -lusb-1.0')
 
-link('adb', libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb + 
libcrypto + boringssl, '-lpthread -lcrypto -lusb-1.0')
 
-
 fastbootfiles = %w(
   protocol.cpp
   engine.cpp
@@ -174,7 +172,7 @@
   tcp.cpp
   udp.cpp
 )
-libfastboot = compile(expand('core/fastboot',

[arch-commits] Commit in android-tools/trunk (PKGBUILD build.sh generate_build.rb)

2017-07-23 Thread Anatol Pomozov

Date: Sunday, July 23, 2017 @ 23:14:35
  Author: anatolik
Revision: 246157

Use $CC and $CXX envvars instead of hardcoded compiler name

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/build.sh
  android-tools/trunk/generate_build.rb

---+
 PKGBUILD  |4 -
 build.sh  |  176 ++--
 generate_build.rb |6 -
 3 files changed, 93 insertions(+), 93 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-23 22:46:55 UTC (rev 246156)
+++ PKGBUILD2017-07-23 23:14:35 UTC (rev 246157)
@@ -26,7 +26,7 @@
   'SKIP'
   'SKIP'
   'SKIP'
-  '524e3a1768d4386c31436210c6798a06ec636203'
+  '0a77f23fbbbe25048b228130fd2d290e8d9a1d55'
   '33538c9161c199f1e608d3b8f519adb1cd9d46d5'
   '7004dbd0c193668827174880de6f8434de8ceaee'
   '2e69152091bb9642be058e49ec6cb720a2fd91dc'
@@ -39,7 +39,7 @@
 }
 
 build() {
-  PKGVER=$pkgver sh ./build.sh
+  PKGVER=$pkgver CC=clang CXX=clang++ ./build.sh
 }
 
 package(){

Modified: build.sh
===
--- build.sh2017-07-23 22:46:55 UTC (rev 246156)
+++ build.sh2017-07-23 23:14:35 UTC (rev 246157)
@@ -1,90 +1,90 @@
 # This set of commands generated by generate_build.rb script
 
-clang++ -o core/adb/adb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/adb.cpp
-clang++ -o core/adb/adb_auth.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/adb_auth.cpp
-clang++ -o core/adb/adb_io.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/adb_io.cpp
-clang++ -o core/adb/adb_listeners.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/adb_listeners.cpp
-clang++ -o core/adb/adb_trace.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/adb_trace.cpp
-clang++ -o core/adb/adb_utils.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/adb_utils.cpp
-clang++ -o core/adb/bugreport.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/bugreport.cpp
-clang++ -o core/adb/line_printer.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/line_printer.cpp
-clang++ -o core/adb/sockets.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/sockets.cpp
-clang++ -o core/adb/transport.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/transport.cpp
-clang++ -o core/adb/transport_local.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/transport_local.cpp
-clang++ -o core/adb/transport_usb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/transport_usb.cpp
-clang++ -o core/adb/sysdeps_unix.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/sysdeps_unix.cpp
-clang++ -o core/adb/fdevent.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/fdevent.cpp
-clang++ -o core/adb/get_my_path_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/get_my_path_linux.cpp
-clang++ -o core/adb/usb_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/usb_linux.cpp
-clang++ -o core/adb/adb_auth_host.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/adb_auth_host.cpp
-clang++ -o core/adb/shell_service_protocol.cpp.o -std=gnu++14 $CXXFLAGS 
$CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c

[arch-commits] Commit in android-tools/trunk (PKGBUILD build.sh generate_build.rb)

2017-07-17 Thread Anatol Pomozov

Date: Monday, July 17, 2017 @ 23:50:08
  Author: anatolik
Revision: 245524

upgpkg: android-tools 7.1.2_r27-1

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/build.sh
  android-tools/trunk/generate_build.rb

---+
 PKGBUILD  |4 ++--
 build.sh  |4 ++--
 generate_build.rb |2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-17 22:55:16 UTC (rev 245523)
+++ PKGBUILD2017-07-17 23:50:08 UTC (rev 245524)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=7.1.2_r6
+pkgver=7.1.2_r27
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
@@ -26,7 +26,7 @@
   'SKIP'
   'SKIP'
   'SKIP'
-  '84dd43a0102e35fcdf0a855c617e1d151f49fb2a'
+  '524e3a1768d4386c31436210c6798a06ec636203'
   '33538c9161c199f1e608d3b8f519adb1cd9d46d5'
   '7004dbd0c193668827174880de6f8434de8ceaee'
   '2e69152091bb9642be058e49ec6cb720a2fd91dc'

Modified: build.sh
===
--- build.sh2017-07-17 22:55:16 UTC (rev 245523)
+++ build.sh2017-07-17 23:50:08 UTC (rev 245524)
@@ -48,7 +48,7 @@
 clang -o core/libcutils/socket_inaddr_any_server_unix.c.o -std=gnu11 $CFLAGS 
$CPPFLAGS -D_GNU_SOURCE -Icore/include -c 
core/libcutils/socket_inaddr_any_server_unix.c
 clang++ -o core/libcutils/sockets.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-D_GNU_SOURCE -Icore/include -c core/libcutils/sockets.cpp
 clang++ -o core/adb/diagnose_usb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-Icore/include -Icore/base/include -c core/adb/diagnose_usb.cpp
-g++ -o adb -lpthread -lcrypto $LDFLAGS core/base/file.cpp.o 
core/base/logging.cpp.o core/base/parsenetaddress.cpp.o 
core/base/stringprintf.cpp.o core/base/strings.cpp.o 
core/base/errors_unix.cpp.o core/liblog/log_event_write.c.o 
core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o 
core/liblog/logger_write.c.o core/liblog/config_write.c.o 
core/liblog/logger_lock.c.o core/liblog/fake_writer.c.o 
core/liblog/logger_name.c.o core/libcutils/load_file.c.o 
core/libcutils/socket_local_client_unix.c.o 
core/libcutils/socket_loopback_client_unix.c.o 
core/libcutils/socket_network_client_unix.c.o 
core/libcutils/socket_loopback_server_unix.c.o 
core/libcutils/socket_local_server_unix.c.o core/libcutils/sockets_unix.cpp.o 
core/libcutils/socket_inaddr_any_server_unix.c.o core/libcutils/sockets.cpp.o 
core/adb/adb.cpp.o core/adb/adb_auth.cpp.o core/adb/adb_io.cpp.o 
core/adb/adb_listeners.cpp.o core/adb/adb_trace.cpp.o core/adb/adb_utils.cpp.o 
core/adb/bugreport.cpp.o core/adb/line_printer.cpp
 .o core/adb/sockets.cpp.o core/adb/transport.cpp.o 
core/adb/transport_local.cpp.o core/adb/transport_usb.cpp.o 
core/adb/sysdeps_unix.cpp.o core/adb/fdevent.cpp.o 
core/adb/get_my_path_linux.cpp.o core/adb/usb_linux.cpp.o 
core/adb/adb_auth_host.cpp.o core/adb/shell_service_protocol.cpp.o 
core/adb/console.cpp.o core/adb/commandline.cpp.o core/adb/adb_client.cpp.o 
core/adb/services.cpp.o core/adb/file_sync_client.cpp.o 
core/adb/client/main.cpp.o core/adb/diagnose_usb.cpp.o
+clang++ -o adb -lpthread -lcrypto $LDFLAGS core/base/file.cpp.o 
core/base/logging.cpp.o core/base/parsenetaddress.cpp.o 
core/base/stringprintf.cpp.o core/base/strings.cpp.o 
core/base/errors_unix.cpp.o core/liblog/log_event_write.c.o 
core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o 
core/liblog/logger_write.c.o core/liblog/config_write.c.o 
core/liblog/logger_lock.c.o core/liblog/fake_writer.c.o 
core/liblog/logger_name.c.o core/libcutils/load_file.c.o 
core/libcutils/socket_local_client_unix.c.o 
core/libcutils/socket_loopback_client_unix.c.o 
core/libcutils/socket_network_client_unix.c.o 
core/libcutils/socket_loopback_server_unix.c.o 
core/libcutils/socket_local_server_unix.c.o core/libcutils/sockets_unix.cpp.o 
core/libcutils/socket_inaddr_any_server_unix.c.o core/libcutils/sockets.cpp.o 
core/adb/adb.cpp.o core/adb/adb_auth.cpp.o core/adb/adb_io.cpp.o 
core/adb/adb_listeners.cpp.o core/adb/adb_trace.cpp.o core/adb/adb_utils.cpp.o 
core/adb/bugreport.cpp.o core/adb/line_printer
 .cpp.o core/adb/sockets.cpp.o core/adb/transport.cpp.o 
core/adb/transport_local.cpp.o core/adb/transport_usb.cpp.o 
core/adb/sysdeps_unix.cpp.o core/adb/fdevent.cpp.o 
core/adb/get_my_path_linux.cpp.o core/adb/usb_linux.cpp.o 
core/adb/adb_auth_host.cpp.o core/adb/shell_service_protocol.cpp.o 
core/adb/console.cpp.o core/adb/commandline.cpp.o core/adb/adb_client.cpp.o 
core/adb/services.cpp.o core/adb/file_sync_client.cpp.o 
core/adb/client/main.cpp.o core/adb/diagnose_usb.cpp.o
 clang++ -o core/fastboot/protocol.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include 
-Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg 
-Iextras/ext4_utils -Iextras/f2fs_utils -c

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2017-04-24 Thread Anatol Pomozov

Date: Tuesday, April 25, 2017 @ 02:43:42
  Author: anatolik
Revision: 225229

upgpkg: android-tools 7.1.2_r6-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-25 02:43:22 UTC (rev 225228)
+++ PKGBUILD2017-04-25 02:43:42 UTC (rev 225229)
@@ -4,8 +4,8 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=7.1.1_r13
-pkgrel=2
+pkgver=7.1.2_r6
+pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
 url='http://tools.android.com/'

[arch-commits] Commit in android-tools/trunk (PKGBUILD openssl-1.1.0.patch)

2017-03-23 Thread Jan de Groot

Date: Thursday, March 23, 2017 @ 13:28:58
  Author: jgc
Revision: 218529

upgpkg: android-tools 7.1.1_r13-2

OpenSSL 1.1

Added:
  android-tools/trunk/openssl-1.1.0.patch
Modified:
  android-tools/trunk/PKGBUILD

-+
 PKGBUILD|   10 +++---
 openssl-1.1.0.patch |   32 
 2 files changed, 39 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-23 13:16:30 UTC (rev 218528)
+++ PKGBUILD2017-03-23 13:28:58 UTC (rev 218529)
@@ -5,7 +5,7 @@
 
 pkgname=android-tools
 pkgver=7.1.1_r13
-pkgrel=1
+pkgrel=2
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
 url='http://tools.android.com/'
@@ -20,7 +20,8 @@
 build.sh # regenerate this file with generate_build.rb tool
 fix_build.patch
 bash_completion.fastboot
-bash_completion.adb) # Bash completion file was taken from 
https://github.com/mbrubeck/android-completion
+bash_completion.adb
+openssl-1.1.0.patch) # Bash completion file was taken from 
https://github.com/mbrubeck/android-completion
 sha1sums=('SKIP'
   'SKIP'
   'SKIP'
@@ -28,10 +29,13 @@
   '84dd43a0102e35fcdf0a855c617e1d151f49fb2a'
   '33538c9161c199f1e608d3b8f519adb1cd9d46d5'
   '7004dbd0c193668827174880de6f8434de8ceaee'
-  '2e69152091bb9642be058e49ec6cb720a2fd91dc')
+  '2e69152091bb9642be058e49ec6cb720a2fd91dc'
+  'e5cad0915d4b4398783ff2b72ad079eb26747fdb')
 
 prepare() {
   patch -p1 < fix_build.patch
+  cd core
+  patch -Np1 -i ../openssl-1.1.0.patch
 }
 
 build() {

Added: openssl-1.1.0.patch
===
--- openssl-1.1.0.patch (rev 0)
+++ openssl-1.1.0.patch 2017-03-23 13:28:58 UTC (rev 218529)
@@ -0,0 +1,32 @@
+diff --git a/adb/adb_auth_host.cpp b/adb/adb_auth_host.cpp
+index 7b6671d73..d9fc00f86 100644
+--- a/adb/adb_auth_host.cpp
 b/adb/adb_auth_host.cpp
+@@ -71,6 +71,8 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
+ BIGNUM* rem = BN_new();
+ BIGNUM* n = BN_new();
+ BIGNUM* n0inv = BN_new();
++const BIGNUM* rsa_n;
++const BIGNUM* rsa_e;
+ 
+ if (RSA_size(rsa) != RSANUMBYTES) {
+ ret = 0;
+@@ -78,7 +80,8 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
+ }
+ 
+ BN_set_bit(r32, 32);
+-BN_copy(n, rsa->n);
++RSA_get0_key (rsa, _n, _e, NULL);
++BN_copy(n, rsa_n);
+ BN_set_bit(r, RSANUMWORDS * 32);
+ BN_mod_sqr(rr, r, n, ctx);
+ BN_div(NULL, rem, n, r32, ctx);
+@@ -92,7 +95,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
+ BN_div(n, rem, n, r32, ctx);
+ pkey->n[i] = BN_get_word(rem);
+ }
+-pkey->exponent = BN_get_word(rsa->e);
++pkey->exponent = BN_get_word(rsa_e);
+ 
+ out:
+ BN_free(n0inv);

[arch-commits] Commit in android-tools/trunk (PKGBUILD build.sh generate_build.rb)

2017-01-05 Thread Anatol Pomozov

Date: Friday, January 6, 2017 @ 07:22:43
  Author: anatolik
Revision: 205044

upgpkg: android-tools 7.1.1_r13-1

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/build.sh
  android-tools/trunk/generate_build.rb

---+
 PKGBUILD  |4 ++--
 build.sh  |5 -
 generate_build.rb |2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-06 07:12:15 UTC (rev 205043)
+++ PKGBUILD2017-01-06 07:22:43 UTC (rev 205044)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=7.0.0_r21
+pkgver=7.1.1_r13
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
@@ -25,7 +25,7 @@
   'SKIP'
   'SKIP'
   'SKIP'
-  '0328e1423b8148c87f9a7b2974855e46ec3c04a6'
+  '84dd43a0102e35fcdf0a855c617e1d151f49fb2a'
   '33538c9161c199f1e608d3b8f519adb1cd9d46d5'
   '7004dbd0c193668827174880de6f8434de8ceaee'
   '2e69152091bb9642be058e49ec6cb720a2fd91dc')

Modified: build.sh
===
--- build.sh2017-01-06 07:12:15 UTC (rev 205043)
+++ build.sh2017-01-06 07:22:43 UTC (rev 205044)
@@ -1,3 +1,5 @@
+# This set of commands generated by generate_build.rb script
+
 clang++ -o core/adb/adb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/adb.cpp
 clang++ -o core/adb/adb_auth.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/adb_auth.cpp
 clang++ -o core/adb/adb_io.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/adb_io.cpp
@@ -4,6 +6,7 @@
 clang++ -o core/adb/adb_listeners.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/adb_listeners.cpp
 clang++ -o core/adb/adb_trace.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/adb_trace.cpp
 clang++ -o core/adb/adb_utils.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/adb_utils.cpp
+clang++ -o core/adb/bugreport.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/bugreport.cpp
 clang++ -o core/adb/line_printer.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/line_printer.cpp
 clang++ -o core/adb/sockets.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/sockets.cpp
 clang++ -o core/adb/transport.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include 
-Icore/base/include -Icore/adb -c core/adb/transport.cpp
@@ -45,7 +48,7 @@
 clang -o core/libcutils/socket_inaddr_any_server_unix.c.o -std=gnu11 $CFLAGS 
$CPPFLAGS -D_GNU_SOURCE -Icore/include -c 
core/libcutils/socket_inaddr_any_server_unix.c
 clang++ -o core/libcutils/sockets.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-D_GNU_SOURCE -Icore/include -c core/libcutils/sockets.cpp
 clang++ -o core/adb/diagnose_usb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS 
-Icore/include -Icore/base/include -c core/adb/diagnose_usb.cpp
-g++ -o adb -lrt -ldl -lpthread -lcrypto $LDFLAGS core/base/file.cpp.o 
core/base/logging.cpp.o core/base/parsenetaddress.cpp.o 
core/base/stringprintf.cpp.o core/base/strings.cpp.o 
core/base/errors_unix.cpp.o core/liblog/log_event_write.c.o 
core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o 
core/liblog/logger_write.c.o core/liblog/config_write.c.o 
core/liblog/logger_lock.c.o core/liblog/fake_writer.c.o 
core/liblog/logger_name.c.o core/libcutils/load_file.c.o 
core/libcutils/socket_local_client_unix.c.o 
core/libcutils/socket_loopback_client_unix.c.o 
core/libcutils/socket_network_client_unix.c.o 
core/libcutils/socket_loopback_server_unix.c.o 
core/libcutils/socket_local_server_unix.c.o core/libcutils/sockets_unix.cpp.o 
core/libcutils/socket_inaddr_any_server_unix.c.o core/libcutils/sockets.cpp.o 
core/adb/adb.cpp.o core/adb/adb_auth.cpp.o core/adb/adb_io.cpp.o 
core/adb/adb_listeners.cpp.o core/adb/adb_trace.cpp.o core/adb/adb_utils.cpp.o 
core/adb/line_printer.cpp.o core/adb/soc
 kets.cpp.o core/adb/transport.cpp.o core/adb/transport_local.cpp.o 
core/adb/transport_usb.cpp.o core/adb/sysdeps_unix.cpp.o core/adb/fdevent.cpp.o

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2016-11-29 Thread Anatol Pomozov

Date: Tuesday, November 29, 2016 @ 16:58:17
  Author: anatolik
Revision: 197394

upgpkg: android-tools 7.0.0_r21-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-29 15:59:43 UTC (rev 197393)
+++ PKGBUILD2016-11-29 16:58:17 UTC (rev 197394)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=7.0.0_r1
+pkgver=7.0.0_r21
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
@@ -11,6 +11,7 @@
 url='http://tools.android.com/'
 license=(Apache MIT)
 depends=(openssl pcre)
+optdepends=('python: for mkbootimg script')
 makedepends=(git clang gtest)
 
source=(git+https://android.googlesource.com/platform/system/core#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/system/extras#tag=android-$pkgver

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2016-08-31 Thread Anatol Pomozov

Date: Wednesday, August 31, 2016 @ 16:15:28
  Author: anatolik
Revision: 188151

upgpkg: android-tools 7.0.0_r1-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-31 15:46:39 UTC (rev 188150)
+++ PKGBUILD2016-08-31 16:15:28 UTC (rev 188151)
@@ -11,7 +11,7 @@
 url='http://tools.android.com/'
 license=(Apache MIT)
 depends=(openssl pcre)
-makedepends=(git clang)
+makedepends=(git clang gtest)
 
source=(git+https://android.googlesource.com/platform/system/core#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/system/extras#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/external/libselinux#tag=android-$pkgver
@@ -34,7 +34,7 @@
 }
 
 build() {
-  PKGVER=$pkgver ./build.sh
+  PKGVER=$pkgver sh ./build.sh
 }
 
 package(){

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2016-06-22 Thread Anatol Pomozov

Date: Wednesday, June 22, 2016 @ 18:33:38
  Author: anatolik
Revision: 180766

upgpkg: android-tools 6.0.1_r46-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-22 17:45:29 UTC (rev 180765)
+++ PKGBUILD2016-06-22 18:33:38 UTC (rev 180766)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=6.0.1_r30
+pkgver=6.0.1_r46
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2016-04-12 Thread Anatol Pomozov

Date: Tuesday, April 12, 2016 @ 17:33:47
  Author: anatolik
Revision: 170768

upgpkg: android-tools 6.0.1_r30-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-12 15:32:07 UTC (rev 170767)
+++ PKGBUILD2016-04-12 15:33:47 UTC (rev 170768)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=6.0.1_r24
+pkgver=6.0.1_r30
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
@@ -41,5 +41,6 @@
   install -m755 -d "$pkgdir"/usr/bin
   install -m755 -t "$pkgdir"/usr/bin mkbootimg fastboot adb
   install -Dm 644 bash_completion.fastboot 
"$pkgdir"/usr/share/bash-completion/completions/fastboot
-  install -Dm 644 bash_completion.adb 
"$pkgdir"/usr/share/bash-completion/completions/adb
+  #adb completion is provided by bash-completion file now
+  #install -Dm 644 bash_completion.adb 
"$pkgdir"/usr/share/bash-completion/completions/adb
 }

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2016-04-07 Thread Anatol Pomozov

Date: Thursday, April 7, 2016 @ 18:23:31
  Author: anatolik
Revision: 169661

upgpkg: android-tools 6.0.1_r24-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-07 16:23:24 UTC (rev 169660)
+++ PKGBUILD2016-04-07 16:23:31 UTC (rev 169661)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=6.0.1_r22
+pkgver=6.0.1_r24
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2016-03-15 Thread Anatol Pomozov

Date: Tuesday, March 15, 2016 @ 18:17:42
  Author: anatolik
Revision: 166836

upgpkg: android-tools 6.0.1_r22-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-15 16:57:11 UTC (rev 166835)
+++ PKGBUILD2016-03-15 17:17:42 UTC (rev 166836)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=6.0.1_r16
+pkgver=6.0.1_r22
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)

[arch-commits] Commit in android-tools/trunk (PKGBUILD build.sh generate_build.rb)

2016-02-12 Thread Anatol Pomozov

Date: Saturday, February 13, 2016 @ 06:29:47
  Author: anatolik
Revision: 161445

upgpkg: android-tools 6.0.1_r16-1

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/build.sh
  android-tools/trunk/generate_build.rb

---+
 PKGBUILD  |6 +++---
 build.sh  |6 +++---
 generate_build.rb |2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-13 02:56:59 UTC (rev 161444)
+++ PKGBUILD2016-02-13 05:29:47 UTC (rev 161445)
@@ -4,8 +4,8 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=6.0.1_r10
-pkgrel=2
+pkgver=6.0.1_r16
+pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
 url='http://tools.android.com/'
@@ -24,7 +24,7 @@
   'SKIP'
   'SKIP'
   'SKIP'
-  'd47604b60cc123641d52eed8f6495265725bf9d3'
+  '24ee7a286b91bf488537bbd9b6a2b7721dd22fea'
   '40a978209b6d1bbf99e04b8bd5fca6429b97f1b1'
   '7004dbd0c193668827174880de6f8434de8ceaee'
   '2e69152091bb9642be058e49ec6cb720a2fd91dc')

Modified: build.sh
===
--- build.sh2016-02-13 02:56:59 UTC (rev 161444)
+++ build.sh2016-02-13 05:29:47 UTC (rev 161445)
@@ -6,7 +6,7 @@
 gcc -o core/libmincrypt/p256_ecdsa.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/include -c core/libmincrypt/p256_ecdsa.c
 gcc -o core/libmincrypt/sha256.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/include 
-c core/libmincrypt/sha256.c
 gcc -o core/mkbootimg/mkbootimg.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/include -c core/mkbootimg/mkbootimg.c
-g++ -o mkbootimg  "$LDFLAGS" core/libmincrypt/dsa_sig.c.o 
core/libmincrypt/p256_ec.c.o core/libmincrypt/rsa.c.o core/libmincrypt/sha.c.o 
core/libmincrypt/p256.c.o core/libmincrypt/p256_ecdsa.c.o 
core/libmincrypt/sha256.c.o core/mkbootimg/mkbootimg.c.o
+g++ -o mkbootimg  $LDFLAGS core/libmincrypt/dsa_sig.c.o 
core/libmincrypt/p256_ec.c.o core/libmincrypt/rsa.c.o core/libmincrypt/sha.c.o 
core/libmincrypt/p256.c.o core/libmincrypt/p256_ecdsa.c.o 
core/libmincrypt/sha256.c.o core/mkbootimg/mkbootimg.c.o
 g++ -o core/adb/adb.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 
-fpermissive -Icore/include -Icore/base/include -c core/adb/adb.cpp
 g++ -o core/adb/adb_auth.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 
-fpermissive -Icore/include -Icore/base/include -c core/adb/adb_auth.cpp
 g++ -o core/adb/adb_io.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 
-fpermissive -Icore/include -Icore/base/include -c core/adb/adb_io.cpp
@@ -39,7 +39,7 @@
 gcc -o core/libcutils/socket_loopback_client.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-D_GNU_SOURCE -Icore/include -c core/libcutils/socket_loopback_client.c
 gcc -o core/libcutils/socket_loopback_server.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-D_GNU_SOURCE -Icore/include -c core/libcutils/socket_loopback_server.c
 gcc -o core/libcutils/socket_network_client.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-D_GNU_SOURCE -Icore/include -c core/libcutils/socket_network_client.c
-g++ -o adb -lrt -ldl -lpthread -lcrypto "$LDFLAGS" core/base/file.cpp.o 
core/base/stringprintf.cpp.o core/base/strings.cpp.o core/liblog/logd_write.c.o 
core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o 
core/libcutils/load_file.c.o core/libcutils/socket_inaddr_any_server.c.o 
core/libcutils/socket_local_client.c.o core/libcutils/socket_local_server.c.o 
core/libcutils/socket_loopback_client.c.o 
core/libcutils/socket_loopback_server.c.o 
core/libcutils/socket_network_client.c.o core/adb/adb.cpp.o 
core/adb/adb_auth.cpp.o core/adb/adb_io.cpp.o core/adb/adb_listeners.cpp.o 
core/adb/adb_utils.cpp.o core/adb/sockets.cpp.o core/adb/transport.cpp.o 
core/adb/transport_local.cpp.o core/adb/transport_usb.cpp.o 
core/adb/fdevent.cpp.o core/adb/get_my_path_linux.cpp.o 
core/adb/usb_linux.cpp.o core/adb/adb_auth_host.cpp.o core/adb/adb_main.cpp.o 
core/adb/console.cpp.o core/adb/commandline.cpp.o core/adb/adb_client.cpp.o 
core/adb/services.cpp.o core/adb/file_sync_client.cpp.o
+g++ -o adb -lrt -ldl -lpthread -lcrypto $LDFLAGS core/base/file.cpp.o 
core/base/stringprintf.cpp.o core/base/strings.cpp.o core/liblog/logd_write.c.o 
core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o 
core/libcutils/load_file.c.o core/libcutils/socket_inaddr_any_server.c.o 
core/libcutils/socket_local_client.c.o core/libcutils/socket_local_server.c.o 
core/libcutils/socket_loopback_client.c.o 
core/libcutils/socket_loopback_server.c.o 
core/libcutils/socket_network_client.c.o core/adb/adb.cpp.o 
core/adb/adb_auth.cpp.o core/adb/adb_io.cpp.o core/adb/adb_listeners.cpp.o 
core/adb/adb_utils.cpp.o core/adb/sockets.cpp.o core/adb/transport.cpp.o 
core/adb/transport_local.cpp.o core/adb/transport_usb.cpp.o 
core/adb/fdevent.cpp.o core/adb/get_my_path_linux.cpp.o 
core/adb/usb_linux.cpp.o core/adb/adb_auth_host.cpp.o core/adb/adb_main.cpp.o

[arch-commits] Commit in android-tools/trunk (PKGBUILD build.sh generate_build.rb)

2016-01-12 Thread Anatol Pomozov

Date: Wednesday, January 13, 2016 @ 07:41:16
  Author: anatolik
Revision: 156291

upgpkg: android-tools 6.0.1_r10-1

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/build.sh
  android-tools/trunk/generate_build.rb

---+
 PKGBUILD  |6 +++---
 build.sh  |   22 +++---
 generate_build.rb |2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-13 06:27:34 UTC (rev 156290)
+++ PKGBUILD2016-01-13 06:41:16 UTC (rev 156291)
@@ -16,7 +16,7 @@
 
git+https://android.googlesource.com/platform/system/extras#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/external/libselinux#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/external/f2fs-tools#tag=android-$pkgver
-build.sh
+build.sh # regenerate this file with generate_build.rb tool
 fix_build.patch
 bash_completion) # Bash completion file was taken from 
https://github.com/mbrubeck/android-completion
 sha1sums=('SKIP'
@@ -23,12 +23,12 @@
   'SKIP'
   'SKIP'
   'SKIP'
-  '2bf75e141d4dbbc04ad23c19b3d5e67300de3edd'
+  'd47604b60cc123641d52eed8f6495265725bf9d3'
   '40a978209b6d1bbf99e04b8bd5fca6429b97f1b1'
   'e1bd94fd4dd260af3c068496071d67738d431aec')
 
 prepare() {
-  patch -p1 < ../fix_build.patch
+  patch -p1 < fix_build.patch
 }
 
 build() {

Modified: build.sh
===
--- build.sh2016-01-13 06:27:34 UTC (rev 156290)
+++ build.sh2016-01-13 06:41:16 UTC (rev 156291)
@@ -56,17 +56,17 @@
 gcc -o core/libsparse/sparse_read.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -c core/libsparse/sparse_read.c
 g++ -o core/libziparchive/zip_archive.cc.o -std=gnu++11 $CXXFLAGS $CPPFLAGS 
-Icore/base/include -Icore/include -c core/libziparchive/zip_archive.cc
 g++ -o core/libutils/FileMap.cpp.o -std=gnu++11 $CXXFLAGS $CPPFLAGS 
-Icore/include -c core/libutils/FileMap.cpp
-gcc -o extras/ext4_utils/make_ext4fs.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -c extras/ext4_utils/make_ext4fs.c
-gcc -o extras/ext4_utils/ext4fixup.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -c extras/ext4_utils/ext4fixup.c
-gcc -o extras/ext4_utils/ext4_utils.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -c extras/ext4_utils/ext4_utils.c
-gcc -o extras/ext4_utils/allocate.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -c extras/ext4_utils/allocate.c
-gcc -o extras/ext4_utils/contents.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -c extras/ext4_utils/contents.c
-gcc -o extras/ext4_utils/extent.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -c extras/ext4_utils/extent.c
-gcc -o extras/ext4_utils/indirect.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -c extras/ext4_utils/indirect.c
-gcc -o extras/ext4_utils/sha1.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -c extras/ext4_utils/sha1.c
-gcc -o extras/ext4_utils/wipe.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -c extras/ext4_utils/wipe.c
-gcc -o extras/ext4_utils/crc16.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -c extras/ext4_utils/crc16.c
-gcc -o extras/ext4_utils/ext4_sb.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -c extras/ext4_utils/ext4_sb.c
+gcc -o extras/ext4_utils/make_ext4fs.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -Ilibselinux/include -c 
extras/ext4_utils/make_ext4fs.c
+gcc -o extras/ext4_utils/ext4fixup.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -Ilibselinux/include -c 
extras/ext4_utils/ext4fixup.c
+gcc -o extras/ext4_utils/ext4_utils.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -Ilibselinux/include -c 
extras/ext4_utils/ext4_utils.c
+gcc -o extras/ext4_utils/allocate.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -Ilibselinux/include -c 
extras/ext4_utils/allocate.c
+gcc -o extras/ext4_utils/contents.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -Ilibselinux/include -c 
extras/ext4_utils/contents.c
+gcc -o extras/ext4_utils/extent.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -Ilibselinux/include -c 
extras/ext4_utils/extent.c
+gcc -o extras/ext4_utils/indirect.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -Ilibselinux/include -c 
extras/ext4_utils/indirect.c
+gcc -o extras/ext4_utils/sha1.c.o -std=gnu11 $CFLAGS $CPPFLAGS 
-Icore/libsparse/include -Icore/include -Ilibselinux/include -c 
extras/ext4_utils/sha1.c
+gcc -o

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2016-01-10 Thread Anatol Pomozov

Date: Monday, January 11, 2016 @ 04:17:28
  Author: anatolik
Revision: 155915

upgpkg: android-tools 5.1.1_r33-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-11 03:08:47 UTC (rev 155914)
+++ PKGBUILD2016-01-11 03:17:28 UTC (rev 155915)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=5.1.1_r18
+pkgver=5.1.1_r33
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2016-01-04 Thread Anatol Pomozov

Date: Monday, January 4, 2016 @ 21:02:43
  Author: anatolik
Revision: 155479

FS#47620: Use /usr/share/bash-completion/completions/ for bash completions

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-04 19:52:42 UTC (rev 155478)
+++ PKGBUILD2016-01-04 20:02:43 UTC (rev 155479)
@@ -37,5 +37,5 @@
 package(){
   make DESTDIR="$pkgdir" install
 
-  install -Dm 644 bash_completion "$pkgdir"/etc/bash_completion.d/$pkgname
+  install -Dm 644 bash_completion 
"$pkgdir"/usr/share/bash-completion/completions/$pkgname
 }

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2015-09-27 Thread Anatol Pomozov

Date: Sunday, September 27, 2015 @ 13:02:50
  Author: anatolik
Revision: 141685

upgpkg: android-tools 5.1.1_r18-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-27 10:25:39 UTC (rev 141684)
+++ PKGBUILD2015-09-27 11:02:50 UTC (rev 141685)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd 
 
 pkgname=android-tools
-pkgver=5.1.1_r13
+pkgver=5.1.1_r18
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2015-08-21 Thread Anatol Pomozov

Date: Friday, August 21, 2015 @ 17:22:25
  Author: anatolik
Revision: 138599

upgpkg: android-tools 5.1.1_r13-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-21 15:19:10 UTC (rev 138598)
+++ PKGBUILD2015-08-21 15:22:25 UTC (rev 138599)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd alucryd at gmail dot com
 
 pkgname=android-tools
-pkgver=5.1.1_r5
+pkgver=5.1.1_r13
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
@@ -23,7 +23,7 @@
   'SKIP'
   'SKIP'
   '67baba7465ba6a65c206e8373656e5fe1d85f188'
-  'd1b208c7c2d8d0053e9937653cca22d09b6d')
+  'e1bd94fd4dd260af3c068496071d67738d431aec')
 
 prepare() {
   # another way to fix the compilation error is to add #include stddef.h

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2015-06-25 Thread Anatol Pomozov

Date: Thursday, June 25, 2015 @ 21:01:56
  Author: anatolik
Revision: 135874

upgpkg: android-tools 5.1.1_r5-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-25 17:44:37 UTC (rev 135873)
+++ PKGBUILD2015-06-25 19:01:56 UTC (rev 135874)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd alucryd at gmail dot com
 
 pkgname=android-tools
-pkgver=5.1.1_r4
+pkgver=5.1.1_r5
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2015-06-15 Thread Anatol Pomozov

Date: Monday, June 15, 2015 @ 22:10:53
  Author: anatolik
Revision: 135454

upgpkg: android-tools 5.1.1_r4-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-15 20:07:17 UTC (rev 135453)
+++ PKGBUILD2015-06-15 20:10:53 UTC (rev 135454)
@@ -4,8 +4,8 @@
 # Contributor: Alucryd alucryd at gmail dot com
 
 pkgname=android-tools
-pkgver=5.1.1_r2
-pkgrel=2
+pkgver=5.1.1_r4
+pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
 url='http://tools.android.com/'

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2015-05-18 Thread Anatol Pomozov

Date: Tuesday, May 19, 2015 @ 05:14:44
  Author: anatolik
Revision: 133752

upgpkg: android-tools 5.1.1_r2-2

Add mkbootimg tool

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-19 00:35:57 UTC (rev 133751)
+++ PKGBUILD2015-05-19 03:14:44 UTC (rev 133752)
@@ -5,7 +5,7 @@
 
 pkgname=android-tools
 pkgver=5.1.1_r2
-pkgrel=1
+pkgrel=2
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
 url='http://tools.android.com/'

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2015-05-13 Thread Anatol Pomozov

Date: Wednesday, May 13, 2015 @ 18:38:11
  Author: anatolik
Revision: 133380

upgpkg: android-tools 5.1.1_r2-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-13 14:47:34 UTC (rev 133379)
+++ PKGBUILD2015-05-13 16:38:11 UTC (rev 133380)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd alucryd at gmail dot com
 
 pkgname=android-tools
-pkgver=5.1.0_r3
+pkgver=5.1.1_r2
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)

[arch-commits] Commit in android-tools/trunk (PKGBUILD adbMakefile fastbootMakefile)

2015-04-08 Thread Anatol Pomozov

Date: Thursday, April 9, 2015 @ 02:06:05
  Author: anatolik
Revision: 131002

upgpkg: android-tools 5.1.0_r3-1

FS#44509

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/adbMakefile
  android-tools/trunk/fastbootMakefile

--+
 PKGBUILD |8 
 adbMakefile  |1 +
 fastbootMakefile |2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-08 23:36:31 UTC (rev 131001)
+++ PKGBUILD2015-04-09 00:06:05 UTC (rev 131002)
@@ -4,13 +4,13 @@
 # Contributor: Alucryd alucryd at gmail dot com
 
 pkgname=android-tools
-pkgver=5.0.2_r1
+pkgver=5.1.0_r3
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
 url='http://tools.android.com/'
 license=(Apache MIT)
-depends=(openssl)
+depends=(openssl pcre)
 makedepends=(git)
 
source=(git+https://android.googlesource.com/platform/system/core#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/system/extras#tag=android-$pkgver
@@ -23,8 +23,8 @@
   'SKIP'
   'SKIP'
   'SKIP'
-  'ed3e9f6fc43ea9adb177ff1f81532a583b51e348'
-  'a61991623b3a6c21129156f36d81076e5ac1a32d'
+  '65fe33b2cb41c7125470b5c606cd2ca38193f6ad'
+  '0bf0bdcabb78af81583c932cce198f918d9e4463'
   'd1b208c7c2d8d0053e9937653cca22d09b6d')
 
 

Modified: adbMakefile
===
--- adbMakefile 2015-04-08 23:36:31 UTC (rev 131001)
+++ adbMakefile 2015-04-09 00:06:05 UTC (rev 131002)
@@ -30,6 +30,7 @@
 CPPFLAGS+= -DADB_HOST=1
 CPPFLAGS+= -DHAVE_FORKEXEC=1
 CPPFLAGS+= -DHAVE_OFF64_T=1
+CPPFLAGS+= -DHAVE_TERMIO_H
 CPPFLAGS+= -I.
 CPPFLAGS+= -I../include
 

Modified: fastbootMakefile
===
--- fastbootMakefile2015-04-08 23:36:31 UTC (rev 131001)
+++ fastbootMakefile2015-04-09 00:06:05 UTC (rev 131002)
@@ -57,7 +57,7 @@
 CPPFLAGS+= -DHAVE_OFF64_T=1
 CPPFLAGS+= -std=gnu99
 
-LIBS+= -lz -ldl
+LIBS+= -lz -ldl -lpcre
 
 OBJS= $(SRCS:.c=.o)

[arch-commits] Commit in android-tools/trunk (PKGBUILD)

2014-12-20 Thread Anatol Pomozov

Date: Sunday, December 21, 2014 @ 01:20:07
  Author: anatolik
Revision: 124242

upgpkg: android-tools 5.0.2_r1-1

Modified:
  android-tools/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-21 00:02:01 UTC (rev 124241)
+++ PKGBUILD2014-12-21 00:20:07 UTC (rev 124242)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd alucryd at gmail dot com
 
 pkgname=android-tools
-pkgver=5.0.0_r7
+pkgver=5.0.2_r1
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)

[arch-commits] Commit in android-tools/trunk (PKGBUILD adbMakefile fastbootMakefile)

2014-11-24 Thread Anatol Pomozov

Date: Monday, November 24, 2014 @ 23:37:16
  Author: anatolik
Revision: 123099

upgpkg: android-tools 5.0.0_r7-1

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/adbMakefile
  android-tools/trunk/fastbootMakefile

--+
 PKGBUILD |6 +++---
 adbMakefile  |2 +-
 fastbootMakefile |2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-24 20:48:24 UTC (rev 123098)
+++ PKGBUILD2014-11-24 22:37:16 UTC (rev 123099)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd alucryd at gmail dot com
 
 pkgname=android-tools
-pkgver=5.0.0_r2
+pkgver=5.0.0_r7
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
@@ -23,8 +23,8 @@
   'SKIP'
   'SKIP'
   'SKIP'
-  'cc3d5bbf7f38574bfe597555b39d983db87ec37f'
-  '5a66a188e35ec09393f5bd85d5b63fe7a7e38c0f'
+  'ed3e9f6fc43ea9adb177ff1f81532a583b51e348'
+  'a61991623b3a6c21129156f36d81076e5ac1a32d'
   'd1b208c7c2d8d0053e9937653cca22d09b6d')
 
 

Modified: adbMakefile
===
--- adbMakefile 2014-11-24 20:48:24 UTC (rev 123098)
+++ adbMakefile 2014-11-24 22:37:16 UTC (rev 123099)
@@ -40,4 +40,4 @@
 all: adb
 
 adb: $(OBJS)
-   cc -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
+   cc -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)

Modified: fastbootMakefile
===
--- fastbootMakefile2014-11-24 20:48:24 UTC (rev 123098)
+++ fastbootMakefile2014-11-24 22:37:16 UTC (rev 123099)
@@ -64,4 +64,4 @@
 all: fastboot
 
 fastboot: $(OBJS)
-   cc -o $@ $(OBJS) $(LIBS)
+   cc -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)

[arch-commits] Commit in android-tools/trunk (PKGBUILD adbMakefile fastbootMakefile)

2014-11-08 Thread Anatol Pomozov

Date: Saturday, November 8, 2014 @ 19:52:51
  Author: anatolik
Revision: 122267

upgpkg: android-tools 5.0.0_r2-1

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/adbMakefile
  android-tools/trunk/fastbootMakefile

--+
 PKGBUILD |   22 +++---
 adbMakefile  |2 +-
 fastbootMakefile |   15 ++-
 3 files changed, 30 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-08 18:24:03 UTC (rev 122266)
+++ PKGBUILD2014-11-08 18:52:51 UTC (rev 122267)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd alucryd at gmail dot com
 
 pkgname=android-tools
-pkgver=4.4.4_r2.0.1
+pkgver=5.0.0_r2
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
@@ -15,16 +15,24 @@
 
source=(git+https://android.googlesource.com/platform/system/core#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/system/extras#tag=android-$pkgver
 
git+https://android.googlesource.com/platform/external/libselinux#tag=android-$pkgver
+
git+https://android.googlesource.com/platform/external/f2fs-tools#tag=android-$pkgver
 adbMakefile
 fastbootMakefile
 bash_completion) # Bash completion file was taken from 
https://github.com/mbrubeck/android-completion
-md5sums=('SKIP'
- 'SKIP'
- 'SKIP'
- '887d868e544330ef850334961685cab3'
- 'cd1a1a9d16b523119245bfe17120d73b'
- '421f8640d7b4ec156f1d37167f3e7a45')
+sha1sums=('SKIP'
+  'SKIP'
+  'SKIP'
+  'SKIP'
+  'cc3d5bbf7f38574bfe597555b39d983db87ec37f'
+  '5a66a188e35ec09393f5bd85d5b63fe7a7e38c0f'
+  'd1b208c7c2d8d0053e9937653cca22d09b6d')
 
+
+prepare() {
+  # another way to fix the compilation error is to add #include stddef.h
+  sed -e 's/f2fs_sparse_file = NULL/f2fs_sparse_file = 0/g' -i 
extras/f2fs_utils/f2fs_utils.c 
+}
+
 build() {
   make -C core/adb -f $srcdir/adbMakefile
   make -C core/fastboot -f $srcdir/fastbootMakefile

Modified: adbMakefile
===
--- adbMakefile 2014-11-08 18:24:03 UTC (rev 122266)
+++ adbMakefile 2014-11-08 18:52:51 UTC (rev 122267)
@@ -15,7 +15,6 @@
 SRCS+= usb_vendors.c
 
 VPATH+= ../libcutils
-SRCS+= list.c
 SRCS+= load_file.c
 SRCS+= socket_inaddr_any_server.c
 SRCS+= socket_local_client.c
@@ -30,6 +29,7 @@
 
 CPPFLAGS+= -DADB_HOST=1
 CPPFLAGS+= -DHAVE_FORKEXEC=1
+CPPFLAGS+= -DHAVE_OFF64_T=1
 CPPFLAGS+= -I.
 CPPFLAGS+= -I../include
 

Modified: fastbootMakefile
===
--- fastbootMakefile2014-11-08 18:24:03 UTC (rev 122266)
+++ fastbootMakefile2014-11-08 18:52:51 UTC (rev 122267)
@@ -4,6 +4,8 @@
 SRCS+=protocol.c
 SRCS+=usb_linux.c
 SRCS+=util_linux.c
+SRCS+=util.c
+SRCS+=fs.c
 
 VPATH+= ../libsparse
 SRCS+= backed_block.c
@@ -22,6 +24,7 @@
 SRCS+= contents.c
 SRCS+= crc16.c
 SRCS+= ext4_utils.c
+SRCS+= ext4_sb.c
 SRCS+= extent.c
 SRCS+= indirect.c
 SRCS+= make_ext4fs.c
@@ -29,6 +32,11 @@
 SRCS+= uuid.c
 SRCS+= wipe.c
 
+VPATH+= ../../extras/f2fs_utils
+SRCS+= f2fs_utils.c
+SRCS+= f2fs_dlutils.c
+SRCS+= f2fs_ioutils.c
+
 VPATH+= ../../libselinux/src
 SRCS+= callbacks.c
 SRCS+= check_context.c
@@ -42,9 +50,14 @@
 CPPFLAGS+= -I../libsparse/include
 CPPFLAGS+= -I../mkbootimg
 CPPFLAGS+= -I../../extras/ext4_utils
+CPPFLAGS+= -I../../extras/f2fs_utils/
 CPPFLAGS+= -I../../libselinux/include
+CPPFLAGS+= -I../../f2fs-tools/include
+CPPFLAGS+= -I../../f2fs-tools/mkfs
+CPPFLAGS+= -DHAVE_OFF64_T=1
+CPPFLAGS+= -std=gnu99
 
-LIBS+= -lz
+LIBS+= -lz -ldl
 
 OBJS= $(SRCS:.c=.o)

[arch-commits] Commit in android-tools/trunk (PKGBUILD bash_completion)

2014-08-25 Thread Anatol Pomozov

Date: Monday, August 25, 2014 @ 16:38:55
  Author: anatolik
Revision: 117875

upgpkg: android-tools 4.4.4_r2.0.1-1

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/bash_completion

-+
 PKGBUILD|4 ++--
 bash_completion |2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-25 14:18:03 UTC (rev 117874)
+++ PKGBUILD2014-08-25 14:38:55 UTC (rev 117875)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd alucryd at gmail dot com
 
 pkgname=android-tools
-pkgver=4.4.2_r2
+pkgver=4.4.4_r2.0.1
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
@@ -23,7 +23,7 @@
  'SKIP'
  '887d868e544330ef850334961685cab3'
  'cd1a1a9d16b523119245bfe17120d73b'
- '94ba9c753e9c3d2f29ffdef2eaf7888d')
+ '421f8640d7b4ec156f1d37167f3e7a45')
 
 build() {
   make -C core/adb -f $srcdir/adbMakefile

Modified: bash_completion
===
--- bash_completion 2014-08-25 14:18:03 UTC (rev 117874)
+++ bash_completion 2014-08-25 14:38:55 UTC (rev 117875)
@@ -133,8 +133,6 @@
 }
 complete -o default -F _adb adb
 
-
-
 function _fastboot()
 {
   local cur prev opts cmds c subcommand device_selected

59 matches

Mail list logo