[oe-commits] org.oe.angstrom-2007.12-stable applied changes from 465f9c73626153a7e195a5b8c08ae66282c3722f

[pfalcon commit]

applied changes from 465f9c73626153a7e195a5b8c08ae66282c3722f
             through 242687582dbdcc1fdca2fc9af1f32a2b5c591f3c

bitbake.conf, image.bbclass: Add and use USERDISTRO var to preserve original DISTRO value. (PaulS, Koen)

Author: pfalcon at openembedded.org
Branch: org.openembedded.angstrom-2007.12-stable
Revision: 5e9a8eb341a63c1b1d083f1a9f200bb88d3e3aac
ViewMTN: http://monotone.openembedded.org/revision/info/5e9a8eb341a63c1b1d083f1a9f200bb88d3e3aac
Files:
1
classes/image.bbclass
conf/bitbake.conf
conf/distro/include/angstrom.inc
Diffs:

#
# mt diff -rb0fa527639af866537202525bac4439df61feb75 -r5e9a8eb341a63c1b1d083f1a9f200bb88d3e3aac
#
# 
# 
# patch "classes/image.bbclass"
#  from [4d92381733b09bae07a07da35bd0024744924c3c]
#    to [6eeae6a01c36465bc36cc737d42ea6b8ab09b152]
# 
# patch "conf/bitbake.conf"
#  from [5044eed5572b1c9c12c31cf7952ccedc1648524c]
#    to [3ca819883efb6751c2f90cd3efc826e055b8b9b0]
# 
# patch "conf/distro/include/angstrom.inc"
#  from [6d2902857b621e681b3f0d4780dcd51ee236074e]
#    to [e5988ce8ee4aed5e7c532ed792c344cc08b7f3c4]
# 
============================================================
--- classes/image.bbclass	4d92381733b09bae07a07da35bd0024744924c3c
+++ classes/image.bbclass	6eeae6a01c36465bc36cc737d42ea6b8ab09b152
@@ -90,6 +90,7 @@ fakeroot do_rootfs () {
 	${IMAGE_PREPROCESS_COMMAND}
 		
 	export TOPDIR=${TOPDIR}
+	export DISTRO=${USERDISTRO}
 	export MACHINE=${MACHINE}
 
 	for type in ${IMAGE_FSTYPES}; do
============================================================
--- conf/bitbake.conf	5044eed5572b1c9c12c31cf7952ccedc1648524c
+++ conf/bitbake.conf	3ca819883efb6751c2f90cd3efc826e055b8b9b0
@@ -529,6 +529,10 @@ include conf/local.conf
 include conf/site.conf
 include conf/auto.conf
 include conf/local.conf
+# USERDISTRO should always contain original DISTRO value as set by user
+# If a distro config overrides DISTRO for whatever reason (e.g. to get
+# overrides like it wants), USERDISTRO must be reassigned with := first
+USERDISTRO = "${DISTRO}"
 include conf/build/${BUILD_SYS}.conf
 include conf/target/${TARGET_SYS}.conf
 include conf/machine/${MACHINE}.conf
============================================================
--- conf/distro/include/angstrom.inc	6d2902857b621e681b3f0d4780dcd51ee236074e
+++ conf/distro/include/angstrom.inc	e5988ce8ee4aed5e7c532ed792c344cc08b7f3c4
@@ -1,7 +1,9 @@
 #@TYPE: Distribution
 #@NAME: Angstrom 
 #@DESCRIPTION: Release independent distribution configuration for Angstrom
 
+# Preserve original DISTRO value
+USERDISTRO := "${DISTRO}"
 DISTRO = "angstrom"
 DISTRO_NAME = "Angstrom"