Revert "Modify bsdiff to be built during gbs build"

This reverts commit 652c9a8e4c96fb93d006574aba8c23ad34c9f93b.

Reason for revert: Since the libdivsufsort is not usable, to prevent build error, revert this commit.

Change-Id: Ic0043000c8297c4a9f9bb4115dac8e8e54add018

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 028b5fa..fd12d3e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1 @@
 PROJECT(upgrade-tools)
-
-ADD_SUBDIRECTORY(bsdiff)

diff --git a/bsdiff/CMakeLists.txt b/bsdiff/CMakeLists.txt
index 66d45f8..fb65ea5 100644 (file)
--- a/bsdiff/CMakeLists.txt
+++ b/bsdiff/CMakeLists.txt
@@ -17,4 +17,4 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 
 ADD_EXECUTABLE(ss_bsdiff ${ss_bsdiff_SRCS})
 TARGET_LINK_LIBRARIES(ss_bsdiff ${${PROJECT_NAME}_pkgs_LDFLAGS} "-g" "-pthread")
-INSTALL(TARGETS ss_bsdiff DESTINATION ${INSTALL_PATH})
+INSTALL(TARGETS ss_bsdiff DESTINATION bin)

diff --git a/packaging/upgrade-tools.spec b/packaging/upgrade-tools.spec
index ae513cf..cd8f80e 100644 (file)
--- a/packaging/upgrade-tools.spec
+++ b/packaging/upgrade-tools.spec
@@ -1,7 +1,3 @@
-%define install_path /%{name}
-%define mk_delta_install_path %{install_path}/mk_delta
-%define bin_install_path %{mk_delta_install_path}/common/bin
-
 Name:          upgrade-tools
 Version:       0.1.0
 Release:       0
@@ -11,25 +7,23 @@ Group:               System/Tools
 Source0:       %{name}-%{version}.tar.gz
 
 BuildRequires: cmake
-BuildRequires: pkgconfig(libbrotlienc)
-BuildRequires: pkgconfig(libdivsufsort)
+BuildRequires: pkgconfig(python3)
 
 %description
 Tools for upgrade
 
 %prep
 %setup -q
-%cmake . -DINSTALL_PATH=%{bin_install_path}
+%cmake .
 
 %build
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/%{bin_install_path}
-cp -r ./scripts %{buildroot}/%{install_path}
-cp -r ./mk_delta/common %{buildroot}/%{mk_delta_install_path}/.
-%make_install
+mkdir -p %{buildroot}/upgrade-tools/mk_delta
+cp -r ./scripts %{buildroot}/upgrade-tools/.
+cp -r ./mk_delta/common %{buildroot}/upgrade-tools/mk_delta/.
 
 %files
-%{install_path}/*
+/upgrade-tools/*