[oe-commits] org.oe.dev merge of '5e862ccc5f65ba4b2947b0c3a5c0f84596b9fd8f'
hrw commit
openembedded-commits at lists.openembedded.org
Mon Dec 10 12:05:01 UTC 2007
merge of '5e862ccc5f65ba4b2947b0c3a5c0f84596b9fd8f'
and 'b9d72c3b2667d036ca41078c8c8f39cdccf8ee69'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 96c9c053c3e760d7e1fbb3ec0c50ff110ab62654
ViewMTN: http://monotone.openembedded.org/revision/info/96c9c053c3e760d7e1fbb3ec0c50ff110ab62654
Files:
1
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
packages/linux/linux.inc
packages/meta/meta-toolchain.bb
Diffs:
#
# mt diff -r5e862ccc5f65ba4b2947b0c3a5c0f84596b9fd8f -r96c9c053c3e760d7e1fbb3ec0c50ff110ab62654
#
#
#
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
# from [d04594f8a058a8d49fc0d2325f21064bc83a5050]
# to [469e259ca0c6962e5aebabe8670af39d0e0ea80d]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [17a310f0b8b06db9d390982494ba835550b32204]
# to [c253a50a75d42e45a78388571d0e841b3b6b51b8]
#
============================================================
--- packages/zaurus-updater/zaurus-updater/updater.sh d04594f8a058a8d49fc0d2325f21064bc83a5050
+++ packages/zaurus-updater/zaurus-updater/updater.sh 469e259ca0c6962e5aebabe8670af39d0e0ea80d
@@ -29,6 +29,11 @@
#
# 2007.12.04 Matthias 'CoreDump' Hentges
# - Unb0rk flashing of Akita kernels
+#
+# 2007.12.10 Marcin 'Hrw' Juszkiewicz
+# - Reformatted file - please use spaces not tabs
+# - "version check" is only on Tosa and Poodle - breaks other machines
+#
DATAPATH=$1
TMPPATH=/tmp/update
@@ -154,17 +159,19 @@ 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}`]"
+ echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]"
return
fi
- #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
+ if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ]
+ #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 ]
@@ -193,53 +200,51 @@ do_flashing()
/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
-
- 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`
+ # Looks like Akita is quite 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
+ #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;
- fi
- ADDR=$next_addr
- else
- /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1
- ADDR=`expr $ADDR + $TMPSIZE`
- fi
+ #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
- 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`
- done
- done
- fi
+ #progress
+ SPNUM=0
+ while [ $SPNUM -lt $PROGSTEP ]
+ do
+ echo -n '.'
+ SPNUM=`expr $SPNUM + 1`
+ done
+ done
+ fi
echo ''
#finish
@@ -331,10 +336,9 @@ do
ONESIZE=524288
HDTOP=`expr $DATASIZE - 16`
/sbin/bcut -a $HDTOP -s 16 -o $TMPHEAD $TARGETFILE
- echo "HDTOP=$HDTOP"
- FLASH_TYPE="kernel"
+ FLASH_TYPE="kernel"
do_flashing
- FLASH_TYPE=""
+ FLASH_TYPE=""
;;
initrd.bin)
@@ -353,9 +357,9 @@ do
DATAPOS=16
ONESIZE=1048576
/sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE
- FLASH_TYPE="rootfs"
+ FLASH_TYPE="rootfs"
do_flashing
- FLASH_TYPE=""
+ FLASH_TYPE=""
;;
hdimage1.tgz)
@@ -370,6 +374,7 @@ done
esac
done
+# starting shell to test -- remove this from final release
/bin/sh
# reboot
============================================================
--- packages/zaurus-updater/zaurus-updater.bb 17a310f0b8b06db9d390982494ba835550b32204
+++ packages/zaurus-updater/zaurus-updater.bb c253a50a75d42e45a78388571d0e841b3b6b51b8
@@ -1,7 +1,7 @@ LICENSE = "zaurus-updater"
DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
DEPENDS = "encdec-updater-native"
LICENSE = "zaurus-updater"
-PR = "r15"
+PR = "r16"
PACKAGES = ""
PACKAGE_ARCH = "${MACHINE_ARCH}"
#
# mt diff -rb9d72c3b2667d036ca41078c8c8f39cdccf8ee69 -r96c9c053c3e760d7e1fbb3ec0c50ff110ab62654
#
#
#
# patch "packages/linux/linux.inc"
# from [d6f662d0c2c24eea3b90b2d9c4fcc01f9ab6779f]
# to [74d6d33befb5063d39401bc7a2c8b089ced7e97c]
#
# patch "packages/meta/meta-toolchain.bb"
# from [6a7cecb31e297844a67f19888a2e7489e81d948c]
# to [3fe2673a61b591aed4f247f8201896a640d5ed35]
#
============================================================
--- packages/linux/linux.inc d6f662d0c2c24eea3b90b2d9c4fcc01f9ab6779f
+++ packages/linux/linux.inc 74d6d33befb5063d39401bc7a2c8b089ced7e97c
@@ -13,11 +13,16 @@ RPSRC = "http://www.rpsys.net/openzaurus
# Specify the commandline for your device
-#boot from mmc
+# Boot from mmc
CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfstype=ext2 rootdelay=5"
-#boot from nfs
+# Boot from nfs
#CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=301 root=/dev/nfs nfsroot=172.20.3.1:/data/at91 ip=172.20.0.5:::255.255.0.0"
+# Set the verbosity of kernel messages during runtime
+# You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour
+CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
+CMDLINE_append = " ${CMDLINE_DEBUG} "
+
do_configure_prepend() {
echo "" > ${S}/.config
@@ -115,13 +120,13 @@ do_compile_append() {
fi
}
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
+KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
do_deploy() {
install -d ${DEPLOY_DIR_IMAGE}
install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
- tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib
+ tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib
cd ${DEPLOY_DIR_IMAGE}
rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
============================================================
--- packages/meta/meta-toolchain.bb 6a7cecb31e297844a67f19888a2e7489e81d948c
+++ packages/meta/meta-toolchain.bb 3fe2673a61b591aed4f247f8201896a640d5ed35
@@ -8,6 +8,8 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
+FEED_ARCH ?= "${TARGET_ARCH}"
+
IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${prefix}"
@@ -118,7 +120,7 @@ do_populate_sdk() {
# package it up
mkdir -p ${SDK_DEPLOY}
cd ${SDK_OUTPUT}
- fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-${TARGET_OS}-toolchain.tar.bz2 .
+ fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-toolchain.tar.bz2 .
}
do_populate_sdk[nostamp] = "1"
More information about the Openembedded-commits
mailing list