[oe-commits] org.oe.dev merge of '19a2cb87b3e7d9ea6e805a2c82a7c53b91e77511'

[oe commit]

merge of '19a2cb87b3e7d9ea6e805a2c82a7c53b91e77511'
     and 'cec84fe6219f4a80315904254a401430604678dd'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 7ffbdb39a4bb7d635e50844ce0112b7cf860caf9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7ffbdb39a4bb7d635e50844ce0112b7cf860caf9
Files:
1
packages/opie-taskbar/opie-taskbar-images.inc
packages/opie-taskbar/opie-taskbar-images_cvs.bb
packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch
packages/openssl/openssl_0.9.7g.bb
Diffs:

#
# mt diff -r19a2cb87b3e7d9ea6e805a2c82a7c53b91e77511 -r7ffbdb39a4bb7d635e50844ce0112b7cf860caf9
#
# 
# 
# patch "packages/opie-taskbar/opie-taskbar-images.inc"
#  from [d360a128f6873d3f280eb4f83502e056159dc8df]
#    to [bcc14b15dcb6f610fb2fb93ea7a22680e5dc7c34]
# 
# patch "packages/opie-taskbar/opie-taskbar-images_cvs.bb"
#  from [f3d0e51204ca5fdab33a587c2c7f69acfa799f9e]
#    to [364b475cbe870792af3b1c15affcecd9defe9c8e]
# 
============================================================
--- packages/opie-taskbar/opie-taskbar-images.inc	d360a128f6873d3f280eb4f83502e056159dc8df
+++ packages/opie-taskbar/opie-taskbar-images.inc	bcc14b15dcb6f610fb2fb93ea7a22680e5dc7c34
@@ -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
+        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
+}
 
-	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
+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)
 }
 
-FILES_${PN}-240x320 += " ${palmtopdir}/pics/*/*-240x320.*"
-FILES_${PN}-480x640 += " ${palmtopdir}/pics/*/*-480x640.*"
-FILES_${PN}-640x480 += " ${palmtopdir}/pics/*/*-640x480.*"
-FILES_${PN}-800x600 += " ${palmtopdir}/pics/*/*-800x600.*"
-
 PACKAGE_ARCH = "all"
============================================================
--- packages/opie-taskbar/opie-taskbar-images_cvs.bb	f3d0e51204ca5fdab33a587c2c7f69acfa799f9e
+++ packages/opie-taskbar/opie-taskbar-images_cvs.bb	364b475cbe870792af3b1c15affcecd9defe9c8e
@@ -1,5 +1,5 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics"


#
# mt diff -rcec84fe6219f4a80315904254a401430604678dd -r7ffbdb39a4bb7d635e50844ce0112b7cf860caf9
#
# 
# 
# add_file "packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch"
#  content [6667972d27eb2ab7dfbb6189e987578a7feb9a1e]
# 
# patch "packages/openssl/openssl_0.9.7g.bb"
#  from [ecf6ba1e576ef411971cc6af2005e2ecca94b6d8]
#    to [68560d0bda19a0b32c7f514bdb9cf445479e7406]
# 
============================================================
--- packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch	6667972d27eb2ab7dfbb6189e987578a7feb9a1e
+++ packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch	6667972d27eb2ab7dfbb6189e987578a7feb9a1e
@@ -0,0 +1,10 @@
+--- openssl-0.9.7g/Configure~	2007-07-07 21:08:27.000000000 +0930
++++ openssl-0.9.7g/Configure	2007-07-07 21:13:41.000000000 +0930
+@@ -477,6 +477,7 @@
+ "linux-elf-arm","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-gnueabi-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-gnueabi-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ # SCO/Caldera targets.
+ #
============================================================
--- packages/openssl/openssl_0.9.7g.bb	ecf6ba1e576ef411971cc6af2005e2ecca94b6d8
+++ packages/openssl/openssl_0.9.7g.bb	68560d0bda19a0b32c7f514bdb9cf445479e7406
@@ -1,9 +1,10 @@ require openssl.inc
 inherit pkgconfig
 
 require openssl.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://debian.patch;patch=1 \
             file://armeb.patch;patch=1;pnum=0 \
+            file://gnueabi-arm.patch;patch=1 \
+            file://gnueabi-armeb.patch;patch=1"
-            file://gnueabi-arm.patch;patch=1"