[oe-commits] org.oe.dev merge of '6b94c6eeda0e3ff2069f19a1f393df67d80bebe9'

[rwhitby commit]

merge of '6b94c6eeda0e3ff2069f19a1f393df67d80bebe9'
     and 'f7531c375389681cc06ea3169fea009301b94267'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 55679bd7f912bd62f4aa8697cb4067a9447e6383
ViewMTN: http://monotone.openembedded.org/revision/info/55679bd7f912bd62f4aa8697cb4067a9447e6383
Files:
1
packages/images/nslu2-minimal-image.bb
packages/netbase/netbase/interfaces
packages/netbase/netbase_4.21.bb
conf/distro/include/insane-srcrevs.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -r6b94c6eeda0e3ff2069f19a1f393df67d80bebe9 -r55679bd7f912bd62f4aa8697cb4067a9447e6383
#
# 
# 
# add_file "packages/images/nslu2-minimal-image.bb"
#  content [b79cc878de38e428c269688f55fbd183cf6081c6]
# 
# patch "packages/netbase/netbase/interfaces"
#  from [4ec15f4071bae1c2403d78a38a92e9b21e9608bf]
#    to [cc5bda41921fddb04fb5d8c5c23b06aa3b206f00]
# 
# patch "packages/netbase/netbase_4.21.bb"
#  from [7d4b4b1ee1b6a900f60e97a679a2597ee3a38fbd]
#    to [ac3c4b953184fd7098259b3a46b4934ac0926ba9]
# 
============================================================
--- packages/images/nslu2-minimal-image.bb	b79cc878de38e428c269688f55fbd183cf6081c6
+++ packages/images/nslu2-minimal-image.bb	b79cc878de38e428c269688f55fbd183cf6081c6
@@ -0,0 +1,3 @@
+require minimal-image.bb
+
+INHERIT += nslu2-image
============================================================
--- packages/netbase/netbase/interfaces	4ec15f4071bae1c2403d78a38a92e9b21e9608bf
+++ packages/netbase/netbase/interfaces	cc5bda41921fddb04fb5d8c5c23b06aa3b206f00
@@ -41,6 +41,7 @@ iface atml0 inet dhcp
 iface atml0 inet dhcp
 
 # Wired or wireless interfaces
+auto eth0
 iface eth0 inet dhcp
 iface eth1 inet dhcp
 
============================================================
--- packages/netbase/netbase_4.21.bb	7d4b4b1ee1b6a900f60e97a679a2597ee3a38fbd
+++ packages/netbase/netbase_4.21.bb	ac3c4b953184fd7098259b3a46b4934ac0926ba9
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r24"
+PR = "r25"
 
 inherit update-rc.d
 


#
# mt diff -rf7531c375389681cc06ea3169fea009301b94267 -r55679bd7f912bd62f4aa8697cb4067a9447e6383
#
# 
# 
# patch "conf/distro/include/insane-srcrevs.inc"
#  from [34775d1ce4bbde6c4b6737f60c88db04c730486a]
#    to [b133294ee7d8f57a1c315a6787746b2e85b14249]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [2d16ad483496ff951a3f0b328f54cd73337dfc61]
#    to [bc08487711a74b011fdf760aa1a788af6b5c8a6a]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [bc40688afe191b0c44901104e4d5b033cfbd00b7]
#    to [8cad7fba1595a9a46320eb14f7b63799769241ec]
# 
============================================================
--- conf/distro/include/insane-srcrevs.inc	34775d1ce4bbde6c4b6737f60c88db04c730486a
+++ conf/distro/include/insane-srcrevs.inc	b133294ee7d8f57a1c315a6787746b2e85b14249
@@ -62,6 +62,7 @@ SRCREV_pn-openmoko-session ?= "${AUTOREV
 SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
 SRCREV_pn-openmoko-session ?= "${AUTOREV}"
+SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
 SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}"
============================================================
--- conf/distro/include/moko-autorev.inc	2d16ad483496ff951a3f0b328f54cd73337dfc61
+++ conf/distro/include/moko-autorev.inc	bc08487711a74b011fdf760aa1a788af6b5c8a6a
@@ -45,6 +45,7 @@ SRCREV_pn-openmoko-panel-usb ?= "${AUTOR
 SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
+SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-session ?= "${AUTOREV}"
 SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc	bc40688afe191b0c44901104e4d5b033cfbd00b7
+++ conf/distro/include/sane-srcrevs.inc	8cad7fba1595a9a46320eb14f7b63799769241ec
@@ -95,6 +95,7 @@ SRCREV_pn-openmoko-session ?= "152"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-usb ?= "3360"
 SRCREV_pn-openmoko-session ?= "152"
+SRCREV_pn-openmoko-sample2 ?= "3537"
 SRCREV_pn-openmoko-simplemediaplayer ?= "1688"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "3192"
 SRCREV_pn-openmoko-stylus-demo ?= "2324"