From 7dc272605dff3d1f05bacd61930c3b3b90e17ff0 Mon Sep 17 00:00:00 2001 From: Kitae Kim Date: Fri, 15 Mar 2013 17:46:09 +0900 Subject: [PATCH] package: modify a build script for dibs. The script to enable kvm driver on ubuntu32 is dependent on x86 arch. Change-Id: I2fef05b65a76a56eee8fa837135559ddeeeed1c3 Signed-off-by: Kitae Kim --- ...all.ubuntu-32 => emulator-qemu-x86.install.ubuntu-32} | 0 ...all.ubuntu-64 => emulator-qemu-x86.install.ubuntu-64} | 0 tizen/src/Makefile | 9 +++++---- 3 files changed, 5 insertions(+), 4 deletions(-) rename package/{emulator-qemu-common.install.ubuntu-32 => emulator-qemu-x86.install.ubuntu-32} (100%) rename package/{emulator-qemu-common.install.ubuntu-64 => emulator-qemu-x86.install.ubuntu-64} (100%) diff --git a/package/emulator-qemu-common.install.ubuntu-32 b/package/emulator-qemu-x86.install.ubuntu-32 similarity index 100% rename from package/emulator-qemu-common.install.ubuntu-32 rename to package/emulator-qemu-x86.install.ubuntu-32 diff --git a/package/emulator-qemu-common.install.ubuntu-64 b/package/emulator-qemu-x86.install.ubuntu-64 similarity index 100% rename from package/emulator-qemu-common.install.ubuntu-64 rename to package/emulator-qemu-x86.install.ubuntu-64 diff --git a/tizen/src/Makefile b/tizen/src/Makefile index 4dc67fdfe3..7a139d4d82 100755 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -129,7 +129,7 @@ else endif ifdef CONFIG_DARWIN - install_name_tool -change /opt/local/lib/libgthread-2.0.*.dylib @loader_path/libgthread-2.0.0.dylib $(EMUL_DIR)/bin/qemu-img + install_name_tool -change /opt/local/lib/libgthread-2.0.*.dylib @loader_path/libgthread-2.0.0.dylib $(EMUL_DIR)/bin/qemu-img install_name_tool -change /opt/local/lib/libglib-2.0.*.dylib @loader_path/libglib-2.0.0.dylib $(EMUL_DIR)/bin/qemu-img install_name_tool -change /opt/local/lib/libintl.8.dylib @loader_path/libintl.8.dylib $(EMUL_DIR)/bin/qemu-img install_name_tool -change /opt/local/lib/gcc47/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib $(EMUL_DIR)/bin/qemu-img @@ -162,6 +162,7 @@ install_dibs: all_dibs mkdir -p $(DIBS_COMMON_DIR)/etc mkdir -p $(DIBS_X86_DIR)/bin mkdir -p $(DIBS_X86_DIR)/data + mkdir -p $(DIBS_X86_DIR)/etc mkdir -p $(DIBS_ARM_DIR)/bin ifndef CONFIG_DARWIN @for target in $(TARGET_DIRS); do \ @@ -211,9 +212,9 @@ ifdef CONFIG_DARWIN cp sdbscript $(DIBS_COMMON_DIR)/bin endif ifdef CONFIG_LINUX - echo "Copying tizen-kvm to $(DIBS_COMMON_DIR)/etc" - cp -pPr ../distrib/initscript/tizen-kvm $(DIBS_COMMON_DIR)/etc - cp -pPr ../distrib/initscript/45-tizen-kvm.rules $(DIBS_COMMON_DIR)/etc + echo "Copying tizen-kvm to $(DIBS_X86_DIR)/etc" + cp -pPr ../distrib/initscript/tizen-kvm $(DIBS_X86_DIR)/etc + cp -pPr ../distrib/initscript/45-tizen-kvm.rules $(DIBS_X86_DIR)/etc endif ifndef CONFIG_DARWIN -- 2.34.1