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..9ded040 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}-%{version}.tar.xz 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 @@ -70,9 +67,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 +103,7 @@ 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