Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev

3 files changed, 16 insertions, 2 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index d6f697aaa2..a44f20b55d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3234,6 +3234,10 @@ sha256=c94dbfa293cbc61b8571d025e90fd1f06a34f8d4e5b11a59856bfc1f13014de3
 md5=b9d77c57bda2e019207a1874d9bb4dea
 sha256=c94dbfa293cbc61b8571d025e90fd1f06a34f8d4e5b11a59856bfc1f13014de3
 
+[http://downloads.sourceforge.net/bwmng/bwm-ng-0.6.tar.gz]
+md5=d3a02484fb7946371bfb4e10927cebfb
+sha256=c1134358e268329d438b0996399003b0f0b966034fb4b5b138761c2f3c62ffdd
+
 [http://downloads.sourceforge.net/bwmon/bwmon-1.3.tar.gz]
 md5=53c44b73aa67d5e0282adfe928f3ba44
 sha256=624381208d0faae6c123bc6198a59d6c4316cd4fffb1ba5aca206374f5a42df6
@@ -11210,6 +11214,14 @@ sha256=84ac04a28ae41e17df0f181d8bc0049ae7a83baae07296e890ea5977a2952318
 md5=0a9209f928002e5eee9cdff8fef4d4b3
 sha256=c5c8a091ed9a1fa2dab86b4d87719064b50c202e8503046f50f299a361e6211c
 
+[ftp://ftp.debian.org/debian/pool/main/i/iptraf/iptraf_3.0.0-6.diff.gz]
+md5=fe0e2944addbd5803b42e91f7e4ec5d7
+sha256=5803c3f3653887896b75567daf617a8f200cecdd28beb870219b3954d9931efa
+
+[ftp://ftp.debian.org/debian/pool/main/i/iptraf/iptraf_3.0.0.orig.tar.gz]
+md5=377371c28ee3c21a76f7024920649ea8
+sha256=9ee433d95573d612539da4b452e6cdcbca6ab6674a88bfbf6eaf12d4902b5163
+
 [http://downloads.sourceforge.net/iptstate/iptstate-2.2.1.tar.bz2]
 md5=6b08f09b9917f644629efea1febec4b3
 sha256=004f8358f4f84d90a260a76ac46ce8512126ac490d73460fcee6c11effd34362
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 5df77d8c74..3d189b9dd0 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -15,11 +15,13 @@ FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-p
 FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
 FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2"
 FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+FULL_OPTIMIZATION_ep9312 = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O -fno-signed-zeros"
 
 BUILD_OPTIMIZATION = "-O2"
 BUILD_OPTIMIZATION_pn-perl = "-O1"
 BUILD_OPTIMIZATION_pn-glibc = "-O2"
 BUILD_OPTIMIZATION_sparc = "-O2"
+BUILD_OPTIMIZATION_ep9312 = "-O"
 
 TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel']]}"
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index a91efe4bd7..9d4668b4d8 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -54,7 +54,7 @@ THUMB_INTERWORK = "yes"
 #Use this variable in feeds and other parts that need a URI
 ANGSTROM_URI ?= "http://www.angstrom-distribution.org"
 
-#Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/*, /etc/apt/sources.list)
+#Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/, /etc/apt/sources.list)
 # usefull for derivative distros and local testing
 # As this is runtime we can't and won't use virtual/feed-configs
 ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs"
@@ -100,7 +100,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 LOCALE_UTF8_ONLY = "1"
 
 #qemu doesn't like this fp
-ENABLE_BINARY_LOCALE_GENERATION_ep93xx = "0"
+ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
 
 #qemu has taken a dislike to armeb as well
 ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"