diff options
author | Rod Whitby <rod@whitby.id.au> | 2007-07-07 13:28:55 +0000 |
---|---|---|
committer | Rod Whitby <rod@whitby.id.au> | 2007-07-07 13:28:55 +0000 |
commit | f0b801dc33f8f674aa6d3b2904dfb1f5b5b6d073 (patch) | |
tree | db2492a01bfd32206614e0873b97449a7b9e6cf7 /packages/opie-taskbar | |
parent | ff0e28efe32b6211561fd26cc43adcc9565ecdb8 (diff) | |
parent | b9ab794b1a74510f69a5cd5afb1738425028b34a (diff) |
merge of 'b25bbba02ddb4b23e57f722647bea8974b902b1e'
and 'c2b7bf2b98443cd961a60ce5dd26e8d6e01afda2'
Diffstat (limited to 'packages/opie-taskbar')
-rw-r--r-- | packages/opie-taskbar/opie-taskbar-images.inc | 28 | ||||
-rw-r--r-- | packages/opie-taskbar/opie-taskbar-images_cvs.bb | 2 |
2 files changed, 17 insertions, 13 deletions
diff --git a/packages/opie-taskbar/opie-taskbar-images.inc b/packages/opie-taskbar/opie-taskbar-images.inc index f3cef44835..2e84210718 100644 --- a/packages/opie-taskbar/opie-taskbar-images.inc +++ b/packages/opie-taskbar/opie-taskbar-images.inc @@ -28,19 +28,23 @@ do_install() { install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-240x320.jpg install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-240x320.jpg - install -m 0644 ${WORKDIR}/pics/launcher/firstuse-480x640.jpg ${D}${palmtopdir}/pics/launcher/firstuse-480x640.jpg - install -m 0644 ${WORKDIR}/pics/launcher/opie-background-480x640.jpg ${D}${palmtopdir}/pics/launcher/opie-background-480x640.jpg - - install -m 0644 ${WORKDIR}/pics/launcher/firstuse-640x480.jpg ${D}${palmtopdir}/pics/launcher/firstuse-640x480.jpg - install -m 0644 ${WORKDIR}/pics/launcher/opie-background-640x480.jpg ${D}${palmtopdir}/pics/launcher/opie-background-640x480.jpg - - install -m 0644 ${WORKDIR}/pics/launcher/firstuse-800x600.jpg ${D}${palmtopdir}/pics/launcher/firstuse-800x600.jpg - install -m 0644 ${WORKDIR}/pics/launcher/opie-background-800x600.jpg ${D}${palmtopdir}/pics/launcher/opie-background-800x600.jpg + for res in 480x640 640x480 800x600 ; do + install -m 0644 ${WORKDIR}/pics/launcher/firstuse-${res}.jpg ${D}${palmtopdir}/pics/launcher/firstuse-${res}.jpg + install -m 0644 ${WORKDIR}/pics/launcher/opie-background-${res}.jpg ${D}${palmtopdir}/pics/launcher/opie-background-${res}.jpg + done } -FILES_${PN}-240x320 += " ${palmtopdir}/pics/*/*-240x320.*" -FILES_${PN}-480x640 += " ${palmtopdir}/pics/*/*-480x640.*" -FILES_${PN}-640x480 += " ${palmtopdir}/pics/*/*-640x480.*" -FILES_${PN}-800x600 += " ${palmtopdir}/pics/*/*-800x600.*" +python do_package_prepend () { + reslist = ['240x320','480x640','640x480', '800x600'] + dir = bb.data.expand('${palmtopdir}/pics/launcher/', d) + ft = bb.data.expand('${palmtopdir}/pics/*/*-%s.*', d) + pn = bb.data.getVar('PN', d, 1) + for res in reslist: + bb.data.setVar('FILES_%s-%s' % (pn,res), ft % res, d ) + postinst = '' + postinst = 'update-alternatives --install %sfirstuse.jpg opie-firstuse-pixmap %sfirstuse-%s.jpg 50\n' % (dir,dir,res) + postinst += 'update-alternatives --install %sopie-background.jpg opie-background-pixmap %sopie-background-%s.jpg 50\n' % (dir,dir,res) + bb.data.setVar('pkg_postinst_%s-%s' % (pn,res),postinst, d) +} PACKAGE_ARCH = "all" diff --git a/packages/opie-taskbar/opie-taskbar-images_cvs.bb b/packages/opie-taskbar/opie-taskbar-images_cvs.bb index 0566431474..718160cb4d 100644 --- a/packages/opie-taskbar/opie-taskbar-images_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar-images_cvs.bb @@ -1,5 +1,5 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r3" +PR = "r4" SRC_URI = "${HANDHELDS_CVS};module=opie/pics" |