From 5bfbda0a4d72c7a85fd6d28343eda7c31d707018 Mon Sep 17 00:00:00 2001 From: "wansu.yoo" Date: Wed, 18 Sep 2019 10:41:49 +0900 Subject: [PATCH] fix build error -. remove symlink file -. remove sample unused libraries Change-Id: I1334f2ef02b1d8bf585e7aa031a6935d6aa7fbee Signed-off-by: wansu.yoo --- Makefile | 10 +--------- libedge-orchestration/Makefile | 4 +--- libedge-orchestration/sample/myscoring/myscoring.conf | 5 ----- libedge-orchestration/sample/myscoring2/myscoring2.conf | 5 ----- packaging/edge-orchestration.spec | 6 +----- 5 files changed, 3 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index 6760c8e..3e78d19 100644 --- a/Makefile +++ b/Makefile @@ -26,14 +26,10 @@ LIBPKG_SAMPLE_DIR := $(LIBPKG_DIR)/sample # Default scoring LIBSCORE_SAMPLE := myscoring -LIBSCORE_SAMPLE_LIBRARY := libmyscoring.so -LIBSCORE_SAMPLE_VER := 1.0.1 LIBSCORE_SAMPLE_CONF := myscoring.conf LIBSCORE_SAMPLE_DIR := $(LIBPKG_SAMPLE_DIR)/$(LIBSCORE_SAMPLE) LIBSCORE_SAMPLE_2 := myscoring2 -LIBSCORE_SAMPLE_2_LIBRARY := libmyscoring2.so -LIBSCORE_SAMPLE_2_VER := 1.0.1 LIBSCORE_SAMPLE_2_CONF := myscoring2.conf LIBSCORE_SAMPLE_2_DIR := $(LIBPKG_SAMPLE_DIR)/$(LIBSCORE_SAMPLE_2) @@ -78,19 +74,15 @@ install: install -d $(DESTDIR)/usr/lib install -d $(DESTDIR)/usr/include/$(PKG_NAME) install -d $(DESTDIR)/usr/lib/pkgconfig - - install -m 644 $(LIBPKG_LIB_DIR)/$(LIBPKG_LIB_FILE).* $(DESTDIR)/usr/lib - cp -r $(LIBPKG_LIB_DIR)/$(LIBPKG_LIB_FILE) $(DESTDIR)/usr/lib + install -m 755 $(LIBPKG_LIB_DIR)/$(LIBPKG_LIB_FILE) $(DESTDIR)/usr/lib install -m 644 $(BASE_DIR)/$(PKG_NAME).pc.in $(DESTDIR)/usr/lib/pkgconfig/$(PKG_NAME).pc install -m 644 $(LIBPKG_INC_DIR)/$(LIBPKG_HEADER_FILE) $(DESTDIR)/usr/include/$(PKG_NAME) install -d $(DESTDIR)/$(TARGET_LIBSCORE_DIR)/$(LIBSCORE_SAMPLE) install -d $(DESTDIR)/$(TARGET_LIBSCORE_DIR)/$(LIBSCORE_SAMPLE_2) install -m 644 $(LIBSCORE_SAMPLE_DIR)/$(LIBSCORE_SAMPLE_CONF) $(DESTDIR)/$(TARGET_LIBSCORE_DIR)/$(LIBSCORE_SAMPLE)/ - install -m 644 $(LIBSCORE_SAMPLE_DIR)/$(LIBSCORE_SAMPLE_LIBRARY).$(LIBSCORE_SAMPLE_VER) $(DESTDIR)/$(TARGET_LIBSCORE_DIR)/$(LIBSCORE_SAMPLE)/ install -m 644 $(LIBSCORE_SAMPLE_2_DIR)/$(LIBSCORE_SAMPLE_2_CONF) $(DESTDIR)/$(TARGET_LIBSCORE_DIR)/$(LIBSCORE_SAMPLE_2)/ - install -m 644 $(LIBSCORE_SAMPLE_2_DIR)/$(LIBSCORE_SAMPLE_2_LIBRARY).$(LIBSCORE_SAMPLE_2_VER) $(DESTDIR)/$(TARGET_LIBSCORE_DIR)/$(LIBSCORE_SAMPLE_2)/ ## c test and coverage test: diff --git a/libedge-orchestration/Makefile b/libedge-orchestration/Makefile index b29b4d9..a3b0a2f 100644 --- a/libedge-orchestration/Makefile +++ b/libedge-orchestration/Makefile @@ -8,7 +8,6 @@ LIB_DIR := lib SRC_DIR := src SAMPLE_DIR := sample LIBRARY_FILE := liborchestration-client.so -LIBRARY_VERSION := 0.1.0 SRC_FILES := \ $(SRC_DIR)/orchestration_client.c \ $(SRC_DIR)/dbus_consumer.c @@ -30,8 +29,7 @@ build-sample: build build: mkdir -p $(LIB_DIR) $(CC) -fPIC -Wall -c -I $(INC_DIR) `pkg-config --libs --cflags gio-2.0 gio-unix-2.0 glib-2.0` $(SRC_FILES) - $(CC) -shared -g -Wall -Werror $(OBJ_FILES) -o $(LIB_DIR)/$(LIBRARY_FILE).$(LIBRARY_VERSION) -I $(INC_DIR) - ln -sf $(LIBRARY_FILE).$(LIBRARY_VERSION) $(LIB_DIR)/$(LIBRARY_FILE) + $(CC) -shared -g -Wall -Werror $(OBJ_FILES) -o $(LIB_DIR)/$(LIBRARY_FILE) -I $(INC_DIR) -rm -f $(OBJ_FILES) clean: diff --git a/libedge-orchestration/sample/myscoring/myscoring.conf b/libedge-orchestration/sample/myscoring/myscoring.conf index 3cb5593..6bf0e5d 100644 --- a/libedge-orchestration/sample/myscoring/myscoring.conf +++ b/libedge-orchestration/sample/myscoring/myscoring.conf @@ -6,9 +6,4 @@ ConfVersion=v0.0 ; Version of Configurati ServiceName=list_segments ; Name of distributed service [ScoringMethod] -LibFile=./libmyscoring.so ; Library file name -FunctionName=myscoring - -[ResourceType] IntervalTimeMs=1000 ; Interval time of get resource -MaxCount=10 ; Number of times diff --git a/libedge-orchestration/sample/myscoring2/myscoring2.conf b/libedge-orchestration/sample/myscoring2/myscoring2.conf index 4761354..b2bcf84 100644 --- a/libedge-orchestration/sample/myscoring2/myscoring2.conf +++ b/libedge-orchestration/sample/myscoring2/myscoring2.conf @@ -6,9 +6,4 @@ ConfVersion=v0.0 ; Version of Configurati ServiceName=org.tizen.chromium-efl ; Name of distributed service [ScoringMethod] -LibFile=./libmyscoring.so ; Library file name -FunctionName=myscoring - -[ResourceType] IntervalTimeMs=1000 ; Interval time of get resource -MaxCount=10 ; Number of times diff --git a/packaging/edge-orchestration.spec b/packaging/edge-orchestration.spec index e02cf2b..b37efad 100644 --- a/packaging/edge-orchestration.spec +++ b/packaging/edge-orchestration.spec @@ -95,9 +95,6 @@ export ARCH=arm systemctl daemon-reload systemctl restart %{name} -%post -n libedge-orchestration-devel -ln -sf %{_sysconfdir}/%{name}/apps/myscoring/libmyscoring.so.1.0.1 %{_sysconfdir}/%{name}/apps/myscoring/libmyscoring.so -ln -sf %{_sysconfdir}/%{name}/apps/myscoring2/libmyscoring2.so.1.0.1 %{_sysconfdir}/%{name}/apps/myscoring2/libmyscoring2.so %files %manifest %{name}.manifest @@ -115,10 +112,9 @@ ln -sf %{_sysconfdir}/%{name}/apps/myscoring2/libmyscoring2.so.1.0.1 %{_sysconfd %files -n libedge-orchestration %manifest lib%{name}.manifest %license LICENSE.Apache-2.0 -%attr(755,system_fw,system_fw)%{_libdir}/liborchestration-client.so.* +%attr(755,system_fw,system_fw)%{_libdir}/liborchestration-client.so %files -n libedge-orchestration-devel -%attr(755,system_fw,system_fw)%{_libdir}/liborchestration-client.so %attr(755,system_fw,system_fw)%{_libdir}/pkgconfig/%{name}.pc %attr(755,system_fw,system_fw)%{_includedir}/%{name}/orchestration_client.h # orchestration sample -- 2.7.4