diff --git a/0001-Removing-the-strlcpy-function-to-fix-the-compilation.patch b/0001-Removing-the-strlcpy-function-to-fix-the-compilation.patch new file mode 100644 index 0000000000000000000000000000000000000000..2b999571b9a0e6248145a45a7398896d304ae01e --- /dev/null +++ b/0001-Removing-the-strlcpy-function-to-fix-the-compilation.patch @@ -0,0 +1,25 @@ +From e1604f154031ce4d107d49675454298d03882dac Mon Sep 17 00:00:00 2001 +From: huayadong +Date: Thu, 11 Apr 2024 08:51:22 +0800 +Subject: [PATCH] Removing the strlcpy function to fix the compilation issue + +--- + src/proc/libkyprocess.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/proc/libkyprocess.c b/src/proc/libkyprocess.c +index 7e0ad33..b4fe688 100644 +--- a/src/proc/libkyprocess.c ++++ b/src/proc/libkyprocess.c +@@ -175,7 +175,7 @@ static int isnumber(char *c) + return 1; + } + +-static size_t strlcpy(char *dst, const char *src, size_t siz) ++static size_t libkysdk_strlcpy(char *dst, const char *src, size_t siz) + { + char *d = dst; + const char *s = src; +-- +2.33.0 + diff --git a/0001-fix-compile-error-of-libkysdk-system.patch b/0001-fix-compile-error-of-libkysdk-system.patch deleted file mode 100644 index 15c5356638064cab3eb1ecce6ff9016c6d6bc353..0000000000000000000000000000000000000000 --- a/0001-fix-compile-error-of-libkysdk-system.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 8dace21341fd79420d2ab0b9f33c6e6a34949d11 Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Mon, 5 Dec 2022 13:55:59 +0800 -Subject: [PATCH] fix compile error of libkysdk-system - ---- - CMakeLists.txt | 5 +++++ - src/kdkocr/CMakeLists.txt | 4 ++++ - src/location/CMakeLists.txt | 9 +++++++++ - src/powermanagement/CMakeLists.txt | 3 ++- - src/systemtime/CMakeLists.txt | 6 ++++++ - 5 files changed, 26 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7f7ea66..b34b924 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,3 +42,8 @@ set (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) - set (EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) - - add_subdirectory(src) -+ -+install(FILES development-files/kysdk-disk.pc development-files/kysdk-filesystem.pc development-files/kysdk-hardware.pc development-files/kysdk-location.pc development-files/kysdk-net.pc development-files/kysdk-ocr.pc development-files/kysdk-package.pc development-files/kysdk-powermanagement.pc development-files/kysdk-proc.pc development-files/kysdk-realtime.pc development-files/kysdk-sysinfo.pc development-files/kysdk-system.pc -+ DESTINATION /usr/share/pkgconfig/) -+install(FILES development-files/kysdk-system.conf -+ DESTINATION /etc/ld.so.conf.d/) -diff --git a/src/kdkocr/CMakeLists.txt b/src/kdkocr/CMakeLists.txt -index e8337a9..8922292 100644 ---- a/src/kdkocr/CMakeLists.txt -+++ b/src/kdkocr/CMakeLists.txt -@@ -206,6 +206,10 @@ set_target_properties(kyocr PROPERTIES VERSION 2.0.0 SOVERSION 1) - - install(TARGETS kyocr LIBRARY DESTINATION lib/kysdk/kysdk-system) - install(FILES ${PROJECT_SOURCE_DIR}/libkyocr.hpp DESTINATION include/kysdk/kysdk-system) -+install(FILES models/cls/inference.pdiparams models/cls/inference.pdiparams.info models/cls/inference.pdmodel DESTINATION /etc/kdkocr/cls) -+install(FILES models/det/inference.pdiparams models/det/inference.pdiparams.info models/det/inference.pdmodel DESTINATION /etc/kdkocr/det) -+install(FILES models/ppocr_keys_v1.txt DESTINATION /etc/kdkocr/) -+install(FILES models/rec/inference.pdiparams models/rec/inference.pdiparams.info models/rec/inference.pdmodel DESTINATION /etc/kdkocr/rec) - - if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libs/amd64/paddle_inference/paddle/lib/libpaddle_inference.so") - install(FILES ${PROJECT_SOURCE_DIR}/libs/libpaddle_inference DESTINATION lib/libpaddle_inference.so) -diff --git a/src/location/CMakeLists.txt b/src/location/CMakeLists.txt -index 05ff2e9..ec4f452 100644 ---- a/src/location/CMakeLists.txt -+++ b/src/location/CMakeLists.txt -@@ -11,3 +11,12 @@ install(TARGETS kylocation - - install(FILES libkylocation.h - DESTINATION include/kysdk/kysdk-system) -+ -+install(FILES location.py -+ DESTINATION bin) -+ -+install(FILES dbus_location.conf -+ DESTINATION /etc/dbus-1/system.d/) -+ -+install(FILES dbus_location.service -+ DESTINATION /lib/systemd/system/) -diff --git a/src/powermanagement/CMakeLists.txt b/src/powermanagement/CMakeLists.txt -index aa318d2..afa969d 100644 ---- a/src/powermanagement/CMakeLists.txt -+++ b/src/powermanagement/CMakeLists.txt -@@ -28,4 +28,5 @@ set(SRCS - target_include_directories(${PROJECT_NAME} PRIVATE ${POWERMANAGEMENT_TOP_DIR}) - target_sources(${PROJECT_NAME} PRIVATE ${SRCS}) - --install(TARGETS ${PROJECT_NAME} DESTINATION lib/kysdk/kysdk-system) -\ No newline at end of file -+install(TARGETS ${PROJECT_NAME} DESTINATION lib/kysdk/kysdk-system) -+install(FILES libkylockscreen.h DESTINATION include/kysdk/kysdk-system/) -diff --git a/src/systemtime/CMakeLists.txt b/src/systemtime/CMakeLists.txt -index 69c3a44..a492efa 100644 ---- a/src/systemtime/CMakeLists.txt -+++ b/src/systemtime/CMakeLists.txt -@@ -17,3 +17,9 @@ include_directories(${PKGS_INCLUDE_DIRS}) - # SET( EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) - ADD_EXECUTABLE(systime m_systime.c) - target_link_libraries(systime ${GLIBC_LIB} ${DBUS_LIB} ${DBUS_GLIB_LIB} ${THREAD_LIB} ${TIMER_LIST_C} kytimer kylog kyconf) -+ -+install(TARGETS systime DESTINATION /usr/bin) -+install(FILES com.kylin.kysdk.TimeServer.conf DESTINATION /etc/dbus-1/system.d/) -+install(FILES kysdk-systime.service DESTINATION /lib/systemd/system/) -+install(FILES m_systime.h DESTINATION /usr/include/kysdk/kysdk-system) -+ --- -2.33.0 - diff --git a/libkysdk-system-2.0.0.0.tar.gz b/libkysdk-system-2.2.3.5.tar.gz similarity index 51% rename from libkysdk-system-2.0.0.0.tar.gz rename to libkysdk-system-2.2.3.5.tar.gz index 362c051ca077a23f3e4ebce9acdbd5cbdb11e3ac..c278629e95799ce1cf7b67c437e70c7c2620f5a0 100644 Binary files a/libkysdk-system-2.0.0.0.tar.gz and b/libkysdk-system-2.2.3.5.tar.gz differ diff --git a/libkysdk-system.spec b/libkysdk-system.spec index b9f593c3619fd7abd13589e27cf510f6b9984035..33e59167b1a7a501f0a86cc2c34245c6b4347dee 100644 --- a/libkysdk-system.spec +++ b/libkysdk-system.spec @@ -1,12 +1,13 @@ Name: libkysdk-system -Version: 2.0.0.0 -Release: 2 +Version: 2.2.3.5 +Release: 1 Summary: Kylin Software Development Kit - System Layer Kit License: GPL-2+ URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz -Patch01: 0001-fix-compile-error-of-libkysdk-system.patch -Patch02: mv-strlcpy-to-libkysdk_strlcpy.patch + +Patch01: 0001-Removing-the-strlcpy-function-to-fix-the-compilation.patch + BuildRequires: cmake BuildRequires: glibc-devel BuildRequires: systemd-devel @@ -19,13 +20,24 @@ BuildRequires: libkysdk-config-devel BuildRequires: libkysdk-utils-devel BuildRequires: libkysdk-timer-devel BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: systemd-devel BuildRequires: opencv BuildRequires: libarchive-devel BuildRequires: tesseract-devel BuildRequires: cups-devel +BuildRequires: sane-backends-devel BuildRequires: libcurl-devel BuildRequires: libXrandr-devel - +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtwebchannel-devel +BuildRequires: qt5-qtwebsockets-devel +BuildRequires: kmod-devel +BuildRequires: hwinfo-devel +BuildRequires: pciutils-devel +BuildRequires: bluez-libs-devel +BuildRequires: lm_sensors-devel +BuildRequires: chrpath Requires: libkysdk-disk libkysdk-sysinfo libkysdk-systime libkysdk-filesystem libkysdk-proc libkysdk-hardware libkysdk-package libkysdk-powermanagement systemd glib2 libkysdk-systemcommon libkysdk-location libkysdk-net libkysdk-realtime @@ -36,7 +48,7 @@ Provides APIs and services such as system information, disk information, and sys %package -n libkysdk-system-devel Summary: libkysdk-system Development libraries, Provides APIs and services such as system information, disk information, and system time -Requires: libkysdk-system libkysdk-disk-devel libkysdk-sysinfo-devel libkysdk-systime-devel libkysdk-filesystem-devel libkysdk-proc-devel libkysdk-hardware-devel libkysdk-package-devel libkysdk-powermanagement-devel libkysdk-location-devel libkysdk-net-devel libkysdk-realtime-devel +Requires: libkysdk-system libkysdk-disk-devel libkysdk-sysinfo-devel libkysdk-systime-devel libkysdk-filesystem-devel libkysdk-proc-devel libkysdk-hardware-devel libkysdk-package-devel libkysdk-powermanagement-devel libkysdk-location-devel libkysdk-net-devel libkysdk-realtime-devel libkysdk-sysinfo-devel %description -n libkysdk-system-devel %{summary}. @@ -44,7 +56,7 @@ Requires: libkysdk-system libkysdk-disk-devel libkysdk-sysinfo-devel libkysdk-sy %package -n libkysdk-disk Summary: System disk information acquisition library -Requires: libkysdk-log libkysdk-systemcommon +Requires: libkysdk-log libkysdk-systemcommon libkysdk-config hwinfo libblkid glibc systemd-libs %description -n libkysdk-disk %{summary}. @@ -60,7 +72,7 @@ Requires: libkysdk-disk libkysdk-log-devel libkysdk-utils-devel util-linux-devel %package -n libkysdk-systime Summary: Library of system time-related operations -Requires: libkysdk-log dbus systemd libkysdk-timer glib2 libkysdk-timer libkysdk-systemcommon +Requires: libkysdk-log libkysdk-timer libkysdk-config libkysdk-systemcommon dbus systemd glib2 glibc dbus-libs dbus-glib %description -n libkysdk-systime %{summary}. @@ -68,7 +80,7 @@ Requires: libkysdk-log dbus systemd libkysdk-timer glib2 libkysdk-timer libkysdk %package -n libkysdk-systime-devel Summary: Library of system time-related operations - Development libraries -Requires: libkysdk-systime glib2-devel libkysdk-timer-devel +Requires: libkysdk-systime glib2-devel libkysdk-timer-devel libkysdk-config-devel %description -n libkysdk-systime-devel %{summary}. @@ -76,7 +88,7 @@ Requires: libkysdk-systime glib2-devel libkysdk-timer-devel %package -n libkysdk-sysinfo Summary: System Information Acquisition Library -Requires: libkysdk-log dbus glib2 systemd cjson libXrandr libkysdk-systemcommon +Requires: libkysdk-log libkysdk-systemcommon libkysdk-config dbus glib2 systemd cjson libXrandr pciutils kmod-libs glibc dbus-libs dbus-glib libgcc libstdc++ systemd-libs libX11 %description -n libkysdk-sysinfo %{summary}. @@ -92,7 +104,7 @@ Requires: libkysdk-sysinfo libkysdk-log-devel libkysdk-utils-devel systemd-devel %package -n libkysdk-filesystem Summary: File System Library -Requires: libkysdk-log qt5-qtbase libkysdk-config systemd libkysdk-systemcommon +Requires: libkysdk-log qt5-qtbase libkysdk-config systemd libkysdk-systemcommon glibc libgcc libstdc++ systemd-libs %description -n libkysdk-filesystem %{summary}. @@ -108,7 +120,7 @@ Requires: libkysdk-filesystem libkysdk-log-devel libkysdk-config-devel systemd-d %package -n libkysdk-hardware Summary: Hardware information acquisition library -Requires: libkysdk-log libkysdk-config systemd libkysdk-systemcommon cups-libs libcurl systemd +Requires: libkysdk-log libkysdk-config systemd libkysdk-systemcommon cups-libs libcurl systemd-libs hwinfo pciutils libXrandr bluez-libs lm_sensors glib2 dbus-glib glibc systemd-libs libX11 %description -n libkysdk-hardware %{summary}. @@ -116,7 +128,7 @@ Requires: libkysdk-log libkysdk-config systemd libkysdk-systemcommon cups-libs l %package -n libkysdk-hardware-devel Summary: Hardware information acquisition library - Development libraries -Requires: libkysdk-hardware libkysdk-log-devel libkysdk-config-devel systemd-devel cups-devel libcurl-devel systemd-devel +Requires: libkysdk-hardware libkysdk-log-devel libkysdk-config-devel systemd-devel cups-devel libcurl-devel libgudev-devel libXrandr-devel %description -n libkysdk-hardware-devel %{summary}. @@ -124,7 +136,7 @@ Requires: libkysdk-hardware libkysdk-log-devel libkysdk-config-devel systemd-dev %package -n libkysdk-package Summary: Package Management Library -Requires: libkysdk-systemcommon +Requires: libkysdk-systemcommon glibc %description -n libkysdk-package %{summary}. @@ -140,7 +152,7 @@ Requires: libkysdk-package %package -n libkysdk-proc Summary: Runtime information retrieval library -Requires: libkysdk-systemcommon +Requires: libkysdk-log libkysdk-systemcommon glibc %description -n libkysdk-proc %{summary}. @@ -148,7 +160,7 @@ Requires: libkysdk-systemcommon %package -n libkysdk-proc-devel Summary: Runtime information retrieval library - Development libraries -Requires: libkysdk-proc +Requires: libkysdk-log-devel libkysdk-utils-devel libkysdk-proc %description -n libkysdk-proc-devel %{summary}. @@ -156,7 +168,7 @@ Requires: libkysdk-proc %package -n libkysdk-powermanagement Summary: Power management library -Requires: libkysdk-log libkysdk-systemcommon +Requires: libkysdk-log libkysdk-systemcommon glibc dbus-libs libgcc libkysdk-config libkysdk-utils libstdc++ systemd-libs %description -n libkysdk-powermanagement %{summary}. @@ -172,7 +184,7 @@ Requires: libkysdk-log-devel libkysdk-powermanagement %package -n libkysdk-ocr Summary: AI character recognition function -Requires: opencv leptonica libarchive tesseract libkysdk-systemcommon +Requires: opencv leptonica-devel libarchive tesseract libkysdk-systemcommon glibc libgcc libstdc++ %description -n libkysdk-ocr %{summary}. @@ -195,7 +207,7 @@ Summary: Kysdk system layer common data package %package -n libkysdk-location Summary: Geographic Location Library -Requires: libkysdk-systemcommon glib2 +Requires: libkysdk-systemcommon glib2 glibc python3-requests %description -n libkysdk-location %{summary}. @@ -211,7 +223,7 @@ Requires: libkysdk-location %package -n libkysdk-net Summary: Network information base -Requires: libkysdk-systemcommon +Requires: libkysdk-systemcommon glibc %description -n libkysdk-net %{summary}. @@ -227,7 +239,7 @@ Requires: libkysdk-net %package -n libkysdk-realtime Summary: Runtime repository -Requires: libkysdk-systemcommon +Requires: libkysdk-systemcommon glibc libgcc libstdc++ lm_sensors %description -n libkysdk-realtime %{summary}. @@ -241,10 +253,56 @@ Requires: libkysdk-realtime %{summary}. +%package -n libkysdk-system-java +Summary: Multi-Language Support - java +Requires: libkysdk-system-dbus + +%description -n libkysdk-system-java +%{summary}. + + +%package -n libkysdk-system-python +Summary: Multi-Language Support - python +Requires: python3-dbus libkysdk-system-dbus + +%description -n libkysdk-system-python +%{summary}. + + +%package -n libkysdk-system-dbus +Summary: sdk dbus +Requires: qt5-qtbase libkysdk-disk libkysdk-hardware libkysdk-location libkysdk-net libkysdk-package libkysdk-proc libkysdk-realtime libkysdk-sysinfo libblkid bluez-libs glibc cjson cups-libs libcurl dbus-libs dbus-glib libgcc glib2 hwinfo kmod-libs libkysdk-config libkysdk-log pciutils qt5-qtbase lm_sensors libstdc++ systemd-libs systemd-libs libX11 libXrandr + +%description -n libkysdk-system-dbus +%{summary}. + + +%package -n libkysdk-system-javascript-http +Summary: Multi-Language Support - javascript +Requires: qt5-qtbase-gui qt5-qtbase-gui qt5-qtbase qt5-qtbase libkysdk-system-dbus glibc libgcc qt5-qtbase qt5-qtbase libstdc++ + +%description -n libkysdk-system-javascript-http +%{summary}. + + +%package -n libkysdk-system-javascript-websocket +Summary: Multi-Language Support - javascript +Requires: qt5-qtwebchannel-devel qt5-qtwebsockets libkysdk-system-dbus glibc libgcc qt5-qtbase qt5-qtdeclarative qt5-qtbase-gui libstdc++ + +%description -n libkysdk-system-javascript-websocket +%{summary}. + + +%package -n libkysdk-logrotate +Summary: Log Dump Service +Requires: libkysdk-systemcommon qt5-qtbase libkysdk-log logrotate glibc libgcc libstdc++ cronie + +%description -n libkysdk-logrotate +%{summary}. + + %prep -%setup -q -%patch01 -p1 -%patch02 -p1 +%autosetup -n %{name}-%{version} -p1 %build mkdir build && pushd build @@ -257,28 +315,107 @@ rm -rf $RPM_BUILD_ROOT pushd build %{make_install} DESTDIR=%{buildroot} popd +mkdir -p $RPM_BUILD_ROOT/usr/share/pkgconfig +mkdir -p $RPM_BUILD_ROOT/usr/share/doc/libkysdk-system +mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT/etc/dbus-1/system.d +mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/ +mkdir -p $RPM_BUILD_ROOT/etc/xdg/autostart/ +mkdir -p $RPM_BUILD_ROOT/etc/kydate/ +mkdir -p $RPM_BUILD_ROOT/usr/share/locale/zh_CN/LC_MESSAGES/ +mkdir -p $RPM_BUILD_ROOT/usr/share/locale/bo_CN/LC_MESSAGES/ +mkdir -p $RPM_BUILD_ROOT/usr/share/locale/mn/LC_MESSAGES/ +mkdir -p $RPM_BUILD_ROOT/etc/kdkocr/ +mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d +mkdir -p $RPM_BUILD_ROOT/usr/share/java +mkdir -p $RPM_BUILD_ROOT/usr/lib/python3/dist-packages/ +mkdir -p $RPM_BUILD_ROOT/etc/kysdk +mkdir -p $RPM_BUILD_ROOT/usr/lib/kysdk-dbus-http +mkdir -p $RPM_BUILD_ROOT/usr/lib/kysdk-dbus-websocket + +cp development-files/*.pc $RPM_BUILD_ROOT/usr/share/pkgconfig/ +cp debian/copyright $RPM_BUILD_ROOT/usr/share/doc/libkysdk-system/ +cp bin/systime $RPM_BUILD_ROOT/usr/bin/ +cp src/systemtime/com.kylin.kysdk.TimeServer.conf $RPM_BUILD_ROOT/etc/dbus-1/system.d/ +cp src/systemtime/kysdk-systime.service $RPM_BUILD_ROOT/lib/systemd/system/ +cp src/systemtime/kysdk-systime-date.desktop $RPM_BUILD_ROOT/etc/xdg/autostart/ +cp bin/sdk-date $RPM_BUILD_ROOT/usr/bin/ +cp src/systemtime/dateform.conf $RPM_BUILD_ROOT/etc/kydate/ +cp po/zh_CN.mo $RPM_BUILD_ROOT/usr/share/locale/zh_CN/LC_MESSAGES/ +cp po/bo_CN.mo $RPM_BUILD_ROOT/usr/share/locale/bo_CN/LC_MESSAGES/ +cp po/kysdk-sysinfo_mn.mo $RPM_BUILD_ROOT/usr/share/locale/mn/LC_MESSAGES/ +cp po/kysdk-sysinfo_zh_CN.mo $RPM_BUILD_ROOT/usr/share/locale/zh_CN/LC_MESSAGES/ +cp po/kysdk-sysinfo_bo_CN.mo $RPM_BUILD_ROOT/usr/share/locale/bo_CN/LC_MESSAGES/ +cp src/powermanagement/libkylockscreen.h $RPM_BUILD_ROOT/usr/include/kysdk/kysdk-system/ +cp src/kdkocr/models/* $RPM_BUILD_ROOT/etc/kdkocr/ -r +cp development-files/kysdk-system.conf $RPM_BUILD_ROOT/etc/ld.so.conf.d/ +cp src/location/location.py $RPM_BUILD_ROOT/usr/bin/ +cp src/location/dbus_location.conf $RPM_BUILD_ROOT/etc/dbus-1/system.d/ +cp src/location/dbus_location.service $RPM_BUILD_ROOT/lib/systemd/system/ +cp src/kysdk-java/kysdk-java-ext/kysdk-java/target/kysdk-java-1.0.0.jar $RPM_BUILD_ROOT/usr/share/java/ +cp src/python/kysdk.py $RPM_BUILD_ROOT/usr/lib/python3/dist-packages/ +cp bin/kySdkDbus $RPM_BUILD_ROOT/usr/bin/ +cp bin/kySdkDbus-session $RPM_BUILD_ROOT/usr/bin/ +cp src/kysdkdbus/com.kylin.kysdk.service.conf $RPM_BUILD_ROOT/etc/dbus-1/system.d/ +cp src/kysdkdbus/kysdk-dbus.service $RPM_BUILD_ROOT/lib/systemd/system/ +cp src/kysdkdbus/kysdk-dbus-session.desktop $RPM_BUILD_ROOT/etc/xdg/autostart/ +cp src/libkysdk-system-javascript-http/httpServer $RPM_BUILD_ROOT/usr/bin/ +cp src/libkysdk-system-javascript-http/conf/kysdk.conf $RPM_BUILD_ROOT/etc/kysdk/ +cp src/libkysdk-system-javascript-http/conf/kysdkHttpServer.desktop $RPM_BUILD_ROOT/etc/xdg/autostart/ +cp src/libkysdk-system-javascript-http/html $RPM_BUILD_ROOT/usr/lib/kysdk-dbus-http/html -r +cp src/libkysdk-system-javascript-websocket/kysdk-dbus-websocket $RPM_BUILD_ROOT/usr/bin/ +cp src/libkysdk-system-javascript-websocket/kysdk-dbus-websocket.desktop $RPM_BUILD_ROOT/etc/xdg/autostart/ +cp src/libkysdk-system-javascript-websocket/html $RPM_BUILD_ROOT/usr/lib/kysdk-dbus-websocket/html -r +cp bin/kysdk-logrotate $RPM_BUILD_ROOT/usr/bin/ +cp src/logrotate/com.kysdk.base.conf $RPM_BUILD_ROOT/etc/dbus-1/system.d/ +cp src/logrotate/kysdk-logrotate.service $RPM_BUILD_ROOT/lib/systemd/system/ +cp src/logrotate/logrotate.cron $RPM_BUILD_ROOT/usr/lib/kysdk/kysdk-system/ + %clean rm -rf $RPM_BUILD_ROOT -%post +%post -n libkysdk-location +systemctl enable dbus_location.service +systemctl restart dbus_location.service + +%post -n libkysdk-logrotate +systemctl enable kysdk-logrotate.service +systemctl restart kysdk-logrotate.service +crontab /usr/lib/kysdk/kysdk-system/logrotate.cron + +%post -n libkysdk-ocr +if [ -f "/usr/lib/libpaddle_inference.so/libpaddle_inference" ] +then + rm -rf /usr/lib/libpaddle_inference.so/ +fi + +%post -n libkysdk-sysinfo +mv /usr/share/locale/mn/LC_MESSAGES/kysdk-sysinfo_mn.mo /usr/share/locale/mn/LC_MESSAGES/kysdk-sysinfo.mo +mv /usr/share/locale/zh_CN/LC_MESSAGES/kysdk-sysinfo_zh_CN.mo /usr/share/locale/zh_CN/LC_MESSAGES/kysdk-sysinfo.mo +mv /usr/share/locale/bo_CN/LC_MESSAGES/kysdk-sysinfo_bo_CN.mo /usr/share/locale/bo_CN/LC_MESSAGES/kysdk-sysinfo.mo + +%post -n libkysdk-system-dbus +systemctl daemon-reload +systemctl enable kysdk-dbus.service + +%post -n libkysdk-systime check_env=`systemd-detect-virt` echo $check_env if [ $check_env = "docker" ];then - echo "docker env do not start kysdk-systime.service" + echo "docker env do not start kysdk-systime.service" else - systemctl daemon-reload - systemctl enable kysdk-systime.service - systemctl restart kysdk-systime.service + systemctl daemon-reload + systemctl enable kysdk-systime.service + systemctl restart kysdk-systime.service fi -if [ -f "/usr/lib/libpaddle_inference.so/libpaddle_inference" ] -then - rm -rf /usr/lib/libpaddle_inference.so/ -fi +mv /usr/share/locale/zh_CN/LC_MESSAGES/zh_CN.mo /usr/share/locale/zh_CN/LC_MESSAGES/kysdk-date.mo +mv /usr/share/locale/bo_CN/LC_MESSAGES/bo_CN.mo /usr/share/locale/bo_CN/LC_MESSAGES/kysdk-date.mo %files +%{_datadir}/doc/libkysdk-system/copyright %files -n libkysdk-system-devel %{_datadir}/pkgconfig/kysdk-system.pc @@ -294,12 +431,22 @@ fi %{_bindir}/systime %{_sysconfdir}/dbus-1/system.d/com.kylin.kysdk.TimeServer.conf /lib/systemd/system/kysdk-systime.service +%{_sysconfdir}/xdg/autostart/kysdk-systime-date.desktop +%{_bindir}/sdk-date +%{_prefix}/lib/kysdk/kysdk-system/libkydate.so* +%{_sysconfdir}/kydate/dateform.conf +%{_datadir}/locale/zh_CN/LC_MESSAGES/zh_CN.mo +%{_datadir}/locale/bo_CN/LC_MESSAGES/bo_CN.mo %files -n libkysdk-systime-devel -%{_includedir}/kysdk/kysdk-system/m_systime.h +%{_includedir}/kysdk/kysdk-system/libkydate.h +%{_datadir}/pkgconfig/kysdk-systime.pc %files -n libkysdk-sysinfo %{_prefix}/lib/kysdk/kysdk-system/libkysysinfo.so* +%{_datadir}/locale/mn/LC_MESSAGES/kysdk-sysinfo_mn.mo +%{_datadir}/locale/zh_CN/LC_MESSAGES/kysdk-sysinfo_zh_CN.mo +%{_datadir}/locale/bo_CN/LC_MESSAGES/kysdk-sysinfo_bo_CN.mo %files -n libkysdk-sysinfo-devel %{_includedir}/kysdk/kysdk-system/libkysysinfo.hpp @@ -316,8 +463,17 @@ fi %files -n libkysdk-hardware %{_prefix}/lib/kysdk/kysdk-system/libkyhw.so* +%{_prefix}/lib/kysdk/kysdk-system/libkybluetooth.so* +%{_prefix}/lib/kysdk/kysdk-system/libkyedid.so* +%{_prefix}/lib/kysdk/kysdk-system/libkyfan.so* +%{_prefix}/lib/kysdk/kysdk-system/libkyhwinfo.so* %files -n libkysdk-hardware-devel +%{_includedir}/kysdk/kysdk-system/libkybluetooth.h +%{_includedir}/kysdk/kysdk-system/libkydisplay.h +%{_includedir}/kysdk/kysdk-system/libkyedid.h +%{_includedir}/kysdk/kysdk-system/libkyfan.h +%{_includedir}/kysdk/kysdk-system/libkyhw.h %{_includedir}/kysdk/kysdk-system/libkync.h %{_includedir}/kysdk/kysdk-system/libkycpu.h %{_includedir}/kysdk/kysdk-system/libkyprinter.h @@ -384,8 +540,40 @@ fi %{_includedir}/kysdk/kysdk-system/libkyrealtimeinfo.h %{_datadir}/pkgconfig/kysdk-realtime.pc +%files -n libkysdk-system-java +%{_datadir}/java/kysdk-java-1.0.0.jar + +%files -n libkysdk-system-python +%{_prefix}/lib/python3/dist-packages/kysdk.py + +%files -n libkysdk-system-dbus +%{_bindir}/kySdkDbus +%{_bindir}/kySdkDbus-session +%{_sysconfdir}/dbus-1/system.d/com.kylin.kysdk.service.conf +/lib/systemd/system/kysdk-dbus.service +%{_sysconfdir}/xdg/autostart/kysdk-dbus-session.desktop + +%files -n libkysdk-system-javascript-http +%{_bindir}/httpServer +%{_sysconfdir}/kysdk/kysdk.conf +%{_sysconfdir}/xdg/autostart/kysdkHttpServer.desktop +%{_prefix}/lib/kysdk-dbus-http/html/ + +%files -n libkysdk-system-javascript-websocket +%{_bindir}/kysdk-dbus-websocket +%{_sysconfdir}/xdg/autostart/kysdk-dbus-websocket.desktop +%{_prefix}/lib/kysdk-dbus-websocket/html/ + +%files -n libkysdk-logrotate +%{_bindir}/kysdk-logrotate +%{_sysconfdir}/dbus-1/system.d/com.kysdk.base.conf +/lib/systemd/system/kysdk-logrotate.service +%{_prefix}/lib/kysdk/kysdk-system/logrotate.cron %changelog +* Thu Mar 28 2024 huayadong - 2.2.3.5-1 +- update version to 2.2.3.5 + * Fri Aug 18 2023 peijiankang - 2.0.0.0-2 - add mv-strlcpy-to-libkysdk_strlcpy.patch diff --git a/mv-strlcpy-to-libkysdk_strlcpy.patch b/mv-strlcpy-to-libkysdk_strlcpy.patch deleted file mode 100644 index 4e8466a973a7d980f24da8249c260281dfe71ceb..0000000000000000000000000000000000000000 --- a/mv-strlcpy-to-libkysdk_strlcpy.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 98c2be623143c777e8a6a0222377d448e9bb1960 Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Fri, 18 Aug 2023 13:26:11 +0800 -Subject: [PATCH] mv strlcpy to libkysdk_strlcpy - ---- - src/proc/libkyprocess.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/proc/libkyprocess.c b/src/proc/libkyprocess.c -index 4d8553d..6c7482d 100644 ---- a/src/proc/libkyprocess.c -+++ b/src/proc/libkyprocess.c -@@ -154,7 +154,7 @@ static int isnumber(char *c) - return 1; - } - --static size_t strlcpy(char *dst, const char *src, size_t siz) -+static size_t libkysdk_strlcpy(char *dst, const char *src, size_t siz) - { - char *d = dst; - const char *s = src; -@@ -811,7 +811,7 @@ static int get_proc_name(pid_t pid, char *name) - start = strchr(line, '(') + 1; - end = strrchr(start, ')'); - num = end - start; -- strlcpy(name, start, num + 1); -+ libkysdk_strlcpy(name, start, num + 1); - fclose(fpprocstat); - - return 0; -@@ -1387,4 +1387,4 @@ inline void kdk_proc_freeall(char **list) - index ++; - } - free(list); --} -\ No newline at end of file -+} --- -2.33.0 -