From 8b811d7cad28fd0f79db0f1fa1dbfc947b478993 Mon Sep 17 00:00:00 2001 From: liping ke Date: Wed, 1 Sep 2010 17:38:24 +0800 Subject: Bug fix: poky root script file path need to add "/tmp" This patch is a bug fix for environment script path for poky tree mode. The correct path is input_poky_tree_build_path plus "/tmp". Signed-off-by: Liping Ke --- src/plugin.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/plugin.c b/src/plugin.c index 576fa0e..c7fa6ec 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -1382,12 +1382,12 @@ poky_mode_preference_notify_cb (AnjutaPreferences *pref, const gchar *key, g_free(sp->target_archs); if (sp->poky_mode == POKY_MODE_TOOLCHAIN && sp->sdk_root != NULL) - sp->target_archs = beaver_util_get_archs(sp->sdk_root); + sp->target_archs = beaver_util_get_archs(sp->sdk_root); else if (sp->poky_mode == POKY_MODE_FULL && sp->poky_root != NULL) { - dir = g_build_filename(sp->poky_root, TMPDIR, NULL); - sp->target_archs = beaver_util_get_archs(dir); - g_free(dir); + dir = g_build_filename(sp->poky_root, TMPDIR, NULL); + sp->target_archs = beaver_util_get_archs(dir); + g_free(dir); } anjuta_preferences_set(pref, PREFS_PROP_TARGET_ARCHS, sp->target_archs); @@ -1406,11 +1406,15 @@ poky_root_preference_notify_cb (AnjutaPreferences *pref, const gchar *key, { AnjutaPluginSdk *sp = (AnjutaPluginSdk *)userdata; GtkWidget *target_combo; + gchar *dir; g_free (sp->poky_root); sp->poky_root = anjuta_preferences_get (sp->prefs, PREFS_PROP_POKY_ROOT); g_free(sp->target_archs); - sp->target_archs = beaver_util_get_archs(sp->poky_root); + + dir = g_build_filename(sp->poky_root, TMPDIR, NULL); + sp->target_archs = beaver_util_get_archs(dir); + g_free(dir); anjuta_preferences_set(pref, PREFS_PROP_TARGET_ARCHS, sp->target_archs); -- cgit