[oe-commits] org.oe.dev merge of 'a3080faf3a125f45b97d49303612cf6bab9539cd'

[rwhitby commit]

merge of 'a3080faf3a125f45b97d49303612cf6bab9539cd'
     and 'd6d91eeea2717dbb2f84f543b7cba45548ba6dbc'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: c167b756a2c31c551cc0eca4689cdd4761eb7688
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c167b756a2c31c551cc0eca4689cdd4761eb7688
Files:
1
packages/meta/slugos-packages.bb
classes/rm_work.bbclass
packages/maemo3/libhildonmime_1.9.5.bb
Diffs:

#
# mt diff -ra3080faf3a125f45b97d49303612cf6bab9539cd -rc167b756a2c31c551cc0eca4689cdd4761eb7688
#
# 
# 
# patch "packages/meta/slugos-packages.bb"
#  from [0cce69bb0cbc207a39fab77c3054e03e4eb02abc]
#    to [738a66a4cd05dd74381dce0949ddcd547be2497f]
# 
============================================================
--- packages/meta/slugos-packages.bb	0cce69bb0cbc207a39fab77c3054e03e4eb02abc
+++ packages/meta/slugos-packages.bb	738a66a4cd05dd74381dce0949ddcd547be2497f
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r34"
+PR = "r35"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -140,6 +140,7 @@ SLUGOS_PACKAGES = "\
 	nano \
 	ncftp \
 	ncurses \
+	net-tools \
 	netcat \
 	netpbm \
 	nfs-utils \


#
# mt diff -rd6d91eeea2717dbb2f84f543b7cba45548ba6dbc -rc167b756a2c31c551cc0eca4689cdd4761eb7688
#
# 
# 
# patch "classes/rm_work.bbclass"
#  from [512e310e8d6f9470aa971cd1e93948fdbdd80492]
#    to [ee47e8ab4e8989bafbb4ab34525d27fa9ea12103]
# 
# patch "packages/maemo3/libhildonmime_1.9.5.bb"
#  from [0215eb834a97761c336d556905576dd4882bc798]
#    to [bee736d32a41ff42806e5b50c9f6e17f193394b2]
# 
============================================================
--- classes/rm_work.bbclass	512e310e8d6f9470aa971cd1e93948fdbdd80492
+++ classes/rm_work.bbclass	ee47e8ab4e8989bafbb4ab34525d27fa9ea12103
@@ -14,7 +14,7 @@ do_rm_work () {
     for dir in *
     do
         if [ `basename ${S}` = $dir ]; then
-            rm -rf $dir/*
+            rm -rf $dir
         elif [ $dir != 'temp' ]; then
             rm -rf $dir
         fi
============================================================
--- packages/maemo3/libhildonmime_1.9.5.bb	0215eb834a97761c336d556905576dd4882bc798
+++ packages/maemo3/libhildonmime_1.9.5.bb	bee736d32a41ff42806e5b50c9f6e17f193394b2
@@ -1,7 +1,7 @@ DESCRIPTION = "Nokia hildon mime library
 LICENSE = "LGPL"
 DESCRIPTION = "Nokia hildon mime library"
 
-DEPENDS = "libosso"
+DEPENDS = "libosso gnome-vfs"
 
 PR = "r0"