[oe-commits] org.oe.dev merge of '67283511b56a658029528bf05ae322e2ad1c5337'

[pfalcon commit]

merge of '67283511b56a658029528bf05ae322e2ad1c5337'
     and 'fffc11dbe4c2116a162896535f715b067d2c3b03'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 1132f14593e81ca6b53aad9b662d466fb570ce1c
ViewMTN: http://monotone.openembedded.org/revision/info/1132f14593e81ca6b53aad9b662d466fb570ce1c
Files:
1
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/images/minimal-gpe-image.bb
conf/machine/include/collie-2.6.inc
Diffs:

#
# mt diff -r67283511b56a658029528bf05ae322e2ad1c5337 -r1132f14593e81ca6b53aad9b662d466fb570ce1c
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [51d134740207cc8be525f395282e27da28429f03]
#    to [3d10520a0111676c1e609a3731b65ea0c93d41e4]
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [0f1c46770dd8bc83dea22c584f64a2519be26f18]
#    to [ef3834c8688b7f1d002a1ee2158e0e3429c60852]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	51d134740207cc8be525f395282e27da28429f03
+++ conf/distro/angstrom-2007.1.conf	3d10520a0111676c1e609a3731b65ea0c93d41e4
@@ -8,7 +8,7 @@ DISTRO_VERSION = "2007.9-test-${DATE}"
 
 #DISTRO_VERSION = "2007.9"
 DISTRO_VERSION = "2007.9-test-${DATE}"
-DISTRO_REVISION = "46"
+DISTRO_REVISION = "47"
 
 require conf/distro/include/sane-srcdates.inc
 require conf/distro/include/sane-srcrevs.inc
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	0f1c46770dd8bc83dea22c584f64a2519be26f18
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	ef3834c8688b7f1d002a1ee2158e0e3429c60852
@@ -97,14 +97,14 @@ PREFERRED_VERSION_bluesnarfer ?= "0.1"
 PREFERRED_VERSION_bitbake ?= "1.8.6"
 PREFERRED_VERSION_bitchx ?= "1.1"
 PREFERRED_VERSION_bluesnarfer ?= "0.1"
-PREFERRED_VERSION_bluez-cups-backend ?= "3.22"
+PREFERRED_VERSION_bluez-cups-backend ?= "3.23"
 PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0"
 PREFERRED_VERSION_bluez-gnome ?= "0.14"
-PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.22"
+PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.23"
 PREFERRED_VERSION_bluez-hcidump ?= "1.38"
-PREFERRED_VERSION_bluez-libs ?= "3.22"
-PREFERRED_VERSION_bluez-utils ?= "3.22"
-PREFERRED_VERSION_bluez-utils-alsa ?= "3.22"
+PREFERRED_VERSION_bluez-libs ?= "3.23"
+PREFERRED_VERSION_bluez-utils ?= "3.23"
+PREFERRED_VERSION_bluez-utils-alsa ?= "3.23"
 PREFERRED_VERSION_bmon ?= "2.1.0"
 PREFERRED_VERSION_boa ?= "0.94.13"
 PREFERRED_VERSION_bochs ?= "2.1"


#
# mt diff -rfffc11dbe4c2116a162896535f715b067d2c3b03 -r1132f14593e81ca6b53aad9b662d466fb570ce1c
#
# 
# 
# add_file "packages/images/minimal-gpe-image.bb"
#  content [e8665528258e599e44b51e8574508562e66d7af9]
# 
# patch "conf/machine/include/collie-2.6.inc"
#  from [45eae6d23b69ac8c4c6345c230a28c7b03316d5e]
#    to [4c2267c98964a40d4dd4216de14ec06eb578694d]
# 
============================================================
--- packages/images/minimal-gpe-image.bb	e8665528258e599e44b51e8574508562e66d7af9
+++ packages/images/minimal-gpe-image.bb	e8665528258e599e44b51e8574508562e66d7af9
@@ -0,0 +1,22 @@
+#Angstrom minimal gpe image
+# This image provides a barebone dm and 'desktop' 
+# Very angstrom and ipkg centric
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "minimalist-gpe-image"
+
+DEPENDS = "task-boot"
+IMAGE_INSTALL = "\
+    ${XSERVER} \
+    task-boot \
+    gpe-session-scripts gpe-login \
+    matchbox-wm \
+    angstrom-feed-configs \
+    ipkg \
+    "
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
============================================================
--- conf/machine/include/collie-2.6.inc	45eae6d23b69ac8c4c6345c230a28c7b03316d5e
+++ conf/machine/include/collie-2.6.inc	4c2267c98964a40d4dd4216de14ec06eb578694d
@@ -1,6 +1,33 @@ MACHINE_EXTRA_RDEPENDS = "kernel-modules
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
 SERIAL_CONSOLE = "115200 ttySA0"
 MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi"
 
 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/
+}
+
+