!1 Init Package for libkysdk-base
From: @peijiankang Reviewed-by: @dou33 Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot
Gitee
commit
757de0b3ff
72
0001-fix-compile-error-of-libkysdk-base.patch
Normal file
72
0001-fix-compile-error-of-libkysdk-base.patch
Normal file
@ -0,0 +1,72 @@
|
||||
From dac58c31518f990ffc20735de250a527d47e05ef Mon Sep 17 00:00:00 2001
|
||||
From: peijiankang <peijiankang@kylinos.cn>
|
||||
Date: Wed, 2 Nov 2022 18:46:02 +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(-)
|
||||
|
||||
diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
|
||||
index 391b2ce..bcdde51 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)
|
||||
|
||||
install(TARGETS kyconf
|
||||
DESTINATION lib/kysdk/kysdk-base)
|
||||
|
||||
-# install(FILES libkyconf.h
|
||||
-# DESTINATION include/kysdk/kysdk-base)
|
||||
\ No newline at end of file
|
||||
+install(FILES libkyconf.h
|
||||
+ DESTINATION include/kysdk/kysdk-base)
|
||||
diff --git a/src/log/CMakeLists.txt b/src/log/CMakeLists.txt
|
||||
index a0a0b80..292dbde 100644
|
||||
--- a/src/log/CMakeLists.txt
|
||||
+++ b/src/log/CMakeLists.txt
|
||||
@@ -15,5 +15,5 @@ install(TARGETS kylog
|
||||
install(FILES libkylog.h
|
||||
DESTINATION include/kysdk/kysdk-base)
|
||||
|
||||
-install(FILES kylog-rotate-default
|
||||
- DESTINATION /etc/kysdk/kysdk-base)
|
||||
\ No newline at end of file
|
||||
+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
|
||||
--- a/src/timer/CMakeLists.txt
|
||||
+++ b/src/timer/CMakeLists.txt
|
||||
@@ -6,5 +6,5 @@ target_link_libraries(test-kytimer kytimer pthread)
|
||||
install(TARGETS kytimer
|
||||
DESTINATION lib/kysdk/kysdk-base)
|
||||
|
||||
-# install(FILES libkytimer.h
|
||||
-# DESTINATION include/kysdk/kysdk-base)
|
||||
\ No newline at end of file
|
||||
+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
|
||||
--- a/src/utils/CMakeLists.txt
|
||||
+++ b/src/utils/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
add_subdirectory(data-structure)
|
||||
|
||||
-# 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
|
||||
+ DESTINATION include/kysdk/kysdk-base)
|
||||
--
|
||||
2.36.1
|
||||
|
||||
BIN
libkysdk-base-1.0.0.tar.gz
Normal file
BIN
libkysdk-base-1.0.0.tar.gz
Normal file
Binary file not shown.
146
libkysdk-base.spec
Normal file
146
libkysdk-base.spec
Normal file
@ -0,0 +1,146 @@
|
||||
%define debug_package %{nil}
|
||||
|
||||
Name: libkysdk-base
|
||||
Version: 1.0.0
|
||||
Release: 1
|
||||
Summary: Kylin Software Development Kit - Base Layer Kit
|
||||
License: GPL-2+
|
||||
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++
|
||||
|
||||
|
||||
Requires: libkysdk-timer libkysdk-log libkysdk-config libkysdk-utils
|
||||
|
||||
%description
|
||||
Kylin Software Development Kit - Base Layer Kit
|
||||
Provides log, message, process, thread, timers, debugging and burying, configuration files, utils
|
||||
|
||||
|
||||
%package -n libkysdk-base-devel
|
||||
Summary: utils
|
||||
Requires: libkysdk-base libkysdk-timer-devel libkysdk-log-devel libkysdk-config-devel libkysdk-utils-devel
|
||||
|
||||
%description -n libkysdk-base-devel
|
||||
Development libraries Provides log, message, process, thread, timers, debugging and burying, configuration files, utils
|
||||
|
||||
|
||||
%package -n libkysdk-timer
|
||||
Summary: utils
|
||||
|
||||
%description -n libkysdk-timer
|
||||
timer module library
|
||||
|
||||
|
||||
%package -n libkysdk-timer-devel
|
||||
Summary: utils
|
||||
Requires: libkysdk-utils-devel libkysdk-timer
|
||||
|
||||
%description -n libkysdk-timer-devel
|
||||
timer module library - Development libraries
|
||||
|
||||
|
||||
%package -n libkysdk-log
|
||||
Summary: utils
|
||||
Requires: libkysdk-config logrotate
|
||||
|
||||
%description -n libkysdk-log
|
||||
log module library
|
||||
|
||||
|
||||
%package -n libkysdk-log-devel
|
||||
Summary: utils
|
||||
Requires: libkysdk-log libkysdk-config-devel libkysdk-utils-devel
|
||||
|
||||
%description -n libkysdk-log-devel
|
||||
log module library - Development libraries
|
||||
|
||||
|
||||
%package -n libkysdk-config
|
||||
Summary: utils
|
||||
|
||||
%description -n libkysdk-config
|
||||
config module library
|
||||
|
||||
|
||||
%package -n libkysdk-config-devel
|
||||
Summary: utils
|
||||
Requires: libkysdk-utils-devel libkysdk-config
|
||||
|
||||
%description -n libkysdk-config-devel
|
||||
config module library - Development libraries
|
||||
|
||||
|
||||
%package -n libkysdk-utils
|
||||
Summary: utils
|
||||
|
||||
%description -n libkysdk-utils
|
||||
Developer utils
|
||||
|
||||
|
||||
%package -n libkysdk-utils-devel
|
||||
Summary: utils
|
||||
Requires: libkysdk-utils
|
||||
|
||||
%description -n libkysdk-utils-devel
|
||||
Developer utils - Development libraries
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch01 -p1
|
||||
|
||||
%build
|
||||
pushd build
|
||||
cmake ..
|
||||
make
|
||||
popd
|
||||
%install
|
||||
pushd build
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make DESTDIR=%{buildroot} install
|
||||
popd
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
|
||||
%files -n libkysdk-base-devel
|
||||
|
||||
%files -n libkysdk-timer
|
||||
%{_prefix}/lib/kysdk/kysdk-base/libkytimer.so*
|
||||
|
||||
%files -n libkysdk-timer-devel
|
||||
%{_includedir}/kysdk/kysdk-base/libkytimer.h
|
||||
|
||||
%files -n libkysdk-log
|
||||
%{_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-log-devel
|
||||
%{_includedir}/kysdk/kysdk-base/libkylog.h
|
||||
|
||||
%files -n libkysdk-config
|
||||
%{_prefix}/lib/kysdk/kysdk-base/libkyconf.so*
|
||||
|
||||
%files -n libkysdk-config-devel
|
||||
%{_includedir}/kysdk/kysdk-base/libkyconf.h
|
||||
|
||||
%files -n libkysdk-utils
|
||||
%{_prefix}/lib/kysdk/kysdk-base/libkydatastruct.so
|
||||
|
||||
%files -n libkysdk-utils-devel
|
||||
%{_includedir}/kysdk/kysdk-base/skip_linklist.h
|
||||
%{_includedir}/kysdk/kysdk-base/listdata.h
|
||||
%{_includedir}/kysdk/kysdk-base/sdkmarcos.h
|
||||
%{_includedir}/kysdk/kysdk-base/kerr.h
|
||||
%{_includedir}/kysdk/kysdk-base/cstring-extension.h
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Nov 1 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.0-1
|
||||
- Init Package for libkysdk-base
|
||||
Loading…
x
Reference in New Issue
Block a user