[oe-commits] org.oe.dev merge of '0ad3682d1538e6c932e6fb254eaeac8447d18359'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sun Dec 23 16:50:53 UTC 2007
merge of '0ad3682d1538e6c932e6fb254eaeac8447d18359'
and 'd750bdb7f64441d5df5e00b2b42098fbf3550215'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: aa5081b608a304952b8206352eacb9effc61db7e
ViewMTN: http://monotone.openembedded.org/revision/info/aa5081b608a304952b8206352eacb9effc61db7e
Files:
1
packages/efl1/epdf/fix-plugin-path-check.patch
packages/efl1/epdf_cvs.bb
packages/efl1/etk_cvs.bb
packages/efl1/evas.inc
packages/efl1/evas_cvs.bb
packages/efl1/ewl_cvs.bb
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
Diffs:
#
# mt diff -r0ad3682d1538e6c932e6fb254eaeac8447d18359 -raa5081b608a304952b8206352eacb9effc61db7e
#
#
#
# patch "packages/efl1/epdf/fix-plugin-path-check.patch"
# from [917c11e702bf01b1b341e285286bb27f75393f93]
# to [5fe150879be09f990f3a76f3c8d7186e8f283c11]
#
# patch "packages/efl1/epdf_cvs.bb"
# from [9250d539c8f86f2eda976014a30908c6b3905ba0]
# to [9efa1ebb461046746f606f717f62c2d06eeda613]
#
# patch "packages/efl1/etk_cvs.bb"
# from [30cb3b710327fe056966375324ff69d0f0335450]
# to [73f6a2bacad4d3504deaf7b78fd4d80aed9a3baa]
#
# patch "packages/efl1/evas.inc"
# from [597ab85948221435b09749c151bb454d6bc7c247]
# to [4cd4cdcaa21c3ceb07a4a0332e00f4e195d48a01]
#
# patch "packages/efl1/evas_cvs.bb"
# from [dbafdc3234a73fe9ef33b6fb8fdc7de99921d04b]
# to [26e997cd12f7bb18a715bc41e044c55a98858c6c]
#
# patch "packages/efl1/ewl_cvs.bb"
# from [c054e8480d8c515eb1aa7d7fc623fd4d60cfd3c4]
# to [0b0845d0af43245cad7efe54d5d63ab7dab600a2]
#
============================================================
--- packages/efl1/epdf/fix-plugin-path-check.patch 917c11e702bf01b1b341e285286bb27f75393f93
+++ packages/efl1/epdf/fix-plugin-path-check.patch 5fe150879be09f990f3a76f3c8d7186e8f283c11
@@ -1,20 +1,20 @@ Index: epdf/configure.in
Index: epdf/configure.in
===================================================================
--- epdf.orig/configure.in
+++ epdf/configure.in
-@@ -27,8 +27,8 @@ PKG_CHECK_MODULES(EWL,
+@@ -95,8 +95,8 @@
+ [
+ have_ewl="yes"
+ requirements="$requirements ewl"
+- EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`"
+- EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`"
++ EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/"
++ EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/"
+ AC_SUBST(EWL_TEST_LIBS_DIR)
+ AC_SUBST(EWL_TEST_SOURCE_DIR)
+ ],
+@@ -144,7 +144,7 @@
[
- have_ewl="yes"
- requirements="$requirements ewl"
-- EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`"
-- EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`"
-+ EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/"
-+ EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/"
- AC_SUBST(EWL_TEST_LIBS_DIR)
- AC_SUBST(EWL_TEST_SOURCE_DIR)
- ],
-@@ -55,7 +55,7 @@ PKG_CHECK_MODULES(EPSILON,
- [
have_epsilon="yes"
requirements="$requirements epsilon imlib2"
- EPSILON_PLUGINS_DIR="`$PKG_CONFIG --variable=pluginsdir epsilon`"
============================================================
--- packages/efl1/epdf_cvs.bb 9250d539c8f86f2eda976014a30908c6b3905ba0
+++ packages/efl1/epdf_cvs.bb 9efa1ebb461046746f606f717f62c2d06eeda613
@@ -1,8 +1,7 @@ LICENSE = "BSD"
DESCRIPTION = "Epdf is the glue between EFL and libpoppler"
LICENSE = "BSD"
-DEPENDS = "poppler0.6 evas ecore etk ewl"
+DEPENDS = "poppler evas ecore etk ewl"
PV = "0.1.0+cvs${SRCDATE}"
-
PR = "r1"
inherit efl_library
============================================================
--- packages/efl1/etk_cvs.bb 30cb3b710327fe056966375324ff69d0f0335450
+++ packages/efl1/etk_cvs.bb 73f6a2bacad4d3504deaf7b78fd4d80aed9a3baa
@@ -1,8 +1,8 @@ PV = "0.1.0+cvs${SRCDATE}"
DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries."
DEPENDS = "evas ecore edje"
LICENSE = "MIT"
PV = "0.1.0+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
inherit efl_library
@@ -15,3 +15,4 @@ FILES_${PN}-dbg += "${libdir}/etk/engine
FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la"
FILES_${PN}-dbg += "${libdir}/etk/engines/.debug/"
+RRECOMMENDS_${PN} = "${PN}-engines"
============================================================
--- packages/efl1/evas.inc 597ab85948221435b09749c151bb454d6bc7c247
+++ packages/efl1/evas.inc 4cd4cdcaa21c3ceb07a4a0332e00f4e195d48a01
@@ -35,3 +35,17 @@ PACKAGES_DYNAMIC = "libevas-engine-* lib
FILES_${PN} = "${libdir}/libevas*.so*"
PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*"
+
+RRECOMMENDS_${PN} = "\
+ libevas-engine-buffer \
+ libevas-engine-fb \
+ libevas-engine-software-generic \
+ libevas-engine-software-x11 \
+ libevas-engine-software-16 \
+ libevas-engine-xrender-x11 \
+ \
+ libevas-loader-png \
+ libevas-loader-jpeg \
+ libevas-loader-eet \
+ libevas-loader-svg \
+"
============================================================
--- packages/efl1/evas_cvs.bb dbafdc3234a73fe9ef33b6fb8fdc7de99921d04b
+++ packages/efl1/evas_cvs.bb 26e997cd12f7bb18a715bc41e044c55a98858c6c
@@ -1,5 +1,5 @@ require evas.inc
require evas.inc
-PR = "r3"
+PR = "r4"
EXTRA_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \
============================================================
--- packages/efl1/ewl_cvs.bb c054e8480d8c515eb1aa7d7fc623fd4d60cfd3c4
+++ packages/efl1/ewl_cvs.bb 0b0845d0af43245cad7efe54d5d63ab7dab600a2
@@ -1,11 +1,10 @@ DEPENDS = "evas ecore edje emotion efree
DESCRIPTION = "The Enlightened Widget Library, \
a simple-to-use general purpose widget library \
based on the enlightenment foundation libraries."
DEPENDS = "evas ecore edje emotion efreet epsilon"
-RSUGGESTS_${PN} += "ewl-themes"
LICENSE = "MIT"
PV = "0.5.1+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
inherit efl_library
@@ -31,3 +30,5 @@ FILES_${PN}-plugins = "${libdir}/ewl/plu
FILES_${PN}-engines = "${libdir}/ewl/engines/*.so*"
FILES_${PN}-plugins = "${libdir}/ewl/plugins/*.so*"
+
+RRECOMMENDS_${PN} = "${PN}-engines ${PN}-plugins ewl-themes"
#
# mt diff -rd750bdb7f64441d5df5e00b2b42098fbf3550215 -raa5081b608a304952b8206352eacb9effc61db7e
#
#
#
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
# from [df64576fea94c73841caa9d194cca699ddf9575e]
# to [3414afa63a3d12e6a4cd900e882c8a621de05e1a]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [cf372a56d0952ca445d801dd6b169d120224b6f2]
# to [f8f7bbf562514bec8076212836576397889ee6ed]
#
============================================================
--- packages/zaurus-updater/zaurus-updater/updater.sh df64576fea94c73841caa9d194cca699ddf9575e
+++ packages/zaurus-updater/zaurus-updater/updater.sh 3414afa63a3d12e6a4cd900e882c8a621de05e1a
@@ -34,6 +34,11 @@
# - Reformatted file - please use spaces not tabs
# - "version check" is only on Tosa and Poodle - breaks other machines
#
+# 2007.12.23 Matthias 'CoreDump' Hentges
+# - Fix kernel install on spitz machines
+# - Unify format of do_flashing()...
+# - Display ${PR} of zaurus-updater.bb to the user
+# - Polish HDD installer messages
DATAPATH=$1
TMPPATH=/tmp/update
@@ -120,16 +125,19 @@ do_rootfs_extraction()
do_rootfs_extraction()
{
UNPACKED_ROOTFS=1
- echo 'HDD root file system'
+ echo 'Installing HDD root file system'
if [ ! -f /hdd1/NotAvailable ]; then
umount /hdd1
fi
- echo 'Now formatting...'
+ echo -n '* Now formatting...'
mke2fs $MKE2FSOPT /dev/${IDE1}1 > /dev/null 2>&1
e2fsck -p /dev/${IDE1}1 > /dev/null
if [ "$?" != "0" ]; then
+ echo "FAILED"
echo "Error: Unable to create filesystem on microdrive!"
exit "$?"
+ else
+ echo "Done"
fi
mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1
@@ -139,14 +147,17 @@ do_rootfs_extraction()
fi
cd /hdd1
- echo 'Now extracting...'
+ echo -n '* Now extracting (this can take over 5m)...'
gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf -
if [ "$?" != "0" ]; then
+ echo "FAILED"
echo "Error: Unable to extract root filesystem archive!"
exit "$?"
+ else
+ echo "Done"
fi
- echo 'Done.'
+ echo 'HDD Installation Finished.'
# remount as RO
cd /
@@ -156,60 +167,67 @@ do_flashing()
do_flashing()
{
- if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ]
- then
- echo "Error: File is too big to flash!"
- echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]"
- return
- fi
+ if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ]
+ then
+ echo "Error: File is too big to flash!"
+ echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]"
+ return
+ fi
- if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ]
- then
- #check version
- /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD
- if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1
- then
- #no version info...
- rm -f $TMPHEAD > /dev/null 2>&1
- DATAPOS=0
- fi
- fi
+ if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ]
+ then
+ #check version
+ /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD
+
+ if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1
+ then
+ #no version info...
+ rm -f $TMPHEAD > /dev/null 2>&1
+ DATAPOS=0
+ fi
+ fi
- if [ $ISFORMATTED = 0 ]
- then
- /sbin/eraseall $TARGET_MTD > /dev/null 2>&1
- ISFORMATTED=1
- fi
+ if [ $ISFORMATTED = 0 ]
+ then
+ /sbin/eraseall $TARGET_MTD > /dev/null 2>&1
+ ISFORMATTED=1
+ fi
- echo ''
- echo '0% 100%'
- PROGSTEP=`expr $DATASIZE / $ONESIZE + 1`
- PROGSTEP=`expr 25 / $PROGSTEP`
- if [ $PROGSTEP = 0 ]
- then
- PROGSTEP=1
- fi
+ if [ -e $TMPHEAD ]
+ then
+ VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
+ MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
+ /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
+ /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
- if [ -e $TMPHEAD ]
- then
- VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
- MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
- /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
- /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+ /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
+ /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
+ fi
- /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
- /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
- fi
-
- # Looks like Akita is quite unique when it comes to kernel flashing
+ # Looks like Akita and Spitz are unique when it comes to kernel flashing
- if [ "$ZAURUS" = "akita" ] && [ $FLASH_TYPE = kernel ]; then
- 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
- else
+ if [ "$ZAURUS" = "akita" -o "$ZAURUS" = "c3x00" ] && [ "$FLASH_TYPE" = "kernel" ]
+ then
+# echo $TARGETFILE':'$DATASIZE'bytes'
+ echo ""
+ echo -n "Installing SL-Cxx00 kernel..."
+ echo ' ' > /tmp/data
+ test "$ZAURUS" = "akita" && /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
+ test "$ZAURUS" = "akita" && /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1
+ echo "Done"
+ else
+
+ echo ''
+ echo '0% 100%'
+ PROGSTEP=`expr $DATASIZE / $ONESIZE + 1`
+ PROGSTEP=`expr 25 / $PROGSTEP`
+
+ if [ $PROGSTEP = 0 ]
+ then
+ PROGSTEP=1
+ fi
+
#loop
while [ $DATAPOS -lt $DATASIZE ]
do
@@ -246,27 +264,29 @@ do_flashing()
done
done
fi
- echo ''
+ echo ''
- #finish
- rm -f $TMPPATH/*.bin > /dev/null 2>&1
+ #finish
+ rm -f $TMPPATH/*.bin > /dev/null 2>&1
- if [ $RESULT = 0 ]
- then
- if [ -e $VTMPNAME ]
- then
- /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
- rm -f $VTMPNAME > /dev/null 2>&1
- fi
- if [ -e $MTMPNAME ]
- then
- /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
- rm -f $MTMPNAME > /dev/null 2>&1
- fi
- echo 'Done.'
- else
- echo 'Error!'
- fi
+ if [ $RESULT = 0 ]
+ then
+ if [ -e $VTMPNAME ]
+ then
+ /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
+ rm -f $VTMPNAME > /dev/null 2>&1
+ fi
+
+ if [ -e $MTMPNAME ]
+ then
+ /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+ rm -f $MTMPNAME > /dev/null 2>&1
+ fi
+
+ [ "$FLASH_TYPE" != "kernel" ] && echo 'Done.'
+ else
+ echo 'Error!'
+ fi
}
### Check model ###
@@ -300,6 +320,8 @@ esac
;;
esac
+clear
+echo "---- Universal Zaurus Updater ZAURUS_UPDATER_VERSION ----"
echo 'MODEL: '$MODEL' ('$ZAURUS')'
mkdir -p $TMPPATH > /dev/null 2>&1
============================================================
--- packages/zaurus-updater/zaurus-updater.bb cf372a56d0952ca445d801dd6b169d120224b6f2
+++ packages/zaurus-updater/zaurus-updater.bb f8f7bbf562514bec8076212836576397889ee6ed
@@ -1,7 +1,7 @@ LICENSE = "zaurus-updater"
DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
DEPENDS = "encdec-updater-native"
LICENSE = "zaurus-updater"
-PR = "r18"
+PR = "r19"
PACKAGES = ""
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -11,6 +11,10 @@ S = "${WORKDIR}"
file://gnu-tar.gz"
S = "${WORKDIR}"
+do_configure() {
+ sed -i "s/ZAURUS_UPDATER_VERSION/${PR}/" "${S}/updater.sh"
+}
+
do_compile() {
encdec-updater -e updater.sh
}
More information about the Openembedded-commits
mailing list