summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch10
-rw-r--r--packages/openssl/openssl_0.9.7g.bb5
-rw-r--r--packages/opie-taskbar/opie-taskbar-images.inc28
-rw-r--r--packages/opie-taskbar/opie-taskbar-images_cvs.bb2
4 files changed, 30 insertions, 15 deletions
diff --git a/packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch b/packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch
new file mode 100644
index 0000000000..38f725b789
--- /dev/null
+++ b/packages/openssl/openssl-0.9.7g/gnueabi-armeb.patch
@@ -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.
+ #
diff --git a/packages/openssl/openssl_0.9.7g.bb b/packages/openssl/openssl_0.9.7g.bb
index cc9162c1cf..d61a3a8297 100644
--- a/packages/openssl/openssl_0.9.7g.bb
+++ b/packages/openssl/openssl_0.9.7g.bb
@@ -2,8 +2,9 @@ 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-arm.patch;patch=1 \
+ file://gnueabi-armeb.patch;patch=1"
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"