summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/openslug.conf7
-rw-r--r--conf/machine/nslu2.conf3
2 files changed, 6 insertions, 4 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 5c57e878c2..3d0f4867c8 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -89,10 +89,11 @@ OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_EXT2_PROGS}"
OPENSLUG_STANDARD_DEPENDS += "reiserfsprogs"
OPENSLUG_STANDARD_RDEPENDS += "${OPENSLUG_REISER_PROGS}"
-# These lines add a build of the 'upslug' program which may be
+# These lines add a build of the 'upslug2' program which may be
# used to download the final image to an NSLU2. The program can
-# be found within the tmp/work/upslug-native* directory.
-OPENSLUG_STANDARD_DEPENDS += "upslug-native"
+# be found within the staging/<host>/bin directory. It must
+# be run as root but may be safely installed setuid root.
+OPENSLUG_STANDARD_DEPENDS += "upslug2-native"
# These lines add support for an X/Y/ZModem package called lrzsz
# (this is of use for people with modified NSLU2 hardware which
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index b17f9a4b3c..5a87441a2b 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -67,7 +67,8 @@ FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \
# uClibc does not include sinf or cosf, so the gcc auto-use of
# these functions must be disabled (this only occurs with -O)
-FULL_OPTIMIZATION_append_linux-uclibc = " -fno-builtin-sin -fno-builtin-cos"
+#This should be fixed in uclibc 0.9.28 and later
+#FULL_OPTIMIZATION_append_linux-uclibc = " -fno-builtin-sin -fno-builtin-cos"
#-------------------------------------------------------------------------------
# 'ARCH' options - package architecture and the 'target' architecture