Skip to content

Commit

Permalink
Modify font and wallpaper install process
Browse files Browse the repository at this point in the history 
Open-webOS-DCO-1.0-Signed-off-by: Roger Stringer <roger.stringer@palm.com>

Change-Id: I4615321d9034be5671708092e30c3c42af6c718a
  • Loading branch information
Roger Stringer committed Oct 3, 2012
1 parent 483efdd commit 0b29adc
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
4 changes: 2 additions & 2 deletions conf/distro/include/webos-preferred-versions.inc
View file
Expand Up @@ -29,14 +29,14 @@ PREFERRED_VERSION_librolegen ?= "2.0.0-16"
PREFERRED_VERSION_libsandbox ?= "2.0.0-16" PREFERRED_VERSION_libsandbox ?= "2.0.0-16"
PREFERRED_VERSION_loadable-frameworks ?= "1.0-1.0.1" PREFERRED_VERSION_loadable-frameworks ?= "1.0-1.0.1"
PREFERRED_VERSION_luna-applauncher ?= "3.0.0-0.90" PREFERRED_VERSION_luna-applauncher ?= "3.0.0-0.90"
PREFERRED_VERSION_luna-init ?= "2.0.0-1.00" PREFERRED_VERSION_luna-init ?= "2.0.0-1.03"
PREFERRED_VERSION_luna-prefs ?= "2.0.0-0.95" PREFERRED_VERSION_luna-prefs ?= "2.0.0-0.95"
PREFERRED_VERSION_luna-service2 ?= "3.0.0-143" PREFERRED_VERSION_luna-service2 ?= "3.0.0-143"
PREFERRED_VERSION_luna-sysmgr ?= "2.0.4-0.912" PREFERRED_VERSION_luna-sysmgr ?= "2.0.4-0.912"
PREFERRED_VERSION_luna-sysmgr-ipc ?= "2.0.0-0.92" PREFERRED_VERSION_luna-sysmgr-ipc ?= "2.0.0-0.92"
PREFERRED_VERSION_luna-sysmgr-ipc-messages ?= "2.0.0-0.92" PREFERRED_VERSION_luna-sysmgr-ipc-messages ?= "2.0.0-0.92"
PREFERRED_VERSION_luna-sysservice ?= "2.0.1-1.02" PREFERRED_VERSION_luna-sysservice ?= "2.0.1-1.02"
PREFERRED_VERSION_luna-systemui ?= "2.0.0-1.00" PREFERRED_VERSION_luna-systemui ?= "2.0.0-1.01"
PREFERRED_VERSION_luna-universalsearchmgr ?= "2.0.0-1.00" PREFERRED_VERSION_luna-universalsearchmgr ?= "2.0.0-1.00"
PREFERRED_VERSION_luna-webkit-api ?= "2.0.0-0.91" PREFERRED_VERSION_luna-webkit-api ?= "2.0.0-0.91"
PREFERRED_VERSION_mojoloader ?= "1.0-8" PREFERRED_VERSION_mojoloader ?= "1.0-8"
Expand Down
12 changes: 10 additions & 2 deletions recipes-webos/luna-init/luna-init.bb
View file
Expand Up @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
SECTION = "webos/base" SECTION = "webos/base"


PR = "r3" PR = "r4"


inherit webos_component inherit webos_component
inherit webos_public_repo inherit webos_public_repo
Expand All @@ -16,5 +16,13 @@ WEBOS_GIT_TAG = "submissions/${WEBOS_SUBMISSION}"
SRC_URI = "${OPENWEBOS_GIT_REPO}/${PN};tag=${WEBOS_GIT_TAG};protocol=git" SRC_URI = "${OPENWEBOS_GIT_REPO}/${PN};tag=${WEBOS_GIT_TAG};protocol=git"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"


FILES_${PN} += "/usr/palm /etc/palm /usr/share/fonts" do_install_append() {
# Expand fonts tarball
if [ -e ${S}/files/conf/fonts/fonts.tgz ]; then
install -d ${D}/usr/share/fonts
tar xvzf ${S}/files/conf/fonts/fonts.tgz --directory=${D}/usr/share/fonts
fi
}

FILES_${PN} += "/usr/palm/ /etc/palm/ /usr/share/fonts/"


6 changes: 5 additions & 1 deletion recipes-webos/luna-systemui/luna-systemui.bb
View file
Expand Up @@ -7,7 +7,7 @@ SECTION = "webos/base"


INHIBIT_DEFAULT_DEPS = "1" INHIBIT_DEFAULT_DEPS = "1"


PR = "r5" PR = "r6"


inherit webos_enhanced_submissions inherit webos_enhanced_submissions
inherit webos_arch_indep inherit webos_arch_indep
Expand All @@ -21,6 +21,10 @@ do_install() {
#COPY ENTIRE APP #COPY ENTIRE APP
install -d ${D}/usr/lib/luna/system/luna-systemui install -d ${D}/usr/lib/luna/system/luna-systemui
cp -rf ${S}/* ${D}/usr/lib/luna/system/luna-systemui cp -rf ${S}/* ${D}/usr/lib/luna/system/luna-systemui
if [ -e ${S}/images/wallpaper.tar ]; then
install -d ${D}/usr/lib/luna/system/luna-systemui/images
tar xf ${S}/images/wallpaper.tar --directory=${D}/usr/lib/luna/system/luna-systemui/images
fi
} }


FILES_${PN} += "${prefix}/lib/luna/system" FILES_${PN} += "${prefix}/lib/luna/system"

0 comments on commit 0b29adc

Please sign in to comment.