Attachment 10487 Details for Bug 23672 – Non-working patch to update android-tools to 9.0.0_r12 in Cauldron

[patch] Non-working patch to update android-tools to 9.0.0_r12 in Cauldron

android-tools-9.0.0_r12.diff (text/plain), 10.17 KB, created by Rémi Verschelde on 2018-11-20 14:44:37 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Rémi Verschelde

Created: 2018-11-20 14:44:37 CET

Size: 10.17 KB

patch

obsolete

>Index: SOURCES/0001-Add-string-h.patch
>===================================================================
>--- SOURCES/0001-Add-string-h.patch	(rÃ©vision 1322164)
>+++ SOURCES/0001-Add-string-h.patch	(copie de travail)
>@@ -1,7 +1,7 @@
>-diff --git a/core/base/errors_unix.cpp b/core/base/errors_unix.cpp
>+diff --git a/base/errors_unix.cpp b/base/errors_unix.cpp
> index 296995e..48269b6 100644
>---- a/core/base/errors_unix.cpp
>-+++ b/core/base/errors_unix.cpp
>+--- a/base/errors_unix.cpp
>++++ b/base/errors_unix.cpp
> @@ -17,6 +17,7 @@
>  #include "android-base/errors.h"
>  
>@@ -10,10 +10,10 @@
>  
>  namespace android {
>  namespace base {
>-diff --git a/core/base/file.cpp b/core/base/file.cpp
>+diff --git a/base/file.cpp b/base/file.cpp
> index 81b04d7..2fd2b6e 100644
>---- a/core/base/file.cpp
>-+++ b/core/base/file.cpp
>+--- a/base/file.cpp
>++++ b/base/file.cpp
> @@ -22,6 +22,7 @@
>  #include <sys/stat.h>
>  #include <sys/types.h>
>@@ -22,10 +22,10 @@
>  
>  #include <memory>
>  #include <mutex>
>-diff --git a/core/base/logging.cpp b/core/base/logging.cpp
>+diff --git a/base/logging.cpp b/base/logging.cpp
> index 6357b4b..3c7dbce 100644
>---- a/core/base/logging.cpp
>-+++ b/core/base/logging.cpp
>+--- a/base/logging.cpp
>++++ b/base/logging.cpp
> @@ -23,6 +23,7 @@
>  #include <fcntl.h>
>  #include <libgen.h>
>Index: SOURCES/0002-libusb-modifications.patch
>===================================================================
>--- SOURCES/0002-libusb-modifications.patch	(rÃ©vision 1322164)
>+++ SOURCES/0002-libusb-modifications.patch	(copie de travail)
>@@ -1,7 +1,7 @@
>-diff --git a/core/adb/client/usb_libusb.cpp b/core/adb/client/usb_libusb.cpp
>+diff --git a/adb/client/usb_libusb.cpp b/adb/client/usb_libusb.cpp
> index 7adb262..b994c8c 100644
>---- a/core/adb/client/usb_libusb.cpp
>-+++ b/core/adb/client/usb_libusb.cpp
>+--- a/adb/client/usb_libusb.cpp
>++++ b/adb/client/usb_libusb.cpp
> @@ -27,8 +27,9 @@
>  #include <string>
>  #include <thread>
>Index: SOURCES/0004-bz1441234.patch
>===================================================================
>--- SOURCES/0004-bz1441234.patch	(rÃ©vision 1322164)
>+++ SOURCES/0004-bz1441234.patch	(copie de travail)
>@@ -1,7 +1,7 @@
> diff --git a/libcrypto_utils/android_pubkey.c b/libcrypto_utils/android_pubkey.c
> index 3052e52..7061db9 100644
>---- a/core/libcrypto_utils/android_pubkey.c
>-+++ b/core/libcrypto_utils/android_pubkey.c
>+--- a/libcrypto_utils/android_pubkey.c
>++++ b/libcrypto_utils/android_pubkey.c
> @@ -126,37 +126,41 @@ bool android_pubkey_encode(const RSA* key, uint8_t* key_buffer, size_t size) {
>    BIGNUM* r32 = BN_new();
>    BIGNUM* n0inv = BN_new();
>Index: SOURCES/generate_build.rb
>===================================================================
>--- SOURCES/generate_build.rb	(rÃ©vision 1322164)
>+++ SOURCES/generate_build.rb	(copie de travail)
>@@ -17,10 +17,10 @@
>     
>     case ext
>     when '.c'
>-        cc = 'gcc'
>+        cc = 'clang'
>     	lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
>     when '.cpp', '.cc'
>-        cc = 'g++'
>+        cc = 'clang++'
>     	lang_flags = '-std=gnu++14 $CXXFLAGS $CPPFLAGS'
>     else
>         raise "Unknown extension #{ext}"
>@@ -58,7 +58,7 @@
>   adb_auth_host.cpp
>   sysdeps_unix.cpp
> )
>-libadbd = compile(expand('adb', adbdfiles), '-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -I../boringssl/include -Iadb -Iinclude -Ibase/include -Ilibcrypto_utils/include')
>+libadbd = compile(expand('adb', adbdfiles), '-DADB_VERSION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -I../boringssl/include -Iadb -Iinclude -Ibase/include -Ilibcrypto_utils/include')
> 
> adbshfiles = %w(
>   fdevent.cpp
>@@ -65,7 +65,7 @@
>   shell_service.cpp
>   shell_service_protocol.cpp
> )
>-libadbsh = compile(expand('adb', adbshfiles), '-DADB_REVISION=\"$PKGVER\" -DADB_HOST=0 -D_Nonnull= -D_Nullable= -fpermissive -Iadb -Iinclude -Ibase/include')
>+libadbsh = compile(expand('adb', adbshfiles), '-DADB_VERSION=\"$PKGVER\" -DADB_HOST=0 -D_Nonnull= -D_Nullable= -fpermissive -Iadb -Iinclude -Ibase/include')
> 
> adbfiles = %w(
>   console.cpp
>@@ -78,7 +78,7 @@
>   transport_mdns.cpp
>   client/main.cpp
> )
>-libadb = compile(expand('adb', adbfiles), '-DADB_REVISION=\"$PKGVER\" -D_GNU_SOURCE -DADB_HOST=1 -D_Nonnull= -D_Nullable= -fpermissive -Iadb -I../mdnsresponder/mDNSShared -Iinclude -Ibase/include')
>+libadb = compile(expand('adb', adbfiles), '-DADB_VERSION=\"$PKGVER\" -D_GNU_SOURCE -DADB_HOST=1 -D_Nonnull= -D_Nullable= -fpermissive -Iadb -I../mdnsresponder/mDNSShared -Iinclude -Ibase/include')
> 
> basefiles = %w(
>   file.cpp
>Index: SPECS/android-tools.spec
>===================================================================
>--- SPECS/android-tools.spec	(rÃ©vision 1322164)
>+++ SPECS/android-tools.spec	(copie de travail)
>@@ -1,58 +1,43 @@
> Name:		android-tools
>-Version:	8.0.0_r4
>-Release:	%mkrel 3
>+Version:	9.0.0_r12
>+Release:	%mkrel 1
> Summary:	Android platform tools (adb, fastboot, mkbootimg)
>-# The entire source code is Apache Software License except fastboot/ which is BSD
>-License:	Apache Software License and BSD
>+# The entire source code is ASL 2.0 except fastboot which is BSD
>+License:    ASL 2.0 and BSD
> Group:		Development/Tools
> URL:		http://developer.android.com/tools/
> #http://developer.android.com/guide/developing/tools/
>-# git clone https://android.googlesource.com/platform/system/core.git && cd core
>-# git archive android-%%{version} --prefix=core-%%{version}/ adb fastboot libzipfile libcutils libmincrypt libsparse mkbootimg include/cutils include/zipfile include/mincrypt | bzip2 > ../core-%%{version}.tar.bz2
>-#
>-# git clone https://android.googlesource.com/platform/system/extras.git && cd extras
>-# git archive android-%%{version} --prefix=extras/ ext4_utils | bzip2 > ../extras-%%{version}.tar.bz2
>+# Use `get_tarballs.sh` to generate the source tarballs
> Source0:	core-%{version}.tar.xz
>-Source1:	extras-%{version}.tar.xz
>-Source2:	generate_build.rb
>-Source3:	boringssl-%{version}.tar.xz
>-Source4:	mdnsresponder-%{version}.tar.xz
>-Source5:	51-android.rules
>-Source6:	adb.service
>+Source1:	boringssl-%{version}.tar.xz
>+Source2:	mdnsresponder-%{version}.tar.xz
>+Source10:	get_tarballs.sh
>+Source11:	generate_build.rb
>+Source12:	51-android.rules
>+Source13:	adb.service
>+
> Patch1:		0001-Add-string-h.patch
> Patch2:		0002-libusb-modifications.patch
>-Patch3:		0003-atomic-fix.patch
>-Patch5:		android-tools-4.4.2-ignore-android_filesystem_capability.h.patch
>-# Fix bug https://bugzilla.redhat.com/show_bug.cgi?id=1441234
>-# crash on openssl
>-Patch6:		0004-bz1441234.patch
>-Patch7:		android-tools-8.0.0_r4-sysmacros.patch
>+Patch4:     0004-bz1441234.patch
>+# https://android-review.googlesource.com/c/platform/system/core/+/740625
>+Patch5:     0005-Add-sysmacros-h.patch
>+
>+BuildRequires:	pkgconfig(gtest)
>+BuildRequires:	pkgconfig(libusb-1.0)
> BuildRequires:	pkgconfig(libselinux)
> BuildRequires:	pkgconfig(openssl)
> BuildRequires:	pkgconfig(zlib)
> BuildRequires:	ruby
> BuildRequires:	ruby(rubygems)
>-BuildRequires:	pkgconfig(libusb-1.0)
>-BuildRequires:	gtest-devel
> 
> Provides:	adb = %{version}-%{release}
> Provides:	fastboot = %{version}-%{release}
> Provides:	mkbootimg = %{version}-%{release}
> 
>-# To create source bundles:
>-# git clone the following repositories:
>-#   https://android.googlesource.com/platform/system/core
>-#   https://android.googlesource.com/platform/system/extras
>-#   https://android.googlesource.com/platform/external/boringssl
>-#   https://android.googlesource.com/platform/external/mdnsresponder
>-#
>-# In each of the git dirs, create an archive for the current (android) version:
>-#   git archive --format=tar --prefix=core-%%{version}/ android-%%{version} adb base fastboot libcrypto_utils libcutils liblog libsparse libsystem libutils libziparchive mkbootimg include | xz  > core-%%{version}.tar.xz
>-#   git archive --format=tar --prefix=extras-%%{version}/ android-%%{version} ext4_utils f2fs_utils | xz  > extras-%%{version}.tar.xz
>-#   git archive --format=tar --prefix=boringssl-%%{version}/ android-%%{version} src/crypto include src/include | xz  > boringssl-%%{version}.tar.xz
>-#   git archive --format=tar --prefix=mdnsresponder-%%{version}/ android-%%{version} mDNSShared | xz  > mdnsresponder-%%{version}.tar.xz
>-#
>-# Move the source bundles to the SOURCE directory of this package.
>+# Bundled bits
>+Provides:   bundled(mdnsresponder)
>+# This is a fork of openssl.
>+Provides:   bundled(boringssl)
> 
> %description
> The Android Debug Bridge (ADB) is used to:
>@@ -73,7 +58,7 @@
> to read and write the flash partitions. It needs the same USB device
> setup between the host and the target phone as adb.
> 
>-For Mageia you must use the following commands :
>+For Mageia you must use the following commands:
> 
> - adb
> - fastboot-android
>@@ -80,32 +65,30 @@
> - mkbootimg
> 
> %prep
>-%setup -q -a 1 -a 3 -a 4 -c %{name}-%{version}
>+%setup -q -a 1 -a 2 -c %{name}-%{version}
> ln -s core-%{version} core
>-ln -s extras-%{version} extras
> ln -s boringssl-%{version} boringssl
> ln -s mdnsresponder-%{version} mdnsresponder
>+
>+pushd core
> %autopatch -p1
>+popd
> 
> %build
> pushd core
>-ruby %{SOURCE2} | tee build.sh
>+ruby %{_sourcedir}/generate_build.rb | tee build.sh
> PKGVER=android-%{version} CXXFLAGS="%{optflags}" CFLAGS="%{optflags}" sh -xe build.sh
> popd
> 
> %install
> install -d -m 0755 %{buildroot}%{_bindir}
>+install -m 0755 -t %{buildroot}%{_bindir} \
>+  adb fastboot simg2img img2simg mkbootimg
>+
> install -d -m 0775 %{buildroot}%{_sharedstatedir}/adb
>-install -m 0755 -t %{buildroot}%{_bindir} core/adb/adb core/fastboot/fastboot core/libsparse/simg2img core/libsparse/img2simg core/mkbootimg/mkbootimg
>-mv %{buildroot}%{_bindir}/fastboot %{buildroot}%{_bindir}/fastboot-android
>+install -D -m0644 %{_sourcedir}/51-android.rules %{buildroot}%{_udevrulesdir}/51-android.rules
>+install -D -m0644 %{_sourcedir}/adb.service %{buildroot}%{_unitdir}/adb.service
> 
>-# for 51-android.rules
>-mkdir -p %{buildroot}%{_udevrulesdir}
>-install -m 0644 %{SOURCE5} %{buildroot}%{_udevrulesdir}/51-android.rules
>-# for adb.service
>-mkdir -p %{buildroot}%{_unitdir}
>-install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/adb.service
>-
> %post
> %_post_service adb
> 
>@@ -117,10 +100,8 @@
> %{_udevrulesdir}/51-android.rules
> %{_unitdir}/adb.service
> %attr(0755,root,root) %dir %{_sharedstatedir}/adb
>-#Apache Software License
> %{_bindir}/adb
>-%{_bindir}/simg2img
>+%{_bindir}/fastboot
> %{_bindir}/img2simg
> %{_bindir}/mkbootimg
>-#Apache Software License and BSD.
>-%{_bindir}/fastboot-android
>+%{_bindir}/simg2img

Index: SOURCES/0001-Add-string-h.patch
===================================================================
--- SOURCES/0001-Add-string-h.patch	(rÃ©vision 1322164)
+++ SOURCES/0001-Add-string-h.patch	(copie de travail)
@@ -1,7 +1,7 @@
-diff --git a/core/base/errors_unix.cpp b/core/base/errors_unix.cpp
+diff --git a/base/errors_unix.cpp b/base/errors_unix.cpp
 index 296995e..48269b6 100644
---- a/core/base/errors_unix.cpp
-+++ b/core/base/errors_unix.cpp
+--- a/base/errors_unix.cpp
++++ b/base/errors_unix.cpp
 @@ -17,6 +17,7 @@
  #include "android-base/errors.h"
  
@@ -10,10 +10,10 @@
  
  namespace android {
  namespace base {
-diff --git a/core/base/file.cpp b/core/base/file.cpp
+diff --git a/base/file.cpp b/base/file.cpp
 index 81b04d7..2fd2b6e 100644
---- a/core/base/file.cpp
-+++ b/core/base/file.cpp
+--- a/base/file.cpp
++++ b/base/file.cpp
 @@ -22,6 +22,7 @@
  #include <sys/stat.h>
  #include <sys/types.h>
@@ -22,10 +22,10 @@
  
  #include <memory>
  #include <mutex>
-diff --git a/core/base/logging.cpp b/core/base/logging.cpp
+diff --git a/base/logging.cpp b/base/logging.cpp
 index 6357b4b..3c7dbce 100644
---- a/core/base/logging.cpp
-+++ b/core/base/logging.cpp
+--- a/base/logging.cpp
++++ b/base/logging.cpp
 @@ -23,6 +23,7 @@
  #include <fcntl.h>
  #include <libgen.h>
Index: SOURCES/0002-libusb-modifications.patch
===================================================================
--- SOURCES/0002-libusb-modifications.patch	(rÃ©vision 1322164)
+++ SOURCES/0002-libusb-modifications.patch	(copie de travail)
@@ -1,7 +1,7 @@
-diff --git a/core/adb/client/usb_libusb.cpp b/core/adb/client/usb_libusb.cpp
+diff --git a/adb/client/usb_libusb.cpp b/adb/client/usb_libusb.cpp
 index 7adb262..b994c8c 100644
---- a/core/adb/client/usb_libusb.cpp
-+++ b/core/adb/client/usb_libusb.cpp
+--- a/adb/client/usb_libusb.cpp
++++ b/adb/client/usb_libusb.cpp
 @@ -27,8 +27,9 @@
  #include <string>
  #include <thread>
Index: SOURCES/0004-bz1441234.patch
===================================================================
--- SOURCES/0004-bz1441234.patch	(rÃ©vision 1322164)
+++ SOURCES/0004-bz1441234.patch	(copie de travail)
@@ -1,7 +1,7 @@
 diff --git a/libcrypto_utils/android_pubkey.c b/libcrypto_utils/android_pubkey.c
 index 3052e52..7061db9 100644
---- a/core/libcrypto_utils/android_pubkey.c
-+++ b/core/libcrypto_utils/android_pubkey.c
+--- a/libcrypto_utils/android_pubkey.c
++++ b/libcrypto_utils/android_pubkey.c
 @@ -126,37 +126,41 @@ bool android_pubkey_encode(const RSA* key, uint8_t* key_buffer, size_t size) {
    BIGNUM* r32 = BN_new();
    BIGNUM* n0inv = BN_new();
Index: SOURCES/generate_build.rb
===================================================================
--- SOURCES/generate_build.rb	(rÃ©vision 1322164)
+++ SOURCES/generate_build.rb	(copie de travail)
@@ -17,10 +17,10 @@
     
     case ext
     when '.c'
-        cc = 'gcc'
+        cc = 'clang'
     	lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
     when '.cpp', '.cc'
-        cc = 'g++'
+        cc = 'clang++'
     	lang_flags = '-std=gnu++14 $CXXFLAGS $CPPFLAGS'
     else
         raise "Unknown extension #{ext}"
@@ -58,7 +58,7 @@
   adb_auth_host.cpp
   sysdeps_unix.cpp
 )
-libadbd = compile(expand('adb', adbdfiles), '-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -I../boringssl/include -Iadb -Iinclude -Ibase/include -Ilibcrypto_utils/include')
+libadbd = compile(expand('adb', adbdfiles), '-DADB_VERSION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -I../boringssl/include -Iadb -Iinclude -Ibase/include -Ilibcrypto_utils/include')
 
 adbshfiles = %w(
   fdevent.cpp
@@ -65,7 +65,7 @@
   shell_service.cpp
   shell_service_protocol.cpp
 )
-libadbsh = compile(expand('adb', adbshfiles), '-DADB_REVISION=\"$PKGVER\" -DADB_HOST=0 -D_Nonnull= -D_Nullable= -fpermissive -Iadb -Iinclude -Ibase/include')
+libadbsh = compile(expand('adb', adbshfiles), '-DADB_VERSION=\"$PKGVER\" -DADB_HOST=0 -D_Nonnull= -D_Nullable= -fpermissive -Iadb -Iinclude -Ibase/include')
 
 adbfiles = %w(
   console.cpp
@@ -78,7 +78,7 @@
   transport_mdns.cpp
   client/main.cpp
 )
-libadb = compile(expand('adb', adbfiles), '-DADB_REVISION=\"$PKGVER\" -D_GNU_SOURCE -DADB_HOST=1 -D_Nonnull= -D_Nullable= -fpermissive -Iadb -I../mdnsresponder/mDNSShared -Iinclude -Ibase/include')
+libadb = compile(expand('adb', adbfiles), '-DADB_VERSION=\"$PKGVER\" -D_GNU_SOURCE -DADB_HOST=1 -D_Nonnull= -D_Nullable= -fpermissive -Iadb -I../mdnsresponder/mDNSShared -Iinclude -Ibase/include')
 
 basefiles = %w(
   file.cpp
Index: SPECS/android-tools.spec
===================================================================
--- SPECS/android-tools.spec	(rÃ©vision 1322164)
+++ SPECS/android-tools.spec	(copie de travail)
@@ -1,58 +1,43 @@
 Name:		android-tools
-Version:	8.0.0_r4
-Release:	%mkrel 3
+Version:	9.0.0_r12
+Release:	%mkrel 1
 Summary:	Android platform tools (adb, fastboot, mkbootimg)
-# The entire source code is Apache Software License except fastboot/ which is BSD
-License:	Apache Software License and BSD
+# The entire source code is ASL 2.0 except fastboot which is BSD
+License:    ASL 2.0 and BSD
 Group:		Development/Tools
 URL:		http://developer.android.com/tools/
 #http://developer.android.com/guide/developing/tools/
-# git clone https://android.googlesource.com/platform/system/core.git && cd core
-# git archive android-%%{version} --prefix=core-%%{version}/ adb fastboot libzipfile libcutils libmincrypt libsparse mkbootimg include/cutils include/zipfile include/mincrypt | bzip2 > ../core-%%{version}.tar.bz2
-#
-# git clone https://android.googlesource.com/platform/system/extras.git && cd extras
-# git archive android-%%{version} --prefix=extras/ ext4_utils | bzip2 > ../extras-%%{version}.tar.bz2
+# Use `get_tarballs.sh` to generate the source tarballs
 Source0:	core-%{version}.tar.xz
-Source1:	extras-%{version}.tar.xz
-Source2:	generate_build.rb
-Source3:	boringssl-%{version}.tar.xz
-Source4:	mdnsresponder-%{version}.tar.xz
-Source5:	51-android.rules
-Source6:	adb.service
+Source1:	boringssl-%{version}.tar.xz
+Source2:	mdnsresponder-%{version}.tar.xz
+Source10:	get_tarballs.sh
+Source11:	generate_build.rb
+Source12:	51-android.rules
+Source13:	adb.service
+
 Patch1:		0001-Add-string-h.patch
 Patch2:		0002-libusb-modifications.patch
-Patch3:		0003-atomic-fix.patch
-Patch5:		android-tools-4.4.2-ignore-android_filesystem_capability.h.patch
-# Fix bug https://bugzilla.redhat.com/show_bug.cgi?id=1441234
-# crash on openssl
-Patch6:		0004-bz1441234.patch
-Patch7:		android-tools-8.0.0_r4-sysmacros.patch
+Patch4:     0004-bz1441234.patch
+# https://android-review.googlesource.com/c/platform/system/core/+/740625
+Patch5:     0005-Add-sysmacros-h.patch
+
+BuildRequires:	pkgconfig(gtest)
+BuildRequires:	pkgconfig(libusb-1.0)
 BuildRequires:	pkgconfig(libselinux)
 BuildRequires:	pkgconfig(openssl)
 BuildRequires:	pkgconfig(zlib)
 BuildRequires:	ruby
 BuildRequires:	ruby(rubygems)
-BuildRequires:	pkgconfig(libusb-1.0)
-BuildRequires:	gtest-devel
 
 Provides:	adb = %{version}-%{release}
 Provides:	fastboot = %{version}-%{release}
 Provides:	mkbootimg = %{version}-%{release}
 
-# To create source bundles:
-# git clone the following repositories:
-#   https://android.googlesource.com/platform/system/core
-#   https://android.googlesource.com/platform/system/extras
-#   https://android.googlesource.com/platform/external/boringssl
-#   https://android.googlesource.com/platform/external/mdnsresponder
-#
-# In each of the git dirs, create an archive for the current (android) version:
-#   git archive --format=tar --prefix=core-%%{version}/ android-%%{version} adb base fastboot libcrypto_utils libcutils liblog libsparse libsystem libutils libziparchive mkbootimg include | xz  > core-%%{version}.tar.xz
-#   git archive --format=tar --prefix=extras-%%{version}/ android-%%{version} ext4_utils f2fs_utils | xz  > extras-%%{version}.tar.xz
-#   git archive --format=tar --prefix=boringssl-%%{version}/ android-%%{version} src/crypto include src/include | xz  > boringssl-%%{version}.tar.xz
-#   git archive --format=tar --prefix=mdnsresponder-%%{version}/ android-%%{version} mDNSShared | xz  > mdnsresponder-%%{version}.tar.xz
-#
-# Move the source bundles to the SOURCE directory of this package.
+# Bundled bits
+Provides:   bundled(mdnsresponder)
+# This is a fork of openssl.
+Provides:   bundled(boringssl)
 
 %description
 The Android Debug Bridge (ADB) is used to:
@@ -73,7 +58,7 @@
 to read and write the flash partitions. It needs the same USB device
 setup between the host and the target phone as adb.
 
-For Mageia you must use the following commands :
+For Mageia you must use the following commands:
 
 - adb
 - fastboot-android
@@ -80,32 +65,30 @@
 - mkbootimg
 
 %prep
-%setup -q -a 1 -a 3 -a 4 -c %{name}-%{version}
+%setup -q -a 1 -a 2 -c %{name}-%{version}
 ln -s core-%{version} core
-ln -s extras-%{version} extras
 ln -s boringssl-%{version} boringssl
 ln -s mdnsresponder-%{version} mdnsresponder
+
+pushd core
 %autopatch -p1
+popd
 
 %build
 pushd core
-ruby %{SOURCE2} | tee build.sh
+ruby %{_sourcedir}/generate_build.rb | tee build.sh
 PKGVER=android-%{version} CXXFLAGS="%{optflags}" CFLAGS="%{optflags}" sh -xe build.sh
 popd
 
 %install
 install -d -m 0755 %{buildroot}%{_bindir}
+install -m 0755 -t %{buildroot}%{_bindir} \
+  adb fastboot simg2img img2simg mkbootimg
+
 install -d -m 0775 %{buildroot}%{_sharedstatedir}/adb
-install -m 0755 -t %{buildroot}%{_bindir} core/adb/adb core/fastboot/fastboot core/libsparse/simg2img core/libsparse/img2simg core/mkbootimg/mkbootimg
-mv %{buildroot}%{_bindir}/fastboot %{buildroot}%{_bindir}/fastboot-android
+install -D -m0644 %{_sourcedir}/51-android.rules %{buildroot}%{_udevrulesdir}/51-android.rules
+install -D -m0644 %{_sourcedir}/adb.service %{buildroot}%{_unitdir}/adb.service
 
-# for 51-android.rules
-mkdir -p %{buildroot}%{_udevrulesdir}
-install -m 0644 %{SOURCE5} %{buildroot}%{_udevrulesdir}/51-android.rules
-# for adb.service
-mkdir -p %{buildroot}%{_unitdir}
-install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/adb.service
-
 %post
 %_post_service adb
 
@@ -117,10 +100,8 @@
 %{_udevrulesdir}/51-android.rules
 %{_unitdir}/adb.service
 %attr(0755,root,root) %dir %{_sharedstatedir}/adb
-#Apache Software License
 %{_bindir}/adb
-%{_bindir}/simg2img
+%{_bindir}/fastboot
 %{_bindir}/img2simg
 %{_bindir}/mkbootimg
-#Apache Software License and BSD.
-%{_bindir}/fastboot-android
+%{_bindir}/simg2img

Actions: View | Diff

Attachments on bug 23672: 10400 | 10487