[oe-commits] org.oe.dev merge of '360252a7aec7a1e6c96f9b1714b0995b55b94134'

[oe commit]

merge of '360252a7aec7a1e6c96f9b1714b0995b55b94134'
     and 'c6c33aa5d673dccd6d19de32e40edd19565dbb5a'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: daed268af21adef037d9def8d49e4090c6674cae
ViewMTN: http://monotone.openembedded.org/revision/info/daed268af21adef037d9def8d49e4090c6674cae
Files:
1
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/machine/include/collie-2.6.inc
conf/machine/include/zaurus-2.6.inc
Diffs:

#
# mt diff -r360252a7aec7a1e6c96f9b1714b0995b55b94134 -rdaed268af21adef037d9def8d49e4090c6674cae
#
# 
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [b63adaffd19f973e76be44bc0544e96ff3e9c602]
#    to [7fe856aa016a01f104bc85db8b3c5078e69cd0eb]
# 
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	b63adaffd19f973e76be44bc0544e96ff3e9c602
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	7fe856aa016a01f104bc85db8b3c5078e69cd0eb
@@ -1538,7 +1538,6 @@ PREFERRED_VERSION_python-pymp3 ?= "0.3.4
 PREFERRED_VERSION_python-pylint ?= "0.13.2"
 PREFERRED_VERSION_python-pymetar ?= "0.11"
 PREFERRED_VERSION_python-pymp3 ?= "0.3.4"
-PREFERRED_VERSION_python-pyqt ?= "4.3"
 PREFERRED_VERSION_python-pyrad ?= "0.8"
 PREFERRED_VERSION_python-pyraf ?= "1.4"
 PREFERRED_VERSION_python-pyreverse ?= "0.5.2"
@@ -1560,7 +1559,6 @@ PREFERRED_VERSION_python-simplejson ?= "
 PREFERRED_VERSION_python-setuptools ?= "0.6c6"
 PREFERRED_VERSION_python-sgmlop ?= "1.1"
 PREFERRED_VERSION_python-simplejson ?= "1.7.1"
-PREFERRED_VERSION_python-sip ?= "4.7"
 PREFERRED_VERSION_python-snmplib ?= "0.1.1"
 PREFERRED_VERSION_python-soappy ?= "0.11.6"
 PREFERRED_VERSION_python-spydi ?= "0.9.7"
@@ -1721,7 +1719,6 @@ PREFERRED_VERSION_simpad-utilities ?= "1
 PREFERRED_VERSION_silo ?= "1.4.8"
 PREFERRED_VERSION_simh ?= "3.7-1"
 PREFERRED_VERSION_simpad-utilities ?= "1.0"
-PREFERRED_VERSION_sip-native ?= "4.7"
 PREFERRED_VERSION_sip3-native ?= "4.0.1"
 PREFERRED_VERSION_sipsak ?= "0.9.6"
 PREFERRED_VERSION_skippy-xd ?= "0.5.0"


#
# mt diff -rc6c33aa5d673dccd6d19de32e40edd19565dbb5a -rdaed268af21adef037d9def8d49e4090c6674cae
#
# 
# 
# patch "conf/machine/include/collie-2.6.inc"
#  from [cc7c687162b52882f755a8824e1a07762b725aca]
#    to [a71f2479ea4e652346eccf4594034af29bb74651]
# 
# patch "conf/machine/include/zaurus-2.6.inc"
#  from [7d4d7255328d5d3f3d61e09ec7b527085533b4d6]
#    to [7ecb352669b5b71228489192cdeb5826dc02b46a]
# 
============================================================
--- conf/machine/include/collie-2.6.inc	cc7c687162b52882f755a8824e1a07762b725aca
+++ conf/machine/include/collie-2.6.inc	a71f2479ea4e652346eccf4594034af29bb74651
@@ -6,3 +6,28 @@ MACHINE_POSTPROCESS_COMMAND = "zaurus_ma
 MACHINE_EXTRA_RDEPENDS = "kernel-modules"
 
 MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
+
+zaurus_make_installkit () {
+    cd ${DEPLOY_DIR_IMAGE}
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+    mkdir ${IMAGE_NAME}-installkit/
+    # Get the latest kernel using the zImage-<machine>.bin symlink
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+    if [ "${MACHINE}" = "spitz" ]; then
+        cp gnu-tar ${IMAGE_NAME}-installkit/
+        cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
+    else
+        [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
+    fi
+
+    # All zaurus machines except collie need updater.sh
+    if [ "${MACHINE}" != "collie" ]; then
+        cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
+    fi
+
+    tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
+    md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+}
+
+
============================================================
--- conf/machine/include/zaurus-2.6.inc	7d4d7255328d5d3f3d61e09ec7b527085533b4d6
+++ conf/machine/include/zaurus-2.6.inc	7ecb352669b5b71228489192cdeb5826dc02b46a
@@ -49,7 +49,7 @@ zaurus_make_installkit () {
     mkdir ${IMAGE_NAME}-installkit/
 
     # Get the latest kernel using the zImage-<machine>.bin symlink
-    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
 
     if [ "${MACHINE}" = "spitz" ]; then
         cp gnu-tar ${IMAGE_NAME}-installkit/