diff --git a/0001-hikptool-Update-CMake-to-version-3.10.0.patch b/0001-hikptool-Update-CMake-to-version-3.10.0.patch new file mode 100644 index 0000000000000000000000000000000000000000..20f35c1d4d75fb86a2397df1b3b5f136fd545fe1 --- /dev/null +++ b/0001-hikptool-Update-CMake-to-version-3.10.0.patch @@ -0,0 +1,71 @@ +From f1437403cdb16d0cc1df29b8dee2ec511313155a Mon Sep 17 00:00:00 2001 +From: Jiaqi Cheng +Date: Thu, 18 Dec 2025 16:59:29 +0800 +Subject: [PATCH] hikptool: Update CMake to version 3.10.0 + +The compilation access control requires that the +CMake version must be 3.10.0 or higher. + +Signed-off-by: Jiaqi Cheng +--- + CMakeLists.txt | 4 ++-- + libhikptdev/CMakeLists.txt | 3 ++- + libhikptdev/src/rciep/CMakeLists.txt | 4 ++-- + 3 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c242ac8..3ec6e10 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,12 +9,12 @@ + # + # See the Mulan PSL v2 for more details. + +-cmake_minimum_required(VERSION 3.0.0) ++cmake_minimum_required(VERSION 3.10.0) + + project(hikptool C) + + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \ +- -O2 -fPIC -fPIE -Wall -Werror -Wextra -Wuninitialized -Wundef -Wunused -Wdate-time \ ++ -O2 -fPIC -fPIE -pie -Wall -Werror -Wextra -Wuninitialized -Wundef -Wunused -Wdate-time \ + -Wshadow -Wvla -Wdisabled-optimization -Wempty-body -Wignored-qualifiers \ + -Wimplicit-fallthrough=3 -Wtype-limits -Wshift-negative-value -Wswitch-default \ + -Wframe-larger-than=8192 -Wshift-overflow=2 -Wwrite-strings -Wmissing-format-attribute \ +diff --git a/libhikptdev/CMakeLists.txt b/libhikptdev/CMakeLists.txt +index 3b17f50..6c43a35 100644 +--- a/libhikptdev/CMakeLists.txt ++++ b/libhikptdev/CMakeLists.txt +@@ -9,4 +9,5 @@ + # + # See the Mulan PSL v2 for more details. + +-add_subdirectory(src/rciep) +\ No newline at end of file ++add_subdirectory(src/rciep) ++ +diff --git a/libhikptdev/src/rciep/CMakeLists.txt b/libhikptdev/src/rciep/CMakeLists.txt +index 6f4291a..68e7707 100644 +--- a/libhikptdev/src/rciep/CMakeLists.txt ++++ b/libhikptdev/src/rciep/CMakeLists.txt +@@ -9,7 +9,7 @@ + # + # See the Mulan PSL v2 for more details. + +-cmake_minimum_required(VERSION 3.0.0) ++cmake_minimum_required(VERSION 3.10.0) + + set(KPTDEV_SO_NAME hikptdev) + +@@ -21,7 +21,7 @@ endif() + + target_include_directories(KPTDEV_SO PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../include) + +-target_link_options(KPTDEV_SO PRIVATE -Wl,-z,relro,-z,now -Wl,-z,noexecstack -fPIE -pie -s) ++target_link_options(KPTDEV_SO PRIVATE -Wl,-z,relro,-z,now -Wl,-z,noexecstack -fPIC -s) + + set_target_properties(KPTDEV_SO PROPERTIES OUTPUT_NAME ${KPTDEV_SO_NAME} SOVERSION 1 VERSION 1.1.6) + install(TARGETS KPTDEV_SO LIBRARY DESTINATION lib OPTIONAL) +-- +2.34.1 + diff --git a/hikptool.spec b/hikptool.spec index 4c7b2bccaed94288625a572b2e940963f8388a85..d20a6d3c1d15bdf8956b6a19883aa16ce369675c 100644 --- a/hikptool.spec +++ b/hikptool.spec @@ -3,7 +3,7 @@ Name: hikptool Summary: A userspace tool for Linux providing problem location on Kunpeng chips Version: 1.1.6 -Release: 1 +Release: 3 License: MulanPSL2 Source: %{name}-%{version}.tar.gz ExclusiveOS: linux @@ -14,8 +14,11 @@ Conflicts: %{name} < %{version}-%{release} Provides: %{name} = %{version}-%{release} BuildRequires: gcc make cmake Requires: glibc +Requires: ubctl ExclusiveArch: aarch64 +Patch0001: 0001-hikptool-Update-CMake-to-version-3.10.0.patch + %description This package contains the hikptool @@ -67,5 +70,11 @@ fi /sbin/ldconfig %changelog +* Thu Dec 18 2025 Jiaqi Cheng 1.1.6-3 +- Update CMake version to 3.10.0 + +* Thu Dec 18 2025 Jiaqi Cheng 1.1.6-2 +- Add dependency on ubctl compont package + * Thu Oct 30 2025 veega2022 1.1.6-1 - Supports querying UB DFX information (UBUS, UMMU modules, etc.) and updates the version number to 1.1.6