Updates against mainline openembedded + removal of some unneeded files

git-svn-id: https://svn.o-hand.com/repos/poky@19 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 3 insertions, 2 deletions

diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/meta-oh.bb
index cf28f2b5e5..b6e440b84a 100644
--- a/openembedded/packages/meta/meta-oh.bb
+++ b/openembedded/packages/meta/meta-oh.bb
@@ -18,7 +18,8 @@ oh-task-base = "\
     xcursor-transparent-theme \
     xserver-kdrive-common \
     gtk+ \
-    avahi \
+    avahi-daemon \
+    avahi-dnsconfd \
     rxvt \
     xhost \
     ttf-bitstream-vera \
diff --git a/openembedded/packages/meta/oh-image.bb b/openembedded/packages/meta/oh-image.bb
index 91ca5e56ec..ca9f1b51a9 100644
--- a/openembedded/packages/meta/oh-image.bb
+++ b/openembedded/packages/meta/oh-image.bb
@@ -13,7 +13,7 @@ export IPKG_INSTALL = "task-bootstrap \
                        oh-task-base \
                        ${XSERVER} "
 
-ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
+#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
 inherit image_ipk
 LICENSE = MIT