From 6b37673b6477be9c3796ce8f398f9f823471d21f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sat, 12 Sep 2009 00:10:38 +0200 Subject: samples: fix saving samples Use a correct sed pattern when setting CT_PREFIX_DIR --- scripts/saveSample.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/saveSample.sh.in') diff --git a/scripts/saveSample.sh.in b/scripts/saveSample.sh.in index 4ef71ce2..9e4e3584 100644 --- a/scripts/saveSample.sh.in +++ b/scripts/saveSample.sh.in @@ -69,7 +69,7 @@ samp_dir="samples/${samp_name}" mkdir -p "${samp_dir}" # Save the crosstool-NG config file -"${sed}" -r -e 's|^(CT_PREFIX_DIR)=.*|\1="${HOME}/x-tools/${samp_name}"|;' \ +"${sed}" -r -e 's|^(CT_PREFIX_DIR)=.*|\1="${HOME}/x-tools/${CT_TARGET}"|;' \ -e 's|^# CT_LOG_TO_FILE is not set$|CT_LOG_TO_FILE=y|;' \ -e 's|^# CT_LOG_FILE_COMPRESS is not set$|CT_LOG_FILE_COMPRESS=y|;' \ -e 's|^(CT_LOCAL_TARBALLS_DIR)=.*|\1="${HOME}/src"|;' \ -- cgit v1.2.3 From 2d6a221babda79345734688ffd9f36261121cae0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 13 Sep 2009 17:14:28 +0200 Subject: samples: correclty fix saving samples with a C library config file --- scripts/saveSample.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/saveSample.sh.in') diff --git a/scripts/saveSample.sh.in b/scripts/saveSample.sh.in index 9e4e3584..e91dc9e0 100644 --- a/scripts/saveSample.sh.in +++ b/scripts/saveSample.sh.in @@ -99,7 +99,7 @@ fi if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then # We save the file, and then point the saved sample to this file CT_DoAddFileToSample "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config" - "${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE)=.+$|\1="'"${samp_top_dir}"'/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"|;' \ + "${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE)=.+$|\1="'"${samp_top_dir}"'/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"|;' \ "${samp_dir}/crosstool.config" else # remove any dangling files -- cgit v1.2.3