[oe-commits] org.oe.dev merge of 'bf13c465f9f4c46132e74d7e9b93c2d1feb84ac6'
mickeyl commit
openembedded-commits at lists.openembedded.org
Wed Dec 5 00:25:50 UTC 2007
merge of 'bf13c465f9f4c46132e74d7e9b93c2d1feb84ac6'
and 'c44db3b9dd388ba7d6071532d6536625c571b3bd'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: c92e566077bd5831f69679381feba8fc3a24e32e
ViewMTN: http://monotone.openembedded.org/revision/info/c92e566077bd5831f69679381feba8fc3a24e32e
Files:
1
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
packages/pulseaudio/files/fix-dbus-without-hal.patch
packages/pulseaudio/pulseaudio_0.9.8.bb
packages/python/python-pygtk_2.10.4.bb
Diffs:
#
# mt diff -rbf13c465f9f4c46132e74d7e9b93c2d1feb84ac6 -rc92e566077bd5831f69679381feba8fc3a24e32e
#
#
#
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
# from [b20b6450310cee01b3ad65ab6cf78e66fe1fdb08]
# to [e1ba468c48cffe5be28dc2330bc84fe19eb769a6]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [7a273ae9f26d4da3830acc3f36b0dd21a6432e48]
# to [f1451f8dec1ba98d2ba1639511ea27d259ec7bec]
#
============================================================
--- packages/zaurus-updater/zaurus-updater/updater.sh b20b6450310cee01b3ad65ab6cf78e66fe1fdb08
+++ packages/zaurus-updater/zaurus-updater/updater.sh e1ba468c48cffe5be28dc2330bc84fe19eb769a6
@@ -1,5 +1,4 @@
#!/bin/sh
-
#
# One updater.sh to rule them all
#
@@ -22,10 +21,14 @@
#
# 2007.11.23 Koen Kooi
# - consistent error messages
-## - fix flashing from case sensitive filesystem (e.g. ext2)
+# - fix flashing from case sensitive filesystem (e.g. ext2)
+#
# 2007.11.23 Matthias 'CoreDump' Hentges
# - Always treat MTD_PART_SIZE as HEX when comparing sizes
# - Thanks to ZeroChaos for debugging
+#
+# 2007.12.04 Matthias 'CoreDump' Hentges
+# - Unb0rk flashing of Akita kernels
DATAPATH=$1
TMPPATH=/tmp/update
@@ -190,42 +193,53 @@ do_flashing()
/sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
fi
- #loop
- while [ $DATAPOS -lt $DATASIZE ]
- do
- #data create
- bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE
- TMPSIZE=`wc -c $TMPDATA`
- TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1`
- DATAPOS=`expr $DATAPOS + $TMPSIZE`
+ # Looks like Akita is quite unique when it comes to kernel flashing
+
+ if [ "$ZAURUS" = "akita" ] && [ $FLASH_TYPE = kernel ]; then
+ echo "Note: Flashing Akita kernel"
+ echo $TARGETFILE':'$DATASIZE'bytes'
+ echo ' ' > /tmp/data
+ /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1
+ /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1
+ /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1
+ echo "Kernel: Finished"
+ else
+ #loop
+ while [ $DATAPOS -lt $DATASIZE ]
+ do
+ #data create
+ bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE
+ TMPSIZE=`wc -c $TMPDATA`
+ TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1`
+ DATAPOS=`expr $DATAPOS + $TMPSIZE`
- #handle data file
- if [ $ISLOGICAL = 0 ]
- then
- next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD 2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1`
- if [ "$next_addr" = "" ]; then
- echo "Error: flash write"
- rm $TMPDATA > /dev/null 2>&1
- RESULT=3
- break;
+ #handle data file
+ if [ $ISLOGICAL = 0 ]
+ then
+ next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD 2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1`
+ if [ "$next_addr" = "" ]; then
+ echo "Error: flash write"
+ rm $TMPDATA > /dev/null 2>&1
+ RESULT=3
+ break;
+ fi
+ ADDR=$next_addr
+ else
+ /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1
+ ADDR=`expr $ADDR + $TMPSIZE`
fi
- ADDR=$next_addr
- else
- /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1
- ADDR=`expr $ADDR + $TMPSIZE`
- fi
- rm $TMPDATA > /dev/null 2>&1
+ rm $TMPDATA > /dev/null 2>&1
- #progress
- SPNUM=0
- while [ $SPNUM -lt $PROGSTEP ]
- do
- echo -n '.'
- SPNUM=`expr $SPNUM + 1`
+ #progress
+ SPNUM=0
+ while [ $SPNUM -lt $PROGSTEP ]
+ do
+ echo -n '.'
+ SPNUM=`expr $SPNUM + 1`
+ done
done
- done
-
+ fi
echo ''
#finish
============================================================
--- packages/zaurus-updater/zaurus-updater.bb 7a273ae9f26d4da3830acc3f36b0dd21a6432e48
+++ packages/zaurus-updater/zaurus-updater.bb f1451f8dec1ba98d2ba1639511ea27d259ec7bec
@@ -1,7 +1,7 @@ LICENSE = "zaurus-updater"
DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
DEPENDS = "encdec-updater-native"
LICENSE = "zaurus-updater"
-PR = "r13"
+PR = "r14"
PACKAGES = ""
PACKAGE_ARCH = "${MACHINE_ARCH}"
#
# mt diff -rc44db3b9dd388ba7d6071532d6536625c571b3bd -rc92e566077bd5831f69679381feba8fc3a24e32e
#
#
#
# add_file "packages/pulseaudio/files/fix-dbus-without-hal.patch"
# content [e816cccb9c342074e7c44d20f642b8833d11d57f]
#
# patch "packages/pulseaudio/pulseaudio_0.9.8.bb"
# from [815657961892febee8418dbc92e3e829a156e821]
# to [0ce1c8812f67eceea08584e12ec2e17e8b225790]
#
# patch "packages/python/python-pygtk_2.10.4.bb"
# from [91eec4265e23ac296ab4e69c12e3ea96d1acee59]
# to [d9b42f194943701dd3dd2cf861e84c49df9183b9]
#
============================================================
--- packages/pulseaudio/files/fix-dbus-without-hal.patch e816cccb9c342074e7c44d20f642b8833d11d57f
+++ packages/pulseaudio/files/fix-dbus-without-hal.patch e816cccb9c342074e7c44d20f642b8833d11d57f
@@ -0,0 +1,15 @@
+Index: pulseaudio-0.9.8/src/Makefile.am
+===================================================================
+--- pulseaudio-0.9.8.orig/src/Makefile.am
++++ pulseaudio-0.9.8/src/Makefile.am
+@@ -1424,8 +1424,8 @@
+ # HAL
+ libdbus_util_la_SOURCES = modules/dbus-util.c modules/dbus-util.h
+ libdbus_util_la_LDFLAGS = -avoid-version
+-libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) libpulsecore.la
+-libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS)
++libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) $(DBUS_LIBS) libpulsecore.la
++libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS) $(DBUS_CFLAGS)
+
+ module_hal_detect_la_SOURCES = modules/module-hal-detect.c
+ module_hal_detect_la_LDFLAGS = -module -avoid-version
============================================================
--- packages/pulseaudio/pulseaudio_0.9.8.bb 815657961892febee8418dbc92e3e829a156e821
+++ packages/pulseaudio/pulseaudio_0.9.8.bb 0ce1c8812f67eceea08584e12ec2e17e8b225790
@@ -1,12 +1,17 @@ require pulse.inc
require pulse.inc
+DEPENDS += "dbus"
+
# this is not correct (see below)
-SRC_URI += "file://disable-using-glibc-tls.patch;patch=1"
+SRC_URI += "\
+ file://disable-using-glibc-tls.patch;patch=1 \
+ file://fix-dbus-without-hal.patch;patch=1 \
+"
PR = "r0"
# problems w/ pulseaudio 0.9.8 atm:
-# 1.) needs libtool >= 1.5.24 (yes, any older version will NOT work)
+# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime)
# 2.) doesn't build w/ glibc TLS support (hence patched out)
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/python/python-pygtk_2.10.4.bb 91eec4265e23ac296ab4e69c12e3ea96d1acee59
+++ packages/python/python-pygtk_2.10.4.bb d9b42f194943701dd3dd2cf861e84c49df9183b9
@@ -37,7 +37,7 @@ FILES_${PN}-demo = "\
${bindir}/pygtk-demo \
${libdir}/pygtk \
"
-RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-tokenize"
+RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-lang"
# todo: revamp packaging, package demo seperatly
FILES_${PN}-dev += "\
More information about the Openembedded-commits
mailing list