From baad104c1ec9d4f8f17de14d09d26121d4b3baa5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?K=C3=A9vin=20THIERRY?= Date: Tue, 17 Jun 2014 10:18:42 +0200 Subject: [PATCH] Update desktop-skin recipe MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * New revision. * Add post istall script. * Revert erronous update of desktop-skin recipe. This recipe update corrects issue BTY-6 that was introduced with the last desktop-skin recipe update (commit 4b8829828a9eaa019101e05ec3bb97000b12a0bf). That update was made from a wrongly generated recipe which was due to desktop-skin being missing in the whitelist of the recipe generatop (spec2yocto). This commit also partially corrects issue BTY-7 since it brings back missing configuration files needded to start the tz-launchers. Bug-Tizen: BTY-6 Bug-Tizen: BTY-7 Change-Id: I78f4d4d300f6761235bb32f4db96115a5678bf65 Signed-off-by: Kévin THIERRY --- recipes-tizen/desktop-skin/desktop-skin.inc | 30 +++++++++++++++----------- recipes-tizen/desktop-skin/desktop-skin_git.bb | 2 +- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/recipes-tizen/desktop-skin/desktop-skin.inc b/recipes-tizen/desktop-skin/desktop-skin.inc index 86aa654..17c826c 100644 --- a/recipes-tizen/desktop-skin/desktop-skin.inc +++ b/recipes-tizen/desktop-skin/desktop-skin.inc @@ -1,6 +1,6 @@ -DESCRIPTION = "Provides desktop-skin." +DESCRIPTION = "Desktop skin for Tizen:Common" HOMEPAGE = "http://nohomepage.org" -SECTION = "Applications" +SECTION = "Applications/Multimedia" LICENSE = "GPL-2.0+" SRC_URI = "" @@ -60,36 +60,42 @@ do_install() { mkdir -p ${D}${prefix}/bin install -m 755 Script/launch_cam.sh ${D}${prefix}/bin install -m 755 Script/launch_video.sh ${D}${prefix}/bin + install -m 755 Script/wifi ${D}${prefix}/bin - mkdir -p ${D}/home/app - install -m 644 Video/AmazingNature_480p.mp4 ${D}/home/app + mkdir -p ${D}${prefix}/share/media/videos + install -m 644 Video/AmazingNature_480p.mp4 ${D}${prefix}/share/media/videos - mkdir -p ${D}/home/app/Photos - install -m 644 Photos/* ${D}/home/app/Photos + mkdir -p ${D}${prefix}/share/media/photos + install -m 644 Photos/* ${D}${prefix}/share/media/photos mkdir -p ${D}${prefix}/share/icons/tizen/32x32 install -m 644 icons/tizen/32x32/* ${D}${prefix}/share/icons/tizen/32x32 + mkdir -p ${D}${prefix}/share/applications/tizen + install -m 644 applications/tizen/* ${D}${prefix}/share/applications/tizen + mkdir -p ${D}${prefix}/share/backgrounds/tizen install -m 644 backgrounds/tizen/golfe-morbihan.jpg ${D}${prefix}/share/backgrounds/tizen/golfe-morbihan.jpg + install -m 644 backgrounds/tizen/tizen_common.png ${D}${prefix}/share/backgrounds/tizen/tizen_common.png } pkg_postinst_${PN}() { #!/bin/sh -e - chown -R app:app /home/app + + ln -s tizen_common.png ${prefix}/share/backgrounds/tizen/current } desktop-skin_files = "" -desktop-skin_files += "${prefix}/bin/launch_cam.sh" -desktop-skin_files += "${prefix}/bin/launch_video.sh" -desktop-skin_files += "/home/app/AmazingNature_480p.mp4" -desktop-skin_files += "/home/app/Photos/*" +desktop-skin_files += "${prefix}/bin/*" +desktop-skin_files += "${prefix}/share/media/videos/AmazingNature_480p.mp4" +desktop-skin_files += "${prefix}/share/media/photos/*" desktop-skin_files += "${prefix}/share/icons/tizen/32x32/*" -desktop-skin_files += "${prefix}/share/backgrounds/tizen/golfe-morbihan.jpg" +desktop-skin_files += "${prefix}/share/applications/tizen/*" +desktop-skin_files += "${prefix}/share/backgrounds/tizen/*" FILES_${PN} = "${desktop-skin_files}" diff --git a/recipes-tizen/desktop-skin/desktop-skin_git.bb b/recipes-tizen/desktop-skin/desktop-skin_git.bb index de9427f..183c3ea 100644 --- a/recipes-tizen/desktop-skin/desktop-skin_git.bb +++ b/recipes-tizen/desktop-skin/desktop-skin_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/common/desktop-skin;tag=cc05dcc61a2545eaa29a18c59d926639c0636cad;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/common/desktop-skin;tag=4538fdd8de182d96ec85004b7ee56554aa10ec8d;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4