Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package android-tools for openSUSE:Factory checked in at 2022-06-10 15:57:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/android-tools (Old) and /work/SRC/openSUSE:Factory/.android-tools.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "android-tools" Fri Jun 10 15:57:46 2022 rev:3 rq:982013 version:31.0.3p1 Changes: -------- --- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes 2021-10-27 22:21:19.491202326 +0200 +++ /work/SRC/openSUSE:Factory/.android-tools.new.1548/android-tools.changes 2022-06-10 15:58:07.356863372 +0200 @@ -1,0 +2,19 @@ +Fri Jun 10 05:12:20 UTC 2022 - [email protected] + +- Add fix-add-functional-include.patch (fix gcc 12 build) +- Remove fix-pie-build.patch (obsolete) + +------------------------------------------------------------------- +Wed Jan 5 13:34:09 UTC 2022 - [email protected] + +- Update to version 31.0.3p1 + * Fixes boringssl build failure with GCC 11.2.1 (e86eabe) + * Add boot.img manipulation tools (#52) + * Add Dynamic Partition Tools (#51) + +- Split parts of the main package into 'mkbootimg' and 'partition' +- Remove sub-package 'python3' (avbtool is now part of the main + package, mkbootimg part of the sub-package 'mkbootimg') +- Remove fix-install-python-tools.patch + +------------------------------------------------------------------- Old: ---- android-tools-31.0.3.tar.xz fix-install-python-tools.patch fix-pie-build.patch New: ---- android-tools-31.0.3p1.tar.xz fix-add-functional-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ android-tools.spec ++++++ --- /var/tmp/diff_new_pack.8zqlae/_old 2022-06-10 15:58:08.236864438 +0200 +++ /var/tmp/diff_new_pack.8zqlae/_new 2022-06-10 15:58:08.240864443 +0200 @@ -1,7 +1,7 @@ # # spec file for package android-tools # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: android-tools -Version: 31.0.3 +Version: 31.0.3p1 Release: 0 Summary: Android platform tools License: Apache-2.0 AND MIT @@ -25,14 +25,12 @@ URL: https://developer.android.com/studio/releases/platform-tools Source0: https://github.com/nmeum/android-tools/releases/download/%{version}/%{name}-%{version}.tar.xz Source1: vendor.tar.gz -# PATCH-FIX-OPENSUSE fix-pie-build.patch boo#1185883 [email protected] -- Build with -fPIE/-pie -Patch0: fix-pie-build.patch # PATCH-FIX-OPENSUSE fix-install-completion.patch boo#1185883 [email protected] -- Simplify completion -Patch1: fix-install-completion.patch +Patch0: fix-install-completion.patch # PATCH-FEATURE-OPENSUSE fix-add-e2fsprogs-contrib.patch boo#1185883 [email protected] -- Some more e2fsprogs tools -Patch2: fix-add-e2fsprogs-contrib.patch -# PATCH-FEATURE-OPENSUSE fix-install-python-tools.patch boo#1185883 [email protected] -- Some python3 tools -Patch3: fix-install-python-tools.patch +Patch1: fix-add-e2fsprogs-contrib.patch +# PATCH-FIX-OPENSUSE fix-add-functional-include.patch [email protected] -- Fix gcc 12 build +Patch2: fix-add-functional-include.patch BuildRequires: cmake >= 3.1 BuildRequires: go BuildRequires: gtest @@ -47,28 +45,39 @@ BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(protobuf) Requires: android-udev-rules +Requires: python3 +Suggests: %{name}-mkbootimg = %{version} +Suggests: %{name}-partition = %{version} +Provides: %{name}-python3 = %{version}-%{release} +Obsoletes: %{name}-python3 < %{version}-%{release} %if 0%{?suse_version} <= 1500 BuildRequires: gcc10 BuildRequires: gcc10-c++ %else -BuildRequires: gcc >= 10 -BuildRequires: gcc-c++ >= 10 +BuildRequires: gcc-c++ %endif %description Android SDK Platform-Tools is a component for the Android SDK. It includes tools that interface with the Android platform. -%package python3 -Summary: Python3 Android platform tools +%package mkbootimg +Summary: Android boot.img manipulation tools Group: Hardware/Mobile Requires: %{name} = %{version} Requires: python3 -Supplements: (%{name} and python3) BuildArch: noarch -%description python3 -Additional Android platform tools that require python3. +%description mkbootimg +This package contains the Android boot.img manipulation tools. + +%package partition +Summary: Android dynamic partition tools +Group: Hardware/Mobile +Requires: %{name} = %{version} + +%description partition +This package contains the Android dynamic partition tools. %package bash-completion Summary: Bash completion for android-tools @@ -85,6 +94,10 @@ %autosetup -p1 tar xf %{SOURCE1} -C vendor/boringssl +# fix env-script-interpreter +sed -e '1s|^#!.*|#!/usr/bin/python3|' -i vendor/avb/avbtool.py \ + vendor/mkbootimg/{mk,repack_,unpack_}bootimg.py + %build %define __builder ninja %if 0%{?suse_version} <= 1500 @@ -101,17 +114,25 @@ %install %cmake_install +# install avbtool +cp -pd vendor/avb/avbtool{,.py} %{buildroot}%{_bindir} + # generate man pages +export PATH=%{buildroot}%{_bindir}:$PATH install -d -m 0755 %{buildroot}%{_mandir}/man1 for f in adb fastboot do help2man -N %{buildroot}%{_bindir}/${f} | sed -e 's|\(/home/.*\)\(/usr/.*\)|\2|g' \ > %{buildroot}%{_mandir}/man1/${f}.1 done -for f in avbtool mkbootimg +for f in lp{add,dump,flash,unpack} do - help2man -N %{buildroot}%{_bindir}/${f} --version-string="%{version}" \ - > %{buildroot}%{_mandir}/man1/${f}.1 + help2man -N --no-discard-stderr --help-option="-h" --version-string="%{version}" \ + ${f} > %{buildroot}%{_mandir}/man1/${f}.1 +done +for f in avbtool {mk,repack_,unpack_}bootimg +do + help2man -N --version-string="%{version}" ${f} > %{buildroot}%{_mandir}/man1/${f}.1 done %files @@ -119,6 +140,7 @@ %doc README.md %{_bindir}/adb %{_bindir}/append2simg +%{_bindir}/avbtool{,.py} %{_bindir}/e2fsdroid %{_bindir}/ext2simg %{_bindir}/fastboot @@ -126,13 +148,19 @@ %{_bindir}/mke2fs.android %{_bindir}/simg2img %{_mandir}/man1/adb.1%{?ext_man} +%{_mandir}/man1/avbtool.1%{?ext_man} %{_mandir}/man1/fastboot.1%{?ext_man} -%files python3 -%{_bindir}/avbtool{,.py} -%{_bindir}/mkbootimg -%{_mandir}/man1/avbtool.1%{?ext_man} -%{_mandir}/man1/mkbootimg.1%{?ext_man} +%files mkbootimg +%license LICENSE +%{_bindir}/{mk,repack_,unpack_}bootimg +%{_mandir}/man1/{mk,repack_,unpack_}bootimg.1%{?ext_man} + +%files partition +%license LICENSE +%doc vendor/extras/partition_tools/README.md +%{_bindir}/lp{add,dump,flash,make,unpack} +%{_mandir}/man1/lp{add,dump,flash,unpack}.1%{?ext_man} %files bash-completion %{_datadir}/bash-completion/completions/adb ++++++ fix-add-e2fsprogs-contrib.patch ++++++ --- /var/tmp/diff_new_pack.8zqlae/_old 2022-06-10 15:58:08.280864492 +0200 +++ /var/tmp/diff_new_pack.8zqlae/_new 2022-06-10 15:58:08.280864492 +0200 @@ -30,13 +30,13 @@ diff -ruN a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt -@@ -66,7 +66,7 @@ - - # Targets which should be installed by `make install`. - install(TARGETS adb fastboot "${ANDROID_MKE2FS_NAME}" -- simg2img img2simg append2simg DESTINATION bin) -+ simg2img img2simg append2simg e2fsdroid ext2simg DESTINATION bin) - - # Install common completion files. - install(FILES adb/adb.bash RENAME adb DESTINATION "${COMPLETION_COMMON_DIR}") +@@ -73,6 +73,8 @@ + append2simg + fastboot + img2simg ++ e2fsdroid ++ ext2simg + lpadd + lpdump + lpflash ++++++ fix-add-functional-include.patch ++++++ --- a/vendor/adb/tls/include/adb/tls/tls_connection.h +++ b/vendor/adb/tls/include/adb/tls/tls_connection.h @@ -19,6 +19,7 @@ #include <stddef.h> #include <stdint.h> +#include <functional> #include <string_view> #include <vector> ++++++ fix-install-completion.patch ++++++ --- /var/tmp/diff_new_pack.8zqlae/_old 2022-06-10 15:58:08.300864516 +0200 +++ /var/tmp/diff_new_pack.8zqlae/_new 2022-06-10 15:58:08.300864516 +0200 @@ -1,7 +1,7 @@ diff -ruN a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -9,8 +9,7 @@ +@@ -6,8 +6,7 @@ include(GNUInstallDirs) # Install bash/zsh completion files. ++++++ vendor.tar.gz ++++++
