summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2007-08-07 17:08:13 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2007-08-07 17:08:13 (GMT)
commit72caaf7717e574fa5f08f8069724e27acfe25cc9 (patch)
tree605bacb9fba51fb6c1c07a6ffc604ccac259eb1a
parentf1741dc507fd560891cc3769385e72369b6cc7b8 (diff)
Revert previous spurious commit.
-rw-r--r--Makefile.in4
-rwxr-xr-xscripts/crosstool.sh14
-rw-r--r--tools/populate.in2
3 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in
index 083c703..52168fa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,7 +44,7 @@ build-man: docs/ct-ng.1.gz
docs/ct-ng.1.gz: docs/ct-ng.1
@echo " GZIP $@"
- @gzip -c9 $< >$@
+ @gzip -f9 $<
%: %.in
@echo " SED $@"
@@ -66,7 +66,7 @@ clean-bin:
clean-lib:
clean-doc:
- @rm -f docs/ct-ng.1 docs/ct-ng.1.gz
+ @rm -f docs/ct-ng.1.gz
#--------------------------------------
# Install rules
diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh
index 3eabcec..654efd2 100755
--- a/scripts/crosstool.sh
+++ b/scripts/crosstool.sh
@@ -147,7 +147,7 @@ CT_DoLog EXTRA "Preparing working directories"
if [ -d "${CT_BUILD_DIR}" ]; then
mv "${CT_BUILD_DIR}" "${CT_BUILD_DIR}.$$"
chmod -R u+w "${CT_BUILD_DIR}.$$"
- setsid nohup rm -rf "${CT_BUILD_DIR}.$$" >/dev/null 2>&1 &
+ nohup rm -rf "${CT_BUILD_DIR}.$$" >/dev/null 2>&1 &
fi
# Don't eradicate directories if we need to restart
@@ -158,28 +158,28 @@ if [ -z "${CT_RESTART}" ]; then
if [ "${CT_FORCE_DOWNLOAD}" = "y" -a -d "${CT_TARBALLS_DIR}" ]; then
mv "${CT_TARBALLS_DIR}" "${CT_TARBALLS_DIR}.$$"
chmod -R u+w "${CT_TARBALLS_DIR}.$$"
- setsid nohup rm -rf "${CT_TARBALLS_DIR}.$$" >/dev/null 2>&1 &
+ nohup rm -rf "${CT_TARBALLS_DIR}.$$" >/dev/null 2>&1 &
fi
if [ "${CT_FORCE_EXTRACT}" = "y" -a -d "${CT_SRC_DIR}" ]; then
mv "${CT_SRC_DIR}" "${CT_SRC_DIR}.$$"
chmod -R u+w "${CT_SRC_DIR}.$$"
- setsid nohup rm -rf "${CT_SRC_DIR}.$$" >/dev/null 2>&1 &
+ nohup rm -rf "${CT_SRC_DIR}.$$" >/dev/null 2>&1 &
fi
if [ -d "${CT_INSTALL_DIR}" ]; then
mv "${CT_INSTALL_DIR}" "${CT_INSTALL_DIR}.$$"
chmod -R u+w "${CT_INSTALL_DIR}.$$"
- setsid nohup rm -rf "${CT_INSTALL_DIR}.$$" >/dev/null 2>&1 &
+ nohup rm -rf "${CT_INSTALL_DIR}.$$" >/dev/null 2>&1 &
fi
if [ -d "${CT_DEBUG_INSTALL_DIR}" ]; then
mv "${CT_DEBUG_INSTALL_DIR}" "${CT_DEBUG_INSTALL_DIR}.$$"
chmod -R u+w "${CT_DEBUG_INSTALL_DIR}.$$"
- setsid nohup rm -rf "${CT_DEBUG_INSTALL_DIR}.$$" >/dev/null 2>&1 &
+ nohup rm -rf "${CT_DEBUG_INSTALL_DIR}.$$" >/dev/null 2>&1 &
fi
# In case we start anew, get rid of the previously saved state directory
if [ -d "${CT_STATE_DIR}" ]; then
mv "${CT_STATE_DIR}" "${CT_STATE_DIR}.$$"
chmod -R u+w "${CT_STATE_DIR}.$$"
- setsid nohup rm -rf "${CT_STATE_DIR}.$$" >/dev/null 2>&1 &
+ nohup rm -rf "${CT_STATE_DIR}.$$" >/dev/null 2>&1 &
fi
fi
@@ -364,7 +364,7 @@ if [ -z "${CT_RESTART}" ]; then
if [ "${CT_ONLY_DOWNLOAD}" != "y" ]; then
if [ "${CT_FORCE_EXTRACT}" = "y" ]; then
mv "${CT_SRC_DIR}" "${CT_SRC_DIR}.$$"
- setsid nohup rm -rf "${CT_SRC_DIR}.$$" >/dev/null 2>&1
+ nohup rm -rf "${CT_SRC_DIR}.$$" >/dev/null 2>&1
fi
CT_DoStep INFO "Extracting and patching toolchain components"
do_kernel_extract
diff --git a/tools/populate.in b/tools/populate.in
index 690dc5f..6d50fbe 100644
--- a/tools/populate.in
+++ b/tools/populate.in
@@ -71,7 +71,7 @@ fi
# Get rid of potentially older destination directory
if [ -d "${CT_ROOT_DST_DIR}" ]; then
mv "${CT_ROOT_DST_DIR}" "${CT_ROOT_DST_DIR}.$$"
- setsid nohup rm -rf "${CT_ROOT_DST_DIR}.$$" >/dev/null 2>&1 &
+ nohup rm -rf "${CT_ROOT_DST_DIR}.$$" >/dev/null 2>&1 &
fi
# Create the working copy