rpms/android-tools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ppc64le patch to be ready for upstream

Browse source
This commit is contained in:
Ivan Afonichev 2024-01-03 14:28:03 +04:00
commit 7a0b225559
2 changed files with 35 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

73
Disable-e2fsdroid-for-ppc64le.patch
View file

@ -1,42 +1,39 @@
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_
diff --git a/vendor/CMakeLists.mke2fs.txt b/vendor/CMakeLists.mke2fs.txt
index 3073fe4..da2940c 100644
--- a/vendor/CMakeLists.mke2fs.txt
+++ b/vendor/CMakeLists.mke2fs.txt
@@ -129,6 +129,7 @@ target_link_libraries("${ANDROID_MKE2FS_NAME}"
target_include_directories("${ANDROID_MKE2FS_NAME}" PRIVATE
e2fsprogs/lib)
e2fsprogs/lib)
+if( NOT CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" )
add_executable(e2fsdroid
e2fsprogs/contrib/android/e2fsdroid.c
e2fsprogs/contrib/android/basefs_allocator.c
@@ -151,6 +152,7 @@ target_link_libraries(e2fsdroid
target_include_directories(e2fsdroid PRIVATE
e2fsprogs/lib e2fsprogs/lib/ext2fs selinux/libselinux/include
core/libcutils/include e2fsprogs/misc)
+endif()
-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)
e2fsprogs/contrib/android/ext2simg.c)
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
index 0b6d0aa..01f82a7 100644
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -111,10 +111,13 @@ install(TARGETS
make_f2fs
sload_f2fs
simg2img
- e2fsdroid
ext2simg
DESTINATION bin)
+if( NOT CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" )
+install(TARGETS "${ANDROID_MKE2FS_NAME}" e2fsdroid DESTINATION bin)
+endif()
+
# Install common completion files.
install(FILES adb/adb.bash RENAME adb DESTINATION "${COMPLETION_COMMON_DIR}")
install(FILES core/fastboot/fastboot.bash RENAME fastboot DESTINATION "${COMPLETION_COMMON_DIR}")

2
android-tools.spec
View file

@ -70,9 +70,7 @@ 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