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 <gichan2.jang@samsung.com>

diff --git a/debian/rules b/debian/rules
index c8fcdb2c173c83532d415a8562fd3f75c03f4bad..0a4b39120eb1c54917021fd23877856fa506ad8b 100755 (executable)
--- 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 6afe44ee69e6480ec1d1aca73a8af3674b0f86ca..98e3e8967f86cc6f3f0a8a23d133e84558d5afe8 100644 (file)
--- 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 f8733d045dee38747c5e799c11241b2d12616a09..e71c348706bb6d9442c95bad24f22c7dd64be4e7 100644 (file)
--- 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