Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into cimmeria.(none):/home/dp/zaurus/openembedded

2005/04/05 10:15:29+00:00 (none)!XorA
Added support for 2.6 should still work on 2.4, fixed packaging/build

BKrev: 4252655fo2B_4OxCOomvai7LQzjPRQ

diff --git a/packages/sharp-binary-only/sharp-aticore-oss-1.0.1/aticore-2.6.patch b/packages/sharp-binary-only/sharp-aticore-oss-1.0.1/aticore-2.6.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
index 179fa33..9aa0f46 100644 (file)
--- a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
+++ b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
@@ -2,14 +2,15 @@ DESCRIPTION = "Driver for the Ati W100 found on the Sharp Zaurus C[87]x0"
 SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "CLOSED"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "http://mirror1.pdaxrom.org/source/src/AtiCore-1.0.1.tar.bz2"
+SRC_URI = "http://mirror1.pdaxrom.org/source/src/AtiCore-1.0.1.tar.bz2 \
+               file://aticore-2.6.patch;patch=1"
 S = "${WORKDIR}/AtiCore-1.0.1"
 
 #FILES_${PN}="${libdir}/*.so* ${bindir}/*"
          
-EXTRA_OEMAKE="CC='${CC}' AS='${AS}' AR='${AR}' LD='${LD}'"
+EXTRA_OEMAKE="CC='${CC}' AS='${AS}' AR='${AR}' LD='${LD}' FPU='${TARGET_FPU}'"
 
 do_install() {
        install -d ${D}${bindir}
@@ -17,19 +18,20 @@ do_install() {
        install -m 0755 atitest ${D}${bindir}/atitest
        
        install -d ${D}${libdir}
-       install -m 0755 libaticore.so ${D}${libdir}/libaticore.so
+       install -m 0755 libaticore.so.1.0.1 ${D}${libdir}/libaticore.so.1.0.1
        
        install -d ${D}${includedir}
        install -m 0644 aticore.h ${D}${includedir}/aticore.h
 
        cd ${D}${libdir}/
-       ln -s libaticore.so libaticore.so.1
-       ln -s libaticore.so libaticore.so.1.0
-       ln -s libaticore.so libaticore.so.1.0.1
+       ln -s libaticore.so.1.0.1 libaticore.so.1
+        ln -s libaticore.so.1.0.1 libaticore.so.1.0
+        ln -s libaticore.so.1.0.1 libaticore.so
 }
 
-do_stage() {
-       install -m 0644 aticore.h ${STAGING_INCDIR}
-       oe_libinstall -so libaticore ${STAGING_LIBDIR}
-}      
+# Currently incompatible with the way sharp-aticore.bb stages.
+#do_stage() {
+#      install -m 0644 aticore.h ${STAGING_INCDIR}
+#      oe_libinstall -so libaticore ${STAGING_LIBDIR}
+#}