[oe-commits] org.oe.dev merge of '5a00df302fa5f0bd27e8591c24d944d935e7a4e9'

[hrw commit]

merge of '5a00df302fa5f0bd27e8591c24d944d935e7a4e9'
     and 'a63f4a9ad21022afe5e9835d5f44018f136084e1'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: e3d33ca98acc0c86ec76906cd1735abe480552dc
ViewMTN: http://monotone.openembedded.org/revision/info/e3d33ca98acc0c86ec76906cd1735abe480552dc
Files:
1
contrib/angstrom/build-feeds.sh
classes/package.bbclass
mtn:execute
true
packages/images/x11-sato-image.bb
Diffs:

#
# mt diff -r5a00df302fa5f0bd27e8591c24d944d935e7a4e9 -re3d33ca98acc0c86ec76906cd1735abe480552dc
#
# 
# 
# add_file "contrib/angstrom/build-feeds.sh"
#  content [94751537edad00e471f43c6fa461aea634716679]
# 
# patch "classes/package.bbclass"
#  from [540a6836514d7f26b1ef8be9ce1d15f0396f6e29]
#    to [31efdfccff0ea3fd6bdb3476c5dd2c61c54179f9]
# 
#   set "contrib/angstrom/build-feeds.sh"
#  attr "mtn:execute"
# value "true"
# 
============================================================
--- contrib/angstrom/build-feeds.sh	94751537edad00e471f43c6fa461aea634716679
+++ contrib/angstrom/build-feeds.sh	94751537edad00e471f43c6fa461aea634716679
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+DO_UCLIBC=0
+
+do_build() {
+	echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
+
+	BUILD_MODE="glibc"
+	if [ "$BUILD_CLEAN" != "" ]
+	then
+		bitbake -c clean $BUILD_CLEAN
+	fi
+
+	for target in $BUILD_TARGETS
+	do
+		bitbake $target && do_report_success
+	done
+
+	if [ $DO_UCLIBC = 1 ]
+	then
+		BUILD_MODE="uclibc"
+		echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+		for target in $BUILD_TARGETS
+		do
+			bitbake $target && do_report_success
+		done
+	fi
+}
+
+do_report_success() {
+
+	echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log
+}
+
+for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie spitz 
+do
+        BUILD_MACHINE=$machine
+	BUILD_CLEAN="libtool-cross"
+        BUILD_TARGETS="gcc binutils automake autoconf m4 pkgconfig \
+	               task-proper-tools mc screen \
+	               mono perl python ruby \
+		       gtk+ qt-x11-free qt4-x11-free \
+		       gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \
+		       boa cherokee lighttpd thttpd \
+		       gpe-gallery gpe-scap pidgin \
+		       gpsdrive navit \
+		       xmms mplayer \
+		       wpa-gui wifi-radar \
+		       gpe-bluetooth bluez-gnome python-pybluez \
+		       abiword gnumeric evince gimp \
+		       flite \
+		       ctorrent \
+		      "
+	do_build
+done
+
============================================================
--- classes/package.bbclass	540a6836514d7f26b1ef8be9ce1d15f0396f6e29
+++ classes/package.bbclass	31efdfccff0ea3fd6bdb3476c5dd2c61c54179f9
@@ -149,6 +149,12 @@ def runstrip(file, d):
         bb.debug(1, "runstrip: skip %s" % file)
         return 0
 
+    # If the file is in a .debug directory it was already stripped,
+    # don't do it again...
+    if os.path.dirname(file).endswith(".debug"):
+        bb.note("Already run strip")
+        return 0
+
     strip = bb.data.getVar("STRIP", d, 1)
     objcopy = bb.data.getVar("OBJCOPY", d, 1)
 


#
# mt diff -ra63f4a9ad21022afe5e9835d5f44018f136084e1 -re3d33ca98acc0c86ec76906cd1735abe480552dc
#
# 
# 
# patch "packages/images/x11-sato-image.bb"
#  from [66c0c8137141d9eba661ea645f864e06f05e045c]
#    to [76520f9e00c507510d5a16b2ccc373b6a66e34a2]
# 
============================================================
--- packages/images/x11-sato-image.bb	66c0c8137141d9eba661ea645f864e06f05e045c
+++ packages/images/x11-sato-image.bb	76520f9e00c507510d5a16b2ccc373b6a66e34a2
@@ -22,7 +22,7 @@ IMAGE_INSTALL = "\
 	settings-daemon \
 "
 
-export IMAGE_BASENAME = "poky-base-image"
+export IMAGE_BASENAME = "${PN}"
 IMAGE_LINGUAS = ""
 
 inherit image