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 2024-03-17 22:14:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/android-tools (Old)
and /work/SRC/openSUSE:Factory/.android-tools.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "android-tools"
Sun Mar 17 22:14:52 2024 rev:15 rq:1158477 version:34.0.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes
2023-10-02 20:08:35.307383330 +0200
+++ /work/SRC/openSUSE:Factory/.android-tools.new.1905/android-tools.changes
2024-03-17 22:15:14.946728062 +0100
@@ -1,0 +2,13 @@
+Sat Mar 16 12:56:32 UTC 2024 - mun...@googlemail.com
+
+- Use custom %python3_fix_shebang_path macro for Leap
+
+-------------------------------------------------------------------
+Fri Mar 15 18:24:27 UTC 2024 - mun...@googlemail.com
+
+- Add upstream patch fix-add-sload_f2fs-tool.patch
+ (gh#nmeum/android-tools#127) for the missing tool sload_f2fs
+- Rework python3 dependencies (use %python3_fix_shebang for
+ Factory)
+
+-------------------------------------------------------------------
New:
----
fix-add-sload_f2fs-tool.patch
BETA DEBUG BEGIN:
New:
- Add upstream patch fix-add-sload_f2fs-tool.patch
(gh#nmeum/android-tools#127) for the missing tool sload_f2fs
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ android-tools.spec ++++++
--- /var/tmp/diff_new_pack.gp3mZY/_old 2024-03-17 22:15:15.878762157 +0100
+++ /var/tmp/diff_new_pack.gp3mZY/_new 2024-03-17 22:15:15.882762304 +0100
@@ -1,7 +1,7 @@
#
# spec file for package android-tools
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,15 +16,12 @@
#
-%define _pyn 3
-%define _pyd 3
+%define _pyver 3
%if 0%{?sle_version} == 150500 || 0%{?sle_version} == 150600
-%define _pyn 311
-%define _pyd 3.11
+%define _pyver 311
%endif
%if 0%{?sle_version} == 150400
-%define _pyn 310
-%define _pyd 3.10
+%define _pyver 310
%endif
Name: android-tools
@@ -37,15 +34,17 @@
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)
+# PATCH-FEATURE-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
+# PATCH-FEATURE-UPSTREAM fix-add-sload_f2fs-tool.patch -- based on PR 128
(gh#nmeum/android-tools#127)
+Patch2: fix-add-sload_f2fs-tool.patch
BuildRequires: clang
BuildRequires: cmake >= 3.12
BuildRequires: go
BuildRequires: llvm-gold
BuildRequires: ninja
BuildRequires: pkgconfig
-BuildRequires: python%{_pyn}
+BuildRequires: python%{_pyver}
BuildRequires: pkgconfig(gtest)
BuildRequires: pkgconfig(libbrotlicommon)
BuildRequires: pkgconfig(liblz4)
@@ -96,12 +95,6 @@
%prep
%autosetup -a2 -p1
-# fix env-script-interpreter
-sed -e '1s|^#!.*|#!/usr/bin/python%{_pyd}|' -i vendor/avb/avbtool.py \
- vendor/mkbootimg/{mk,repack_,unpack_}bootimg.py \
- vendor/mkbootimg/gki/generate_gki_certificate.py \
- vendor/libufdt/utils/src/mkdtboimg.py
-
%build
%define __builder ninja
export GOFLAGS="-buildmode=pie -trimpath -ldflags=-buildid="
@@ -115,6 +108,18 @@
%install
%cmake_install
+# fix env-script-interpreter (Leap requires special handling)
+%if 0%{?suse_version} <= 1500
+%define
python3_fix_shebang_path(+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-=)
\
+myargs="%{**}" \
+for f in ${myargs}; do \
+ [ -f $f ] && sed -i "1s@#\\!.*python.*@#\\!$(realpath
%{expand:%{__python%{_pyver}}})@" $f \
+done
+%endif
+%python3_fix_shebang_path %{buildroot}%{_bindir}/*
+%python3_fix_shebang_path %{buildroot}%{_datadir}/%{name}/mkbootimg/*
+%python3_fix_shebang_path %{buildroot}%{_datadir}/%{name}/mkbootimg/gki/*
+
# fix non-executable-script
chmod 0755
%{buildroot}%{_datadir}/%{name}/mkbootimg/gki/generate_gki_certificate.py
@@ -142,6 +147,7 @@
%{_bindir}/make_f2fs
%{_bindir}/mke2fs.android
%{_bindir}/simg2img
+%{_bindir}/sload_f2fs
%{_mandir}/man1/adb.1%{?ext_man}
%{_mandir}/man1/avbtool.1%{?ext_man}
%{_mandir}/man1/fastboot.1%{?ext_man}
++++++ fix-add-sload_f2fs-tool.patch ++++++
>From 3b12260597d17ad582a23c3d8183de85dcbb64c9 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbap...@gmail.com>
Date: Fri, 17 Nov 2023 20:44:41 +0530
Subject: [PATCH] CMake: Add sload_f2fs tool
---
vendor/CMakeLists.f2fstools.txt | 52 +++++++++++++++++++++++++++++----
vendor/CMakeLists.txt | 1 +
3 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/vendor/CMakeLists.f2fstools.txt b/vendor/CMakeLists.f2fstools.txt
index 152cc37..7fdf640 100644
--- a/vendor/CMakeLists.f2fstools.txt
+++ b/vendor/CMakeLists.f2fstools.txt
@@ -1,6 +1,13 @@
# SPDX-License-Identifier: Apache-2.0
# CMakeLists.f2fstools.txt: CMake file for f2fs-tools directory
+set(f2fs_tools_defaults
+ -DF2FS_MAJOR_VERSION=1
+ -DF2FS_MINOR_VERSION=16
+ -DF2FS_TOOLS_VERSION="1.16.0"
+ -DF2FS_TOOLS_DATE="2023-04-11"
+ -DWITH_ANDROID)
+
add_library(libf2fs STATIC
f2fs-tools/lib/libf2fs.c
f2fs-tools/mkfs/f2fs_format.c
@@ -9,11 +16,7 @@ add_library(libf2fs STATIC
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
+ ${f2fs_tools_defaults}
-DWITH_BLKDISCARD)
target_include_directories(libf2fs PUBLIC
@@ -29,3 +32,42 @@ add_executable(make_f2fs
target_link_libraries(make_f2fs PRIVATE
libf2fs libsparse z)
+
+set(fsck_main_src_files
+ f2fs-tools/fsck/dir.c
+ f2fs-tools/fsck/dict.c
+ f2fs-tools/fsck/mkquota.c
+ f2fs-tools/fsck/quotaio.c
+ f2fs-tools/fsck/quotaio_tree.c
+ f2fs-tools/fsck/quotaio_v2.c
+ f2fs-tools/fsck/node.c
+ f2fs-tools/fsck/segment.c
+ f2fs-tools/fsck/xattr.c
+ f2fs-tools/fsck/main.c
+ f2fs-tools/fsck/mount.c
+ f2fs-tools/lib/libf2fs.c
+ f2fs-tools/lib/libf2fs_io.c
+ f2fs-tools/lib/libf2fs_zoned.c
+ f2fs-tools/lib/nls_utf8.c
+ f2fs-tools/fsck/dump.c)
+
+add_executable(sload_f2fs
+ ${fsck_main_src_files}
+ f2fs-tools/fsck/fsck.c
+ f2fs-tools/fsck/sload.c
+ f2fs-tools/fsck/compress.c)
+
+target_compile_definitions(sload_f2fs PRIVATE
+ ${f2fs_tools_defaults}
+ -DWITH_SLOAD)
+
+target_include_directories(sload_f2fs PRIVATE
+ f2fs-tools/include
+ selinux/libselinux/include
+ core/libsparse/include
+ core/libcutils/include)
+
+target_link_libraries(sload_f2fs PRIVATE
+ libsparse libselinux libcutils z
+ PkgConfig::libpcre2-8
+ PkgConfig::liblz4)
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
index 6690dd9..0b6d0aa 100644
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -109,6 +109,7 @@ install(TARGETS
lpmake
lpunpack
make_f2fs
+ sload_f2fs
simg2img
e2fsdroid
ext2simg
