[oe-commits] org.oe.dev merge of '73862e82dbaa87f0d1f27cd2641785c761b41227'

[xora commit]

merge of '73862e82dbaa87f0d1f27cd2641785c761b41227'
     and 'ada36533264ca20fee46b2e51218c9ddf7b71126'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 2341ba088d08913693fdcc952b55be8c92ac531f
ViewMTN: http://monotone.openembedded.org/revision/info/2341ba088d08913693fdcc952b55be8c92ac531f
Files:
1
packages/meta/slugos-packages.bb
packages/net-tools/net-tools_1.60.bb
conf/distro/angstrom-2007.1.conf
Diffs:

#
# mt diff -r73862e82dbaa87f0d1f27cd2641785c761b41227 -r2341ba088d08913693fdcc952b55be8c92ac531f
#
# 
# 
# patch "packages/meta/slugos-packages.bb"
#  from [c7013eacc72de83c038d4af1c8c1b1d6b83413de]
#    to [710798742d5727a86f4c0272ea66e003273c4b35]
# 
# patch "packages/net-tools/net-tools_1.60.bb"
#  from [9e4ea374187492b21ee825bf3a2e880b849e19fb]
#    to [baf9e7eb188d5294661a098b42290a5b3cfae8e5]
# 
============================================================
--- packages/meta/slugos-packages.bb	c7013eacc72de83c038d4af1c8c1b1d6b83413de
+++ packages/meta/slugos-packages.bb	710798742d5727a86f4c0272ea66e003273c4b35
@@ -211,9 +211,9 @@ SLUGOS_PACKAGES = "\
 	wireless-tools \
 	wireshark \
 	wpa-supplicant \
-        wview-sim wview-sim-mysql \
-	wview-vpro wview-vpro-mysql \
-	wview-wxt510 wview-wxt510-mysql \
+        wview-sim \
+	wview-vpro \
+	wview-wxt510 \
 	xinetd \
 	yeaphone \
 	yp-tools ypbind ypserv \
@@ -238,6 +238,7 @@ SLUGOS_BROKEN_PACKAGES = "\
 	openocd task-mokogateway-everything \
 	task-native-sdk \
 	unionfs-modules unionfs-utils \
+	wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \
 	zd1211 \
 	"
 
============================================================
--- packages/net-tools/net-tools_1.60.bb	9e4ea374187492b21ee825bf3a2e880b849e19fb
+++ packages/net-tools/net-tools_1.60.bb	baf9e7eb188d5294661a098b42290a5b3cfae8e5
@@ -1,7 +1,7 @@ LICENSE="GPL"
 SUMMARY="Basic networking tools"
 LICENSE="GPL"
+PR = "r1"
 
-
 #
 # NOTE:
 #   This code currently disbles gettext/i18n! This can be fixed by rerunning
@@ -73,8 +73,8 @@ do_compile() {
 }
 
 do_compile() {
-    export COPTS=$CFLAGS
-    export LOPTS=$LDFLAGS
+    export COPTS="$CFLAGS"
+    export LOPTS="$LDFLAGS"
     unset CFLAGS
     unset LDFLAGS
 


#
# mt diff -rada36533264ca20fee46b2e51218c9ddf7b71126 -r2341ba088d08913693fdcc952b55be8c92ac531f
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [e97c45e12a1c234a20806eeedde2ff0900f49f75]
#    to [05ca84273c41744cd1fec58e61038e6ce197c091]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	e97c45e12a1c234a20806eeedde2ff0900f49f75
+++ conf/distro/angstrom-2007.1.conf	05ca84273c41744cd1fec58e61038e6ce197c091
@@ -84,6 +84,10 @@ PREFERRED_VERSION_gcc-cross-initial_dht-
 PREFERRED_VERSION_gcc-cross-sdk_dht-walnut     ?= "4.1.1"
 PREFERRED_VERSION_gcc-cross-initial_dht-walnut ?= "4.1.1"
 
+PREFERRED_VERSION_gcc_xilinx-ml403               ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross_xilinx-ml403         ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403     ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1"
 
 PREFERRED_VERSION_gcc_mpc8323e-rdb               ?= "4.1.1"
 PREFERRED_VERSION_gcc-cross_mpc8323e-rdb         ?= "4.1.1"