summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-03-22 06:29:37 +0000
committerRod Whitby <rod@whitby.id.au>2007-03-22 06:29:37 +0000
commit6f9573c3645cbd28e592d50f255861d4d3468b54 (patch)
treedac2d23073809ee1045af5c81664255f55b1a2fa
parentaae9de2a89a3b6464ba893df30e711b574aa1467 (diff)
parent23cc5ff492484c5e8bf9a7c1e3c5692b5c94fc0c (diff)
merge of '4a47675ba44186490e7922a2cf7a5d1385cb2a82'
and '7180c92e9482cf342191a17a6c210e3ca3e5c7b9'
-rw-r--r--conf/distro/include/slugos.inc8
-rw-r--r--packages/meta/slugos-packages.bb3
2 files changed, 3 insertions, 8 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 8bb143dbba..d64cb2c917 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -43,13 +43,7 @@ INHERIT += "package_ipk debian multimachine"
# FULL_OPTIMIZATION
# Optimization settings. Os works fine and is significantly better than O2.
-# The other settings are somewhat arbitrary. The optimisations chosen here
-# include the ones which 'break' symbolic debugging (because the compiler does
-# not include enough information to allow the debugger to know where given
-# values are.) The -fno options are an attempt to cancel explicit use of space
-# consuming options found in some packages (this isn't a complete list, this is
-# just the ones which package writers seem to know about and abuse).
-FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers -fno-unroll-loops -fno-inline-functions -fweb -funit-at-a-time"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
#----------------------------------------------------------------------------------
# FEEDS
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 784d765cf7..18647c5c07 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r25"
+PR = "r26"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2"
@@ -171,6 +171,7 @@ SLUGOS_PACKAGES = "\
watchdog \
wget \
wireless-tools \
+ wireshark \
wpa-supplicant \
zd1211-firmware \
zip \