[oe-commits] org.oe.dev merge of '36192872b2176688fcbc4233f22dc68b6987bd11'

[xora commit]

merge of '36192872b2176688fcbc4233f22dc68b6987bd11'
     and '3efef7b4ec3372c8afd945bbe044ae2bc011cb38'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: a938b4c71ba294501c06bafd379472de8bf9458e
ViewMTN: http://monotone.openembedded.org/revision/info/a938b4c71ba294501c06bafd379472de8bf9458e
Files:
1
packages/netbase/netbase/fic-gta01/interfaces
packages/netbase/netbase/fic-gta02/interfaces
packages/netbase/netbase_4.21.bb
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
packages/tasks/task-base.bb
Diffs:

#
# mt diff -r36192872b2176688fcbc4233f22dc68b6987bd11 -ra938b4c71ba294501c06bafd379472de8bf9458e
#
# 
# 
# patch "packages/netbase/netbase/fic-gta01/interfaces"
#  from [b119191890448d523db7d93579548ffd89c4a050]
#    to [994ab7e5993a6cceab226b5b58a95031d6466741]
# 
# patch "packages/netbase/netbase/fic-gta02/interfaces"
#  from [b119191890448d523db7d93579548ffd89c4a050]
#    to [994ab7e5993a6cceab226b5b58a95031d6466741]
# 
# patch "packages/netbase/netbase_4.21.bb"
#  from [8d3a1db23199321161b8aec311e1e9170f56d2bb]
#    to [7d4b4b1ee1b6a900f60e97a679a2597ee3a38fbd]
# 
============================================================
--- packages/netbase/netbase/fic-gta01/interfaces	b119191890448d523db7d93579548ffd89c4a050
+++ packages/netbase/netbase/fic-gta01/interfaces	994ab7e5993a6cceab226b5b58a95031d6466741
@@ -22,6 +22,7 @@ iface usb0 inet static
 	netmask 255.255.255.0
 	network 192.168.0.0
 	gateway 192.168.0.200
+	up echo nameserver 192.168.0.200 >/etc/resolv.conf
 
 # Bluetooth networking
 iface bnep0 inet dhcp
============================================================
--- packages/netbase/netbase/fic-gta02/interfaces	b119191890448d523db7d93579548ffd89c4a050
+++ packages/netbase/netbase/fic-gta02/interfaces	994ab7e5993a6cceab226b5b58a95031d6466741
@@ -22,6 +22,7 @@ iface usb0 inet static
 	netmask 255.255.255.0
 	network 192.168.0.0
 	gateway 192.168.0.200
+	up echo nameserver 192.168.0.200 >/etc/resolv.conf
 
 # Bluetooth networking
 iface bnep0 inet dhcp
============================================================
--- packages/netbase/netbase_4.21.bb	8d3a1db23199321161b8aec311e1e9170f56d2bb
+++ packages/netbase/netbase_4.21.bb	7d4b4b1ee1b6a900f60e97a679a2597ee3a38fbd
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r23"
+PR = "r24"
 
 inherit update-rc.d
 


#
# mt diff -r3efef7b4ec3372c8afd945bbe044ae2bc011cb38 -ra938b4c71ba294501c06bafd379472de8bf9458e
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [b266e41e304fb5ce0ec4b11c2fe160cb123bbe47]
#    to [e97c45e12a1c234a20806eeedde2ff0900f49f75]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [5064b92d581b19db3f8834669b3079f971c98b2f]
#    to [a44e85b6e6e664e9244ae58e75d3bf2d3d3162cf]
# 
# patch "packages/tasks/task-base.bb"
#  from [cdcb312e0d4f77e69ca83bf82f6643335a03135c]
#    to [1a67a9902fc957b26de1621d69f747dac26ee6e2]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	b266e41e304fb5ce0ec4b11c2fe160cb123bbe47
+++ conf/distro/angstrom-2007.1.conf	e97c45e12a1c234a20806eeedde2ff0900f49f75
@@ -14,7 +14,7 @@ require conf/distro/include/sane-srcrevs
 require conf/distro/include/sane-srcrevs.inc
 
 #Images built can have to modes:
-# 'debug': empty rootpassword, strace and gdb included
+# 'debug': empty rootpassword, strace included
 # 'release' no root password, no strace and gdb by default
 DISTRO_TYPE ?= "debug"
 #DISTRO_TYPE = "release"
@@ -206,7 +206,7 @@ DEBUG_APPS ?= ""
 
 # We want to ship extra debug utils in the rootfs when doing a debug build 
 DEBUG_APPS ?= ""
-DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}'
+DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}'
 
 #this should go away soon
 EXTRA_STUFF ?= ""
============================================================
--- conf/distro/angstrom-2008.1.conf	5064b92d581b19db3f8834669b3079f971c98b2f
+++ conf/distro/angstrom-2008.1.conf	a44e85b6e6e664e9244ae58e75d3bf2d3d3162cf
@@ -20,7 +20,7 @@ require conf/distro/include/sane-srcrevs
 require conf/distro/include/sane-srcrevs.inc
 
 #Images built can have to modes:
-# 'debug': empty rootpassword, strace and gdb included
+# 'debug': empty rootpassword, strace included
 # 'release' no root password, no strace and gdb by default
 DISTRO_TYPE ?= "debug"
 #DISTRO_TYPE = "release"
@@ -168,7 +168,7 @@ DEBUG_APPS ?= ""
 
 # We want to ship extra debug utils in the rootfs when doing a debug build 
 DEBUG_APPS ?= ""
-DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}'
+DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}'
 
 # Angstrom want to ship some extra stuff. This should be moved into task-base eventually
 # contains ipkg specific stuff as well :(
============================================================
--- packages/tasks/task-base.bb	cdcb312e0d4f77e69ca83bf82f6643335a03135c
+++ packages/tasks/task-base.bb	1a67a9902fc957b26de1621d69f747dac26ee6e2
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r44"
+PR = "r45"
 
 inherit task