[oe-commits] org.oe.dev merge of '3b618e174a1bdef0e2e2e2fe1efddadb3d3ce48d'

[rwhitby commit]

merge of '3b618e174a1bdef0e2e2e2fe1efddadb3d3ce48d'
     and '453784163e85d585c492f5db88b0fcbc9a68b398'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 5198d0edcd376472b37b08e632a08466f101c570
ViewMTN: http://monotone.openembedded.org/revision/info/5198d0edcd376472b37b08e632a08466f101c570
Files:
1
conf/distro/angstrom-2008.1.conf
packages/dbus/dbus-1.0.2/dbus-1.init
packages/dbus/dbus_1.0.2.bb
packages/images/angstrom-minimal-image-with-mtd-utils.bb
packages/linux/linux.inc
Diffs:

#
# mt diff -r3b618e174a1bdef0e2e2e2fe1efddadb3d3ce48d -r5198d0edcd376472b37b08e632a08466f101c570
#
# 
# no changes
# 


#
# mt diff -r453784163e85d585c492f5db88b0fcbc9a68b398 -r5198d0edcd376472b37b08e632a08466f101c570
#
# 
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [07f73119ae13cbfa759edeaf36c895f08edaf726]
#    to [fafda2aee279a688df69144be5c39f4e3fa0a14e]
# 
# patch "packages/dbus/dbus-1.0.2/dbus-1.init"
#  from [bc3a39440ac2899bf95874522964413b2f7b584a]
#    to [4dc37cbdcc8bbcdd8432d6104bddd92535f362d1]
# 
# patch "packages/dbus/dbus_1.0.2.bb"
#  from [3c61bea1f5b14d729a812b56d55a0a6be9b36a38]
#    to [a8ce6355ed3da04736b057936a57f1aeed630228]
# 
# patch "packages/images/angstrom-minimal-image-with-mtd-utils.bb"
#  from [723d1b6c688e08393bf534cca33166bd1a05b210]
#    to [de2ca95fee1a9e1a0da365806638041673abed70]
# 
# patch "packages/linux/linux.inc"
#  from [025c7f5129eca1ed32f2540c0b62c387c8d0cec5]
#    to [4f5f493a73db7cb33ae34f7b5501c9bb911df71f]
# 
============================================================
--- conf/distro/angstrom-2008.1.conf	07f73119ae13cbfa759edeaf36c895f08edaf726
+++ conf/distro/angstrom-2008.1.conf	fafda2aee279a688df69144be5c39f4e3fa0a14e
@@ -6,6 +6,11 @@
 #@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille-media.de>
 #@--------------------------------------------------------------------
 
+
+# Use Xorg R7.3 release
+require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+
+
 # This is a testbed for unstable and/or untested things, while angstrom-2007.1 
 # is aiming for stability and a release.
 # Use this at your own risk, we welcome bugreports filed at 
============================================================
--- packages/dbus/dbus-1.0.2/dbus-1.init	bc3a39440ac2899bf95874522964413b2f7b584a
+++ packages/dbus/dbus-1.0.2/dbus-1.init	4dc37cbdcc8bbcdd8432d6104bddd92535f362d1
@@ -62,7 +62,7 @@ shut_it_down()
 shut_it_down()
 {
   if [ -d $EVENTDIR ]; then
-      run-parts --reverse --arg=stop $EVENTDIR
+      run-parts --arg=stop $EVENTDIR
   fi
   echo -n "Stopping $DESC: "
   start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
============================================================
--- packages/dbus/dbus_1.0.2.bb	3c61bea1f5b14d729a812b56d55a0a6be9b36a38
+++ packages/dbus/dbus_1.0.2.bb	a8ce6355ed3da04736b057936a57f1aeed630228
@@ -1,5 +1,5 @@ SRC_URI += " file://fix-waitpid.patch;pa
 require dbus.inc
 
 SRC_URI += " file://fix-waitpid.patch;patch=1"
 
+PR = "r3"
-PR = "r2"
============================================================
--- packages/images/angstrom-minimal-image-with-mtd-utils.bb	723d1b6c688e08393bf534cca33166bd1a05b210
+++ packages/images/angstrom-minimal-image-with-mtd-utils.bb	de2ca95fee1a9e1a0da365806638041673abed70
@@ -1,9 +1,9 @@ require angstrom-minimal-image.bb
 # this image was created for use with the compulab cm-x270 platform
 # for creating a small initramfs image in NOR flash that can be used
 # to program the NAND flash.
 
 require angstrom-minimal-image.bb
-RDEPENDS += "mtd-utils"
+IMAGE_INSTALL += "mtd-utils"
 
 export IMAGE_BASENAME = "minimalist-image-mtdutils"
 
============================================================
--- packages/linux/linux.inc	025c7f5129eca1ed32f2540c0b62c387c8d0cec5
+++ packages/linux/linux.inc	4f5f493a73db7cb33ae34f7b5501c9bb911df71f
@@ -71,16 +71,21 @@ do_deploy() {
         tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib
         
         if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
-            ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
-            rm -f linux.bin.gz
-            gzip -9 linux.bin
-            uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
-            rm -f linux.bin.gz
-        fi
+            if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
+                ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
+                uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+                rm -f linux.bin
+	    else
+	        ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
+                rm -f linux.bin.gz
+                gzip -9 linux.bin
+                uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+                rm -f linux.bin.gz
+            fi
+	fi
 }
 
 do_deploy[dirs] = "${S}"
 
-addtask prepatch before do_patch after do_unpack
 addtask deploy before do_package after do_install