Merge branch 'tizen' of git.vannes:/srv/git/gitcache/review.tizen.org//scm/bb/meta...

diff --cc recipes-tizen/weston-common/weston-common-extraconf.inc
index fbb9b24,79f4b8c..da46904
--- 1/recipes-tizen/weston-common/weston-common-extraconf.inc
--- 2/recipes-tizen/weston-common/weston-common-extraconf.inc
+++ b/recipes-tizen/weston-common/weston-common-extraconf.inc
@@@ -13,11 -13,18 +13,18 @@@ USERADD_PACKAGES = "${PN}
  GROUPADD_PARAM_${PN} = "-g 191 display;-g 100 users;-g 1004 input;-g 190 systemd-journal;-g 54 lock"
  
  USERADD_PARAM_${PN} = "  -d /run/display -m  -u 115  -g display -G users,input,tty,display  -s /bin/sh display; "
 -USERADD_PARAM_${PN} += " -d /home/alice -m -u 5001   -g users   -G display -r -s /bin/sh alice; "
 -USERADD_PARAM_${PN} += " -d /home/bob   -m -u 5002   -g users   -G display -r -s /bin/sh bob; "
 -USERADD_PARAM_${PN} += " -d /home/carole -m -u 5003   -g users   -G display -r -s /bin/sh carole; "
 -USERADD_PARAM_${PN} += " -d /home/guest -m -u 9999   -g users   -G display -r -s /bin/sh guest "
 +USERADD_PARAM_${PN} += " -d /home/alice -m -u 5001   -g users   -G users,display -r -s /bin/sh alice; "
 +USERADD_PARAM_${PN} += " -d /home/bob   -m -u 5002   -g users   -G users,display -r -s /bin/sh bob; "
 +USERADD_PARAM_${PN} += " -d /home/carole -m -u 5003   -g users   -G users,display -r -s /bin/sh carole; "
 +USERADD_PARAM_${PN} += " -d /home/guest -m -u 9999   -g users   -G users,display -r -s /bin/sh guest "
  
+ do_compile_append() {
+ 
+     # Comment on of those two lines to define the desktop background:
+     sed -i 's@background-image=/usr/share/backgrounds/tizen/golfe-morbihan.jpg@background-image=/usr/share/backgrounds/tizen/tizen_common.png@g' ${S}/weston.ini
+     # sed -i 's@background-image=/usr/share/backgrounds/tizen/tizen_common.png@background-image=/usr/share/backgrounds/tizen/golfe-morbihan.jpg@g' ${S}/weston.ini
+ }
+ 
  do_install_append() {
      install -m 755 uid.sh ${D}/etc/profile.d