From 62f36db42c78dc3dc65494a12a896ef91ee19041 Mon Sep 17 00:00:00 2001 From: gichan-jang Date: Fri, 12 Jun 2020 15:52:32 +0900 Subject: [PATCH] Remove flatbuf header from tflite-devel pkg Flatbuf-devel and tflite-devel is conflicted. This PR remove flatbuf header files from tflite-devel pkg. Change-Id: I30aad2951080b1b795b3ab29175515d814c95ea9 Signed-off-by: gichan-jang --- debian/rules | 2 -- debian/tensorflow-lite-dev.install | 1 - packaging/tensorflow.spec | 7 ------- 3 files changed, 10 deletions(-) diff --git a/debian/rules b/debian/rules index c8fcdb2c17..0a4b39120e 100755 --- a/debian/rules +++ b/debian/rules @@ -210,7 +210,6 @@ install: build install -d ${buildroot}${_includedir}/tensorflow/lite/tools install -d ${buildroot}${_includedir}/tensorflow/lite/schema install -d ${buildroot}${_includedir}/tensorflow/lite/profiling - install -d ${buildroot}${_includedir}/flatbuffers install -d ${buildroot}${_includedir}/tensorflow/contrib ln -sf ${_includedir}/tensorflow/lite ${buildroot}/${_includedir}/tensorflow/contrib/lite @@ -223,7 +222,6 @@ install: build install -m 0644 tensorflow/lite/tools/*.h ${buildroot}${_includedir}/tensorflow/lite/tools install -m 0644 tensorflow/lite/schema/*.h ${buildroot}${_includedir}/tensorflow/lite/schema install -m 0644 tensorflow/lite/profiling/*.h ${buildroot}${_includedir}/tensorflow/lite/profiling - install -m 0644 tensorflow/lite/tools/make/downloads/flatbuffers/include/flatbuffers/*.h ${buildroot}${_includedir}/flatbuffers # Make pkgconfig file install -m 0644 ${packagingdir}/${SOURCE4001} ${buildroot}${_libdir}/pkgconfig/tensorflow.pc diff --git a/debian/tensorflow-lite-dev.install b/debian/tensorflow-lite-dev.install index 6afe44ee69..98e3e8967f 100644 --- a/debian/tensorflow-lite-dev.install +++ b/debian/tensorflow-lite-dev.install @@ -1,4 +1,3 @@ -/usr/include/flatbuffers /usr/include/tensorflow/lite /usr/include/tensorflow/contrib/lite /usr/lib/libtensorflow-lite.a diff --git a/packaging/tensorflow.spec b/packaging/tensorflow.spec index f8733d045d..e71c348706 100644 --- a/packaging/tensorflow.spec +++ b/packaging/tensorflow.spec @@ -176,9 +176,6 @@ make -f tensorflow/lite/tools/make/Makefile TARGET=TIZEN TARGET_ARCH=%{_target_c mkdir -p %{buildroot}%{_libdir} #install for tensorflow lite -pushd build/flatbuffers/build -%make_install -popd mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_libdir}/pkgconfig @@ -190,7 +187,6 @@ mkdir -p %{buildroot}%{_includedir}/tensorflow/lite/core/api mkdir -p %{buildroot}%{_includedir}/tensorflow/lite/tools mkdir -p %{buildroot}%{_includedir}/tensorflow/lite/schema mkdir -p %{buildroot}%{_includedir}/tensorflow/lite/profiling -mkdir -p %{buildroot}%{_includedir}/flatbuffers mkdir -p %{buildroot}%{_datadir}/tensorflow/lite/schema/ # For backward compatibility with v1.09, where tf-lite was in contrib @@ -210,7 +206,6 @@ install -m 0644 tensorflow/lite/core/api/*.h %{buildroot}%{_includedir}/tensorfl install -m 0644 tensorflow/lite/tools/*.h %{buildroot}%{_includedir}/tensorflow/lite/tools install -m 0644 tensorflow/lite/schema/*.h %{buildroot}%{_includedir}/tensorflow/lite/schema install -m 0644 tensorflow/lite/profiling/*.h %{buildroot}%{_includedir}/tensorflow/lite/profiling -install -m 0644 tensorflow/lite/tools/make/downloads/flatbuffers/include/flatbuffers/*.h %{buildroot}%{_includedir}/flatbuffers install -m 0644 tensorflow/lite/schema/schema.fbs %{buildroot}%{_datadir}/tensorflow/lite/schema install -m 0644 ./tensorflow-lite.pc.in %{buildroot}%{_libdir}/pkgconfig/tensorflow-lite.pc @@ -219,8 +214,6 @@ install -m 0644 ./tensorflow-lite.pc.in %{buildroot}%{_libdir}/pkgconfig/tensorf %{_libdir}/pkgconfig/tensorflow-lite.pc %{_includedir}/tensorflow/lite %{_includedir}/tensorflow/contrib/lite -%{_includedir}/flatbuffers -%{_libdir}/cmake/flatbuffers/*.cmake %files -n tensorflow-lite-flatbuf-schema %{_datadir}/tensorflow/lite/schema/schema.fbs -- 2.34.1