[oe-commits] org.oe.dev merge of '227d9d1640e292b986196fbecfb628a17ffb9645'

[oe commit]

merge of '227d9d1640e292b986196fbecfb628a17ffb9645'
     and '5522b4404c3b117f5b3f78bd8e0e0fe14321787b'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 3e30d03effd5d61bd64c55ec0e69214ced9039ca
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3e30d03effd5d61bd64c55ec0e69214ced9039ca
Files:
1
classes/update-rc.d.bbclass
packages/angstrom/angstrom-x11-image.bb
Diffs:

#
# mt diff -r227d9d1640e292b986196fbecfb628a17ffb9645 -r3e30d03effd5d61bd64c55ec0e69214ced9039ca
#
# 
# 
# patch "classes/update-rc.d.bbclass"
#  from [8812f2d73cbeef9536c5598c2f3c1888e35b0aa3]
#    to [aad4a9f7c2ea238e727751a6fd3e2675923cc9be]
# 
============================================================
--- classes/update-rc.d.bbclass	8812f2d73cbeef9536c5598c2f3c1888e35b0aa3
+++ classes/update-rc.d.bbclass	aad4a9f7c2ea238e727751a6fd3e2675923cc9be
@@ -7,17 +7,15 @@ if test "x$D" != "x"; then
 
 updatercd_postinst() {
 if test "x$D" != "x"; then
-	D="-r $D"
+	OPT="-r $D"
 else
-	D="-s"
+	OPT="-s"
 fi
-update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
+update-rc.d $OPT ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
 }
 
 updatercd_prerm() {
-if test "x$D" != "x"; then
-	D="-r $D"
-else
+if test "x$D" = "x"; then
 	${INIT_D_DIR}/${INITSCRIPT_NAME} stop
 fi
 }


#
# mt diff -r5522b4404c3b117f5b3f78bd8e0e0fe14321787b -r3e30d03effd5d61bd64c55ec0e69214ced9039ca
#
# 
# 
# patch "packages/angstrom/angstrom-x11-image.bb"
#  from [1b1ff2576e45aeb4cea7016dd081d42334955b36]
#    to [72ac30a3a1a9a6405bfbb3ec0914d706d5e61d82]
# 
============================================================
--- packages/angstrom/angstrom-x11-image.bb	1b1ff2576e45aeb4cea7016dd081d42334955b36
+++ packages/angstrom/angstrom-x11-image.bb	72ac30a3a1a9a6405bfbb3ec0914d706d5e61d82
@@ -9,7 +9,7 @@ ANGSTROM_EXTRA_INSTALL += " \
 PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
 
 ANGSTROM_EXTRA_INSTALL += " \
-                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer", "",d)} \
+                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
 			  " 
 XSERVER ?= "xserver-kdrive-fbdev"