diff --git a/0001-fix-compile-error-of-libkysdk-base.patch b/0001-fix-compile-error-of-libkysdk-base.patch index 0cf07dc..2f9c7c2 100644 --- a/0001-fix-compile-error-of-libkysdk-base.patch +++ b/0001-fix-compile-error-of-libkysdk-base.patch @@ -1,26 +1,39 @@ -From dac58c31518f990ffc20735de250a527d47e05ef Mon Sep 17 00:00:00 2001 +From f9bac0008b7d124c0607f6e026fff309b8eb86ac Mon Sep 17 00:00:00 2001 From: peijiankang -Date: Wed, 2 Nov 2022 18:46:02 +0800 +Date: Tue, 29 Nov 2022 17:11:39 +0800 Subject: [PATCH] fix compile error of libkysdk-base --- - src/config/CMakeLists.txt | 6 +++--- - src/log/CMakeLists.txt | 4 ++-- - src/timer/CMakeLists.txt | 4 ++-- - src/utils/CMakeLists.txt | 4 ++-- - 4 files changed, 9 insertions(+), 9 deletions(-) + CMakeLists.txt | 8 +++++++- + src/config/CMakeLists.txt | 4 ++-- + src/diagnostics/CMakeLists.txt | 5 ++++- + src/log/CMakeLists.txt | 4 ++-- + src/timer/CMakeLists.txt | 4 ++-- + src/utils/CMakeLists.txt | 6 +++--- + 6 files changed, 20 insertions(+), 11 deletions(-) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b77bb78..535b4be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,4 +32,10 @@ set (EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) + set (CMAKE_INSTALL_PREFIX /usr) + set (CMAKE_INSTALL_RPATH /usr/lib/kysdk/kysdk-base) + +-add_subdirectory(src) +\ No newline at end of file ++add_subdirectory(src) ++ ++install(FILES development-files/kysdk-base.conf ++ DESTINATION /etc/ld.so.conf.d) ++ ++install(FILES development-files/kysdk-base.pc development-files/kysdk-config.pc development-files/kysdk-diagnostics.pc development-files/kysdk-log.pc development-files/kysdk-timer.pc development-files/kysdk-utils.pc ++ DESTINATION share/pkgconfig) diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt -index 391b2ce..bcdde51 100644 +index f95567a..a62f66e 100644 --- a/src/config/CMakeLists.txt +++ b/src/config/CMakeLists.txt -@@ -1,10 +1,10 @@ - aux_source_directory(. SOURCESCODE) - add_library(kyconf SHARED ${SOURCESCODE}) - add_executable(kyconf-test-struct test/test_structlist.c) --target_link_libraries(kyconf-test-struct kyconf kylog pthread) -+target_link_libraries(kyconf-test-struct kyconf kylog pthread systemd) - +@@ -7,5 +7,5 @@ target_link_libraries(kyconf-test-struct kyconf kylog pthread) install(TARGETS kyconf DESTINATION lib/kysdk/kysdk-base) @@ -29,11 +42,25 @@ index 391b2ce..bcdde51 100644 \ No newline at end of file +install(FILES libkyconf.h + DESTINATION include/kysdk/kysdk-base) +diff --git a/src/diagnostics/CMakeLists.txt b/src/diagnostics/CMakeLists.txt +index ae7544b..cff6f70 100644 +--- a/src/diagnostics/CMakeLists.txt ++++ b/src/diagnostics/CMakeLists.txt +@@ -30,4 +30,7 @@ set(SRCS + target_include_directories(${PROJECT_NAME} PRIVATE ${DIAGNOSTICS_TOP_DIR}) + target_sources(${PROJECT_NAME} PRIVATE ${SRCS}) + +-install(TARGETS ${PROJECT_NAME} DESTINATION lib/kysdk/kysdk-base) +\ No newline at end of file ++install(TARGETS ${PROJECT_NAME} DESTINATION lib/kysdk/kysdk-base) ++ ++install(FILES libkydiagnostics.h ++ DESTINATION include/kysdk/kysdk-base) diff --git a/src/log/CMakeLists.txt b/src/log/CMakeLists.txt -index a0a0b80..292dbde 100644 +index 4f94825..f9e2e1a 100644 --- a/src/log/CMakeLists.txt +++ b/src/log/CMakeLists.txt -@@ -15,5 +15,5 @@ install(TARGETS kylog +@@ -18,5 +18,5 @@ install(TARGETS kylog install(FILES libkylog.h DESTINATION include/kysdk/kysdk-base) @@ -43,10 +70,10 @@ index a0a0b80..292dbde 100644 +install(FILES kylog-rotate-default kylog-default.conf logrotate.cron + DESTINATION /etc/kysdk/kysdk-base) diff --git a/src/timer/CMakeLists.txt b/src/timer/CMakeLists.txt -index 47aa10e..bb949b4 100644 +index a3bee3f..39197f1 100644 --- a/src/timer/CMakeLists.txt +++ b/src/timer/CMakeLists.txt -@@ -6,5 +6,5 @@ target_link_libraries(test-kytimer kytimer pthread) +@@ -8,5 +8,5 @@ target_link_libraries(test-kytimer kytimer) install(TARGETS kytimer DESTINATION lib/kysdk/kysdk-base) @@ -56,17 +83,23 @@ index 47aa10e..bb949b4 100644 +install(FILES libkytimer.h + DESTINATION include/kysdk/kysdk-base) diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt -index b7123c4..d0274df 100644 +index 739003a..ec1c9b4 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt -@@ -1,4 +1,4 @@ - add_subdirectory(data-structure) - +@@ -4,9 +4,9 @@ set_target_properties(kyutils PROPERTIES VERSION 1.2.0 SOVERSION 1) + include_directories(.) + install(TARGETS kyutils + DESTINATION lib/kysdk/kysdk-base) -# install(FILES sdkmarcos.h kerr.h cstring-extension.h -# DESTINATION include/kysdk/kysdk-base) -\ No newline at end of file -+install(FILES sdkmarcos.h kerr.h cstring-extension.h ++install(FILES sdkmarcos.h kerr.h cstring-extension.h kyutils.h + DESTINATION include/kysdk/kysdk-base) + add_executable(test-utils sample/kyutils_sample.c) + target_link_libraries(test-utils kyutils) + +-add_subdirectory(data-structure) +\ No newline at end of file ++add_subdirectory(data-structure) -- 2.36.1 diff --git a/libkysdk-base-1.0.0.tar.gz b/libkysdk-base-1.0.0.tar.gz deleted file mode 100644 index 2834ab5..0000000 Binary files a/libkysdk-base-1.0.0.tar.gz and /dev/null differ diff --git a/libkysdk-base-2.0.0.tar.gz b/libkysdk-base-2.0.0.tar.gz new file mode 100644 index 0000000..14156be Binary files /dev/null and b/libkysdk-base-2.0.0.tar.gz differ diff --git a/libkysdk-base.spec b/libkysdk-base.spec index 096da62..4e14038 100644 --- a/libkysdk-base.spec +++ b/libkysdk-base.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: libkysdk-base -Version: 1.0.0 +Version: 2.0.0 Release: 1 Summary: Kylin Software Development Kit - Base Layer Kit License: GPL-2+ @@ -9,10 +9,10 @@ URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz Patch01: 0001-fix-compile-error-of-libkysdk-base.patch -BuildRequires: glibc-devel cmake systemd-devel gcc-c++ +BuildRequires: glibc-devel cmake systemd-devel gcc-c++ dbus-devel openssl-devel -Requires: libkysdk-timer libkysdk-log libkysdk-config libkysdk-utils +Requires: libkysdk-timer libkysdk-log libkysdk-config libkysdk-utils libkysdk-diagnostics libkysdk-basecommon %description Kylin Software Development Kit - Base Layer Kit @@ -21,7 +21,7 @@ Provides log, message, process, thread, timers, debugging and burying, configura %package -n libkysdk-base-devel Summary: utils -Requires: libkysdk-base libkysdk-timer-devel libkysdk-log-devel libkysdk-config-devel libkysdk-utils-devel +Requires: libkysdk-base libkysdk-timer-devel libkysdk-log-devel libkysdk-config-devel libkysdk-utils-devel libkysdk-diagnostics-devel %description -n libkysdk-base-devel Development libraries Provides log, message, process, thread, timers, debugging and burying, configuration files, utils @@ -29,6 +29,7 @@ Development libraries Provides log, message, process, thread, timers, debugging %package -n libkysdk-timer Summary: utils +Requires: libkysdk-utils libkysdk-basecommon %description -n libkysdk-timer timer module library @@ -36,7 +37,7 @@ timer module library %package -n libkysdk-timer-devel Summary: utils -Requires: libkysdk-utils-devel libkysdk-timer +Requires: libkysdk-utils-devel libkysdk-timer libkysdk-basecommon %description -n libkysdk-timer-devel timer module library - Development libraries @@ -44,15 +45,22 @@ timer module library - Development libraries %package -n libkysdk-log Summary: utils -Requires: libkysdk-config logrotate +Requires: libkysdk-config logrotate libkysdk-utils libkysdk-basecommon %description -n libkysdk-log log module library +%package -n libkysdk-basecommon +Summary: utils + +%description -n libkysdk-basecommon +Base Layer Public packets + + %package -n libkysdk-log-devel Summary: utils -Requires: libkysdk-log libkysdk-config-devel libkysdk-utils-devel +Requires: libkysdk-log libkysdk-config-devel libkysdk-utils-devel systemd-devel %description -n libkysdk-log-devel log module library - Development libraries @@ -60,6 +68,7 @@ log module library - Development libraries %package -n libkysdk-config Summary: utils +Requires: libkysdk-utils libkysdk-basecommon %description -n libkysdk-config config module library @@ -75,6 +84,7 @@ config module library - Development libraries %package -n libkysdk-utils Summary: utils +Requires: libkysdk-basecommon %description -n libkysdk-utils Developer utils @@ -87,12 +97,29 @@ Requires: libkysdk-utils %description -n libkysdk-utils-devel Developer utils - Development libraries + +%package -n libkysdk-diagnostics +Summary: utils +Requires: libkysdk-utils libkysdk-basecommon + +%description -n libkysdk-diagnostics +Developer diagnostics + + +%package -n libkysdk-diagnostics-devel +Summary: utils +Requires: libkysdk-diagnostics + +%description -n libkysdk-diagnostics-devel +Developer diagnostics - Development libraries + + %prep %setup -q %patch01 -p1 %build -pushd build +mkdir build && pushd build cmake .. make popd @@ -108,20 +135,26 @@ rm -rf $RPM_BUILD_ROOT %files %files -n libkysdk-base-devel +%{_datadir}/pkgconfig/kysdk-base.pc %files -n libkysdk-timer %{_prefix}/lib/kysdk/kysdk-base/libkytimer.so* %files -n libkysdk-timer-devel +%{_datadir}/pkgconfig/kysdk-timer.pc %{_includedir}/kysdk/kysdk-base/libkytimer.h %files -n libkysdk-log -%{_prefix}/lib/kysdk/kysdk-base/libkylog.so +%{_prefix}/lib/kysdk/kysdk-base/libkylog.so* %{_sysconfdir}/kysdk/kysdk-base/kylog-default.conf %{_sysconfdir}/kysdk/kysdk-base/kylog-rotate-default %{_sysconfdir}/kysdk/kysdk-base/logrotate.cron +%files -n libkysdk-basecommon +%{_sysconfdir}/ld.so.conf.d + %files -n libkysdk-log-devel +%{_datadir}/pkgconfig/kysdk-log.pc %{_includedir}/kysdk/kysdk-base/libkylog.h %files -n libkysdk-config @@ -129,9 +162,11 @@ rm -rf $RPM_BUILD_ROOT %files -n libkysdk-config-devel %{_includedir}/kysdk/kysdk-base/libkyconf.h +%{_datadir}/pkgconfig/kysdk-config.pc %files -n libkysdk-utils -%{_prefix}/lib/kysdk/kysdk-base/libkydatastruct.so +%{_prefix}/lib/kysdk/kysdk-base/libkydatastruct.so* +%{_prefix}/lib/kysdk/kysdk-base/libkyutils.so* %files -n libkysdk-utils-devel %{_includedir}/kysdk/kysdk-base/skip_linklist.h @@ -139,8 +174,19 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/kysdk/kysdk-base/sdkmarcos.h %{_includedir}/kysdk/kysdk-base/kerr.h %{_includedir}/kysdk/kysdk-base/cstring-extension.h +%{_includedir}/kysdk/kysdk-base/kyutils.h +%{_datadir}/pkgconfig/kysdk-utils.pc +%files -n libkysdk-diagnostics +%{_prefix}/lib/kysdk/kysdk-base/libkydiagnostics.so* + +%files -n libkysdk-diagnostics-devel +%{_includedir}/kysdk/kysdk-base/libkydiagnostics.h +%{_datadir}/pkgconfig/kysdk-diagnostics.pc %changelog +* Mon Dec 5 2022 peijiankang - 2.0.0-1 +- update version to 2.0.0 + * Tue Nov 1 2022 peijiankang - 1.0.0-1 - Init Package for libkysdk-base