The package rpms/android-tools.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/android-tools.git/commit/?id=e5a8....
Change:
-%ifnarch ppc64le
Thanks.
Full change:
============
commit e5a8c6324cfd3857bda716b868103b0d12121802
Author: Ivan Afonichev <ivanaf(a)yandex-team.ru>
Date: Thu Jan 4 01:20:43 2024 +0400
Boringssl dropped support for ppc64le
diff --git a/Disable-e2fsdroid-for-ppc64le.patch b/Disable-e2fsdroid-for-ppc64le.patch
deleted file mode 100644
index 0411bc8..0000000
--- a/Disable-e2fsdroid-for-ppc64le.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up android-tools-33.0.3p1/vendor/CMakeLists.mke2fs.txt.orig
android-tools-33.0.3p1/vendor/CMakeLists.mke2fs.txt
---- android-tools-33.0.3p1/vendor/CMakeLists.mke2fs.txt.orig 2022-07-13
18:44:44.000000000 +0200
-+++ android-tools-33.0.3p1/vendor/CMakeLists.mke2fs.txt 2022-11-06 08:51:50.692313421
+0100
-@@ -117,27 +117,6 @@ target_link_libraries("${ANDROID_MKE2FS_
- target_include_directories("${ANDROID_MKE2FS_NAME}" PRIVATE
- e2fsprogs/lib)
-
--add_executable(e2fsdroid
-- e2fsprogs/contrib/android/e2fsdroid.c
-- e2fsprogs/contrib/android/basefs_allocator.c
-- e2fsprogs/contrib/android/block_range.c
-- e2fsprogs/contrib/android/base_fs.c
-- e2fsprogs/contrib/android/fsmap.c
-- e2fsprogs/contrib/android/block_list.c
-- e2fsprogs/contrib/android/perms.c)
--
--include(CheckIncludeFile)
--CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
--
--if(HAVE_SYS_TYPES_H)
-- target_compile_definitions(e2fsdroid PUBLIC HAVE_SYS_TYPES_H)
--endif(HAVE_SYS_TYPES_H)
--
--target_link_libraries(e2fsdroid
-- libext2fs libsparse libzip libcutils liblog libutil libbase libselinux libsepol z
pcre2-8 pthread)
--target_include_directories(e2fsdroid PRIVATE
-- e2fsprogs/lib e2fsprogs/lib/ext2fs selinux/libselinux/include core/libcutils/include
e2fsprogs/misc)
--
- add_executable(ext2simg
- e2fsprogs/contrib/android/ext2simg.c)
-
-diff -up android-tools-33.0.3p1/vendor/CMakeLists.txt.orig
android-tools-33.0.3p1/vendor/CMakeLists.txt
---- android-tools-33.0.3p1/vendor/CMakeLists.txt.orig 2022-11-05 10:01:04.000000000
+0100
-+++ android-tools-33.0.3p1/vendor/CMakeLists.txt 2022-11-06 09:09:11.351267287 +0100
-@@ -89,7 +89,6 @@ install(TARGETS
- lpmake
- lpunpack
- simg2img
-- e2fsdroid
- ext2simg
- DESTINATION bin)
-
diff --git a/android-tools.spec b/android-tools.spec
index ca9917f..94c917c 100644
--- a/android-tools.spec
+++ b/android-tools.spec
@@ -14,9 +14,6 @@ URL:
http://developer.android.com/guide/developing/tools/
Source0:
https://github.com/nmeum/%{name}/releases/download/%{version}/%{name}-%{v...
Source1: 51-android.rules
Source2: adb.service
-# e2fsdroid doesn't build on ppc64le
-# See
https://github.com/tytso/e2fsprogs/issues/127
-Patch0: Disable-e2fsdroid-for-ppc64le.patch
BuildRequires: brotli-devel
BuildRequires: cmake
@@ -46,7 +43,8 @@ Provides: mke2fs.android = %{epoch}:%{version}-%{release}
Provides: bundled(boringssl)
# Bundled boringssl doesn't support the big endian architectures rhbz 1431379
-ExcludeArch: ppc ppc64 s390x
+# And dropped ppc64le support:
https://github.com/google/boringssl/commit/7d2338d000eb1468a5bbf78e918542...
+ExcludeArch: ppc ppc64 s390x ppc64le
%description
@@ -70,9 +68,6 @@ setup between the host and the target phone as adb.
%prep
%setup -q
-%ifarch ppc64le
-%patch0 -p1
-%endif
cp -p %{SOURCE1} 51-android.rules
%build
@@ -109,9 +104,6 @@ install -d -m 0775 ${RPM_BUILD_ROOT}%{_sharedstatedir}/adb
%{_bindir}/img2simg
%{_bindir}/fastboot
%{_bindir}/append2simg
-%ifnarch ppc64le
-%{_bindir}/e2fsdroid
-%endif
%{_bindir}/ext2simg
%{_bindir}/lpadd
%{_bindir}/lpdump
commit 04c4fbfb2f842d4cc61ce725b68962cf8744e289
Author: Ivan Afonichev <ivanaf(a)yandex-team.ru>
Date: Sun Nov 5 03:25:54 2023 +0400
Upload new version
diff --git a/sources b/sources
index 5d9d6a2..68bfd7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (android-tools-33.0.3p1.tar.xz) =
22ed3d9a71a962764998c8c4759215d24a1af121d43942c77c00878d636aea16a6b940811624bb1ae56ac416922d7262d5ced5436e646fe2dae0944b593ad4fe
+SHA512 (android-tools-34.0.4.tar.xz) =
34753bbbe9ed15ce0abc54c0fce4ecd69dc8b8db734169bd2473ac439d1c414301e798493b6b31cb00ed47d5314cabfb2c56d52dab0fe2a804125ebfbcbd18c5
commit d9c2f6c95b66ac4a1f22ce524980a85fdb6d7060
Author: Ivan Afonichev <ivanaf(a)yandex-team.ru>
Date: Sat Nov 4 03:32:00 2023 +0400
Update to 34.0.4
diff --git a/android-tools.spec b/android-tools.spec
index d4a5a52..ca9917f 100644
--- a/android-tools.spec
+++ b/android-tools.spec
@@ -1,7 +1,7 @@
%global _hardened_build 1
Name: android-tools
-Version: 33.0.3p1
+Version: 34.0.4
Release: %autorelease
Epoch: 1
Summary: Android platform tools(adb, fastboot)