!9 fix EBS build error
From: @peijiankang Reviewed-by: @hua_yadong Signed-off-by: @hua_yadong
This commit is contained in:
commit
b4fcf46bc4
@ -21,7 +21,7 @@ index 7f7ea66..b34b924 100644
|
|||||||
add_subdirectory(src)
|
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
|
+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/kgconfig/)
|
+ DESTINATION /usr/share/pkgconfig/)
|
||||||
+install(FILES development-files/kysdk-system.conf
|
+install(FILES development-files/kysdk-system.conf
|
||||||
+ DESTINATION /etc/ld.so.conf.d/)
|
+ DESTINATION /etc/ld.so.conf.d/)
|
||||||
diff --git a/src/kdkocr/CMakeLists.txt b/src/kdkocr/CMakeLists.txt
|
diff --git a/src/kdkocr/CMakeLists.txt b/src/kdkocr/CMakeLists.txt
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: libkysdk-system
|
Name: libkysdk-system
|
||||||
Version: 2.0.0
|
Version: 2.0.0
|
||||||
Release: 1
|
Release: 4
|
||||||
Summary: Kylin Software Development Kit - System Layer Kit
|
Summary: Kylin Software Development Kit - System Layer Kit
|
||||||
License: GPL-2+
|
License: GPL-2+
|
||||||
URL: http://www.ukui.org
|
URL: http://www.ukui.org
|
||||||
@ -182,7 +182,7 @@ Requires: opencv leptonica libarchive tesseract libkysdk-systemcommon
|
|||||||
|
|
||||||
%package -n libkysdk-ocr-devel
|
%package -n libkysdk-ocr-devel
|
||||||
Summary: AI character recognition function - Development libraries
|
Summary: AI character recognition function - Development libraries
|
||||||
Requires: libkysdk-ocr leptonica-devel libopencv-devel libarchive-devel tesseract-devel
|
Requires: libkysdk-ocr leptonica-devel opencv libarchive-devel tesseract-devel
|
||||||
|
|
||||||
%description -n libkysdk-ocr-devel
|
%description -n libkysdk-ocr-devel
|
||||||
%{summary}.
|
%{summary}.
|
||||||
@ -249,14 +249,14 @@ Requires: libkysdk-realtime
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir build && pushd build
|
mkdir build && pushd build
|
||||||
cmake ..
|
%cmake ..
|
||||||
make -j4
|
%{make_build}
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
pushd build
|
pushd build
|
||||||
make DESTDIR=%{buildroot} install
|
%{make_install} DESTDIR=%{buildroot}
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
@ -282,14 +282,14 @@ fi
|
|||||||
%files
|
%files
|
||||||
|
|
||||||
%files -n libkysdk-system-devel
|
%files -n libkysdk-system-devel
|
||||||
%{_datadir}/kgconfig/kysdk-system.pc
|
%{_datadir}/pkgconfig/kysdk-system.pc
|
||||||
|
|
||||||
%files -n libkysdk-disk
|
%files -n libkysdk-disk
|
||||||
%{_prefix}/lib/kysdk/kysdk-system/libkydiskinfo.so*
|
%{_prefix}/lib/kysdk/kysdk-system/libkydiskinfo.so*
|
||||||
|
|
||||||
%files -n libkysdk-disk-devel
|
%files -n libkysdk-disk-devel
|
||||||
%{_includedir}/kysdk/kysdk-system/libkydiskinfo.h
|
%{_includedir}/kysdk/kysdk-system/libkydiskinfo.h
|
||||||
%{_datadir}/kgconfig/kysdk-disk.pc
|
%{_datadir}/pkgconfig/kysdk-disk.pc
|
||||||
|
|
||||||
%files -n libkysdk-systime
|
%files -n libkysdk-systime
|
||||||
%{_bindir}/systime
|
%{_bindir}/systime
|
||||||
@ -305,7 +305,7 @@ fi
|
|||||||
%files -n libkysdk-sysinfo-devel
|
%files -n libkysdk-sysinfo-devel
|
||||||
%{_includedir}/kysdk/kysdk-system/libkysysinfo.hpp
|
%{_includedir}/kysdk/kysdk-system/libkysysinfo.hpp
|
||||||
%{_includedir}/kysdk/kysdk-system/libkysysinfo.h
|
%{_includedir}/kysdk/kysdk-system/libkysysinfo.h
|
||||||
%{_datadir}/kgconfig/kysdk-sysinfo.pc
|
%{_datadir}/pkgconfig/kysdk-sysinfo.pc
|
||||||
|
|
||||||
%files -n libkysdk-filesystem
|
%files -n libkysdk-filesystem
|
||||||
%{_prefix}/lib/kysdk/kysdk-system/libkyfilewatcher.so*
|
%{_prefix}/lib/kysdk/kysdk-system/libkyfilewatcher.so*
|
||||||
@ -313,7 +313,7 @@ fi
|
|||||||
%files -n libkysdk-filesystem-devel
|
%files -n libkysdk-filesystem-devel
|
||||||
%{_includedir}/kysdk/kysdk-system/libkyfilewatcher.hpp
|
%{_includedir}/kysdk/kysdk-system/libkyfilewatcher.hpp
|
||||||
%{_includedir}/kysdk/kysdk-system/libkyfilewatcher_global.hpp
|
%{_includedir}/kysdk/kysdk-system/libkyfilewatcher_global.hpp
|
||||||
%{_datadir}/kgconfig/kysdk-filesystem.pc
|
%{_datadir}/pkgconfig/kysdk-filesystem.pc
|
||||||
|
|
||||||
%files -n libkysdk-hardware
|
%files -n libkysdk-hardware
|
||||||
%{_prefix}/lib/kysdk/kysdk-system/libkyhw.so*
|
%{_prefix}/lib/kysdk/kysdk-system/libkyhw.so*
|
||||||
@ -325,14 +325,14 @@ fi
|
|||||||
%{_includedir}/kysdk/kysdk-system/libkybios.h
|
%{_includedir}/kysdk/kysdk-system/libkybios.h
|
||||||
%{_includedir}/kysdk/kysdk-system/libkyboard.h
|
%{_includedir}/kysdk/kysdk-system/libkyboard.h
|
||||||
%{_includedir}/kysdk/kysdk-system/libkyusb.h
|
%{_includedir}/kysdk/kysdk-system/libkyusb.h
|
||||||
%{_datadir}/kgconfig/kysdk-hardware.pc
|
%{_datadir}/pkgconfig/kysdk-hardware.pc
|
||||||
|
|
||||||
%files -n libkysdk-package
|
%files -n libkysdk-package
|
||||||
%{_prefix}/lib/kysdk/kysdk-system/libkypackage.so*
|
%{_prefix}/lib/kysdk/kysdk-system/libkypackage.so*
|
||||||
|
|
||||||
%files -n libkysdk-package-devel
|
%files -n libkysdk-package-devel
|
||||||
%{_includedir}/kysdk/kysdk-system/libkypackages.h
|
%{_includedir}/kysdk/kysdk-system/libkypackages.h
|
||||||
%{_datadir}/kgconfig/kysdk-package.pc
|
%{_datadir}/pkgconfig/kysdk-package.pc
|
||||||
|
|
||||||
%files -n libkysdk-proc
|
%files -n libkysdk-proc
|
||||||
%{_prefix}/lib/kysdk/kysdk-system/libkyrtinfo.so*
|
%{_prefix}/lib/kysdk/kysdk-system/libkyrtinfo.so*
|
||||||
@ -340,14 +340,14 @@ fi
|
|||||||
%files -n libkysdk-proc-devel
|
%files -n libkysdk-proc-devel
|
||||||
%{_includedir}/kysdk/kysdk-system/libkyrtinfo.h
|
%{_includedir}/kysdk/kysdk-system/libkyrtinfo.h
|
||||||
%{_includedir}/kysdk/kysdk-system/libkyprocess.h
|
%{_includedir}/kysdk/kysdk-system/libkyprocess.h
|
||||||
%{_datadir}/kgconfig/kysdk-proc.pc
|
%{_datadir}/pkgconfig/kysdk-proc.pc
|
||||||
|
|
||||||
%files -n libkysdk-powermanagement
|
%files -n libkysdk-powermanagement
|
||||||
%{_prefix}/lib/kysdk/kysdk-system/libkypowermanagement.so*
|
%{_prefix}/lib/kysdk/kysdk-system/libkypowermanagement.so*
|
||||||
|
|
||||||
%files -n libkysdk-powermanagement-devel
|
%files -n libkysdk-powermanagement-devel
|
||||||
%{_includedir}/kysdk/kysdk-system/libkylockscreen.h
|
%{_includedir}/kysdk/kysdk-system/libkylockscreen.h
|
||||||
%{_datadir}/kgconfig/kysdk-powermanagement.pc
|
%{_datadir}/pkgconfig/kysdk-powermanagement.pc
|
||||||
|
|
||||||
%files -n libkysdk-ocr
|
%files -n libkysdk-ocr
|
||||||
%{_prefix}/lib/kysdk/kysdk-system/libkyocr.so*
|
%{_prefix}/lib/kysdk/kysdk-system/libkyocr.so*
|
||||||
@ -356,7 +356,7 @@ fi
|
|||||||
|
|
||||||
%files -n libkysdk-ocr-devel
|
%files -n libkysdk-ocr-devel
|
||||||
%{_includedir}/kysdk/kysdk-system/libkyocr.hpp
|
%{_includedir}/kysdk/kysdk-system/libkyocr.hpp
|
||||||
%{_datadir}/kgconfig/kysdk-ocr.pc
|
%{_datadir}/pkgconfig/kysdk-ocr.pc
|
||||||
|
|
||||||
%files -n libkysdk-systemcommon
|
%files -n libkysdk-systemcommon
|
||||||
%{_sysconfdir}/ld.so.conf.d/kysdk-system.conf
|
%{_sysconfdir}/ld.so.conf.d/kysdk-system.conf
|
||||||
@ -369,24 +369,33 @@ fi
|
|||||||
|
|
||||||
%files -n libkysdk-location-devel
|
%files -n libkysdk-location-devel
|
||||||
%{_includedir}/kysdk/kysdk-system/libkylocation.h
|
%{_includedir}/kysdk/kysdk-system/libkylocation.h
|
||||||
%{_datadir}/kgconfig/kysdk-location.pc
|
%{_datadir}/pkgconfig/kysdk-location.pc
|
||||||
|
|
||||||
%files -n libkysdk-net
|
%files -n libkysdk-net
|
||||||
%{_prefix}/lib/kysdk/kysdk-system/libkynetinfo.so*
|
%{_prefix}/lib/kysdk/kysdk-system/libkynetinfo.so*
|
||||||
|
|
||||||
%files -n libkysdk-net-devel
|
%files -n libkysdk-net-devel
|
||||||
%{_includedir}/kysdk/kysdk-system/libkynetinfo.h
|
%{_includedir}/kysdk/kysdk-system/libkynetinfo.h
|
||||||
%{_datadir}/kgconfig/kysdk-net.pc
|
%{_datadir}/pkgconfig/kysdk-net.pc
|
||||||
|
|
||||||
%files -n libkysdk-realtime
|
%files -n libkysdk-realtime
|
||||||
%{_prefix}/lib/kysdk/kysdk-system/libkyrealtime.so*
|
%{_prefix}/lib/kysdk/kysdk-system/libkyrealtime.so*
|
||||||
|
|
||||||
%files -n libkysdk-realtime-devel
|
%files -n libkysdk-realtime-devel
|
||||||
%{_includedir}/kysdk/kysdk-system/libkyrealtimeinfo.h
|
%{_includedir}/kysdk/kysdk-system/libkyrealtimeinfo.h
|
||||||
%{_datadir}/kgconfig/kysdk-realtime.pc
|
%{_datadir}/pkgconfig/kysdk-realtime.pc
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 28 2023 peijiankang <peijiankang@kylinos.cn> - 2.0.0-4
|
||||||
|
- mv Requires libopencv-devel to opencv
|
||||||
|
|
||||||
|
* Thu Feb 09 2023 peijiankang <peijiankang@kylinos.cn> - 2.0.0-3
|
||||||
|
- add build debuginfo and debugsource
|
||||||
|
|
||||||
|
* Thu Jan 5 2023 peijiankang <peijiankang@kylinos.cn> - 2.0.0-2
|
||||||
|
- update installdir from kgconfig to pkgconfig
|
||||||
|
|
||||||
* Mon Dec 5 2022 peijiankang <peijiankang@kylinos.cn> - 2.0.0-1
|
* Mon Dec 5 2022 peijiankang <peijiankang@kylinos.cn> - 2.0.0-1
|
||||||
- update version to 2.0.0
|
- update version to 2.0.0
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user