summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Alley2010-01-27 14:29:40 +0100
committerPeter Korsgaard2010-02-17 12:03:56 +0100
commit6c9d3873c0cc9f55bf3f1ddd409d496734d9a158 (patch)
treef655c1b99e6b47bc8ca74ac8c94d83555a383154
parentMerge branch 'uclibc-iconv-fix' of git://git.busybox.net/~tpetazzoni/git/buil... (diff)
downloadbuildroot-6c9d3873c0cc9f55bf3f1ddd409d496734d9a158.tar.gz
buildroot-6c9d3873c0cc9f55bf3f1ddd409d496734d9a158.tar.xz
buildroot-6c9d3873c0cc9f55bf3f1ddd409d496734d9a158.zip
at91boostrap makefile, correct typo in line continuation character.
The rule to copy the resulting binary file into the binary directory had a typo in the line continuation character that results in a spurious error message being produced. Signed-off-by: Rob Alley <Rob.Alley@navmanwireless.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES4
-rw-r--r--target/device/Atmel/at91bootstrap/at91bootstrap.mk2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 37bc22c1b..05cb4aef1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,10 @@
Updated/fixed packages: alsa-lib, argus, at, gst-plugins-good,
libpcap, rsync, tcl, xproto_trapproto
+ Issues resolved (http://bugs.uclibc.org):
+
+ #1069: [PATCH] The AT91BOOTSTRAP makefile contains a typo
+
2010.02-rc1, Released February 9th, 2010:
Fixes all over the tree and new features.
diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk
index 32ed3e2f6..f681fa981 100644
--- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk
+++ b/target/device/Atmel/at91bootstrap/at91bootstrap.mk
@@ -68,7 +68,7 @@ else
make MEMORY=$(AT91BOOTSTRAP_MEMORY) \
CROSS_COMPILE=$(TARGET_CROSS) \
-C $(AT91BOOTSTRAP_DIR) boot
- make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install || ±
+ make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install || \
echo "Could not copy bootstrap to BINARIES_DIR"
ifneq ($(BR2_TARGET_ATMEL_COPYTO),)
make DESTDIR=$(BR2_TARGET_ATMEL_COPYTO) -C $(AT91BOOTSTRAP_DIR) install || \