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 2023-10-02 20:06:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/android-tools (Old)
and /work/SRC/openSUSE:Factory/.android-tools.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "android-tools"
Mon Oct 2 20:06:07 2023 rev:14 rq:1114525 version:34.0.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes
2023-09-06 19:02:19.556397965 +0200
+++ /work/SRC/openSUSE:Factory/.android-tools.new.28202/android-tools.changes
2023-10-02 20:08:35.307383330 +0200
@@ -1,0 +2,7 @@
+Sat Sep 30 06:30:41 UTC 2023 - mun...@googlemail.com
+
+- Add upstream patch fix-add-make_f2fs-tool-for-fastboot.patch
+ (gh#nmeum/android-tools#109)
+- Remove the requirement for f2fs-tools
+
+-------------------------------------------------------------------
New:
----
fix-add-make_f2fs-tool-for-fastboot.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ android-tools.spec ++++++
--- /var/tmp/diff_new_pack.1mz3rp/_old 2023-10-02 20:08:36.575428932 +0200
+++ /var/tmp/diff_new_pack.1mz3rp/_new 2023-10-02 20:08:36.579429076 +0200
@@ -37,9 +37,10 @@
Source2: man-pages.tar.gz
# PATCH-FIX-OPENSUSE fix-install-completion.patch boo#1185883
mun...@googlemail.com -- Simplify completion
Patch0: fix-install-completion.patch
+# PATCH-FIX-UPSTREAM fix-add-make_f2fs-tool-for-fastboot.patch -- based on PR
125 (gh#nmeum/android-tools#109)
+Patch1: fix-add-make_f2fs-tool-for-fastboot.patch
BuildRequires: clang
BuildRequires: cmake >= 3.12
-BuildRequires: f2fs-tools
BuildRequires: go
BuildRequires: llvm-gold
BuildRequires: ninja
@@ -54,7 +55,6 @@
BuildRequires: pkgconfig(libzstd)
BuildRequires: pkgconfig(protobuf)
Requires: android-udev-rules
-Requires: f2fs-tools
Suggests: %{name}-mkbootimg = %{version}
Suggests: %{name}-partition = %{version}
Provides: %{name}-python3 = %{version}-%{release}
@@ -115,9 +115,6 @@
%install
%cmake_install
-# required by 'fastboot format:f2fs ...'
-ln -s %{_sbindir}/mkfs.f2fs %{buildroot}%{_bindir}/make_f2fs
-
# fix non-executable-script
chmod 0755
%{buildroot}%{_datadir}/%{name}/mkbootimg/gki/generate_gki_certificate.py
++++++ fix-add-make_f2fs-tool-for-fastboot.patch ++++++
>From 1bb6013ee4ab1dbc5339552219479cb5acbb7530 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbap...@gmail.com>
Date: Sat, 16 Sep 2023 11:33:54 +0530
Subject: [PATCH] CMake: Add make_f2fs tool for fastboot
make_f2fs tool is reqired by fastboot. If the make_f2fs executable is
not present the following error is shown.
$ fastboot format:f2fs userdata
/usr/bin/make_f2fs failed with status 1
fastboot: error: Cannot generate image for userdata
This commit also splits libext2_uuid static library from libext2fs
---
vendor/CMakeLists.f2fstools.txt | 31 +++++++++++++++++++++++++++++++
vendor/CMakeLists.mke2fs.txt | 25 ++++++++++++++++++-------
vendor/CMakeLists.txt | 2 ++
4 files changed, 53 insertions(+), 7 deletions(-)
create mode 100644 vendor/CMakeLists.f2fstools.txt
diff --git a/vendor/CMakeLists.f2fstools.txt b/vendor/CMakeLists.f2fstools.txt
new file mode 100644
index 0000000..152cc37
--- /dev/null
+++ b/vendor/CMakeLists.f2fstools.txt
@@ -0,0 +1,31 @@
+# SPDX-License-Identifier: Apache-2.0
+# CMakeLists.f2fstools.txt: CMake file for f2fs-tools directory
+
+add_library(libf2fs STATIC
+ f2fs-tools/lib/libf2fs.c
+ f2fs-tools/mkfs/f2fs_format.c
+ f2fs-tools/mkfs/f2fs_format_utils.c
+ f2fs-tools/lib/libf2fs_zoned.c
+ f2fs-tools/lib/nls_utf8.c)
+
+target_compile_definitions(libf2fs PUBLIC
+ -DF2FS_MAJOR_VERSION=1
+ -DF2FS_MINOR_VERSION=16
+ -DF2FS_TOOLS_VERSION="1.16.0"
+ -DF2FS_TOOLS_DATE="2023-04-11"
+ -DWITH_ANDROID
+ -DWITH_BLKDISCARD)
+
+target_include_directories(libf2fs PUBLIC
+ core/libsparse/include
+ f2fs-tools/include)
+
+target_link_libraries(libf2fs PUBLIC
+ libext2_uuid)
+
+add_executable(make_f2fs
+ f2fs-tools/lib/libf2fs_io.c
+ f2fs-tools/mkfs/f2fs_format_main.c)
+
+target_link_libraries(make_f2fs PRIVATE
+ libf2fs libsparse z)
diff --git a/vendor/CMakeLists.mke2fs.txt b/vendor/CMakeLists.mke2fs.txt
index 5c0708d..3073fe4 100644
--- a/vendor/CMakeLists.mke2fs.txt
+++ b/vendor/CMakeLists.mke2fs.txt
@@ -1,3 +1,18 @@
+add_library(libext2_uuid STATIC
+ e2fsprogs/lib/uuid/clear.c
+ e2fsprogs/lib/uuid/compare.c
+ e2fsprogs/lib/uuid/copy.c
+ e2fsprogs/lib/uuid/gen_uuid.c
+ e2fsprogs/lib/uuid/isnull.c
+ e2fsprogs/lib/uuid/pack.c
+ e2fsprogs/lib/uuid/parse.c
+ e2fsprogs/lib/uuid/unpack.c
+ e2fsprogs/lib/uuid/unparse.c
+ e2fsprogs/lib/uuid/uuid_time.c)
+
+target_include_directories(libext2_uuid PUBLIC
+ e2fsprogs/lib)
+
add_library(libext2fs STATIC
e2fsprogs/lib/blkid/cache.c
e2fsprogs/lib/blkid/dev.c
@@ -95,18 +110,14 @@ add_library(libext2fs STATIC
e2fsprogs/lib/support/quotaio.c
e2fsprogs/lib/support/quotaio_tree.c
e2fsprogs/lib/support/quotaio_v2.c
- e2fsprogs/lib/uuid/clear.c
- e2fsprogs/lib/uuid/gen_uuid.c
- e2fsprogs/lib/uuid/isnull.c
- e2fsprogs/lib/uuid/pack.c
- e2fsprogs/lib/uuid/parse.c
- e2fsprogs/lib/uuid/unpack.c
- e2fsprogs/lib/uuid/unparse.c
e2fsprogs/misc/create_inode.c)
target_include_directories(libext2fs PRIVATE
e2fsprogs/lib e2fsprogs/lib/ext2fs core/libsparse/include)
+target_link_libraries(libext2fs PUBLIC
+ libext2_uuid)
+
add_executable("${ANDROID_MKE2FS_NAME}"
e2fsprogs/misc/default_profile.c
e2fsprogs/misc/mke2fs.c
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
index 0ea7a01..6690dd9 100644
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -89,6 +89,7 @@ include(CMakeLists.libandroidfw.txt)
include(CMakeLists.adb.txt)
include(CMakeLists.sparse.txt)
include(CMakeLists.fastboot.txt)
+include(CMakeLists.f2fstools.txt)
include(CMakeLists.mke2fs.txt)
include(CMakeLists.partition.txt)
include(CMakeLists.mkbootimg.txt)
@@ -107,6 +108,7 @@ install(TARGETS
lpflash
lpmake
lpunpack
+ make_f2fs
simg2img
e2fsdroid
ext2simg
