[oe-commits] org.oe.angstrom-2007.12-stable disapproval of revision 'c85783d7a75d18143af2aab8988ca7ab1d7a395a'

[pfalcon commit]

disapproval of revision 'c85783d7a75d18143af2aab8988ca7ab1d7a395a'

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

#
# mt diff -rc85783d7a75d18143af2aab8988ca7ab1d7a395a -rb0fa527639af866537202525bac4439df61feb75
#
# 
# 
# patch "classes/image.bbclass"
#  from [5edb4feb89d27de2be70aebb9db168e754218491]
#    to [4d92381733b09bae07a07da35bd0024744924c3c]
# 
# patch "conf/bitbake.conf"
#  from [3ca819883efb6751c2f90cd3efc826e055b8b9b0]
#    to [5044eed5572b1c9c12c31cf7952ccedc1648524c]
# 
============================================================
--- classes/image.bbclass	5edb4feb89d27de2be70aebb9db168e754218491
+++ classes/image.bbclass	4d92381733b09bae07a07da35bd0024744924c3c
@@ -90,7 +90,6 @@ fakeroot do_rootfs () {
 	${IMAGE_PREPROCESS_COMMAND}
 		
 	export TOPDIR=${TOPDIR}
-	export DISTRO=${USERDISTRO}
 	export MACHINE=${MACHINE}
 
 	for type in ${IMAGE_FSTYPES}; do
@@ -202,4 +201,3 @@ addtask rootfs before do_build after do_
 EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link do_rootfs make_zimage_symlink_relative set_image_autologin rootfs_update_timestamp
 
 addtask rootfs before do_build after do_install
-addtask deploy_to after do_rootfs
============================================================
--- conf/bitbake.conf	3ca819883efb6751c2f90cd3efc826e055b8b9b0
+++ conf/bitbake.conf	5044eed5572b1c9c12c31cf7952ccedc1648524c
@@ -529,10 +529,6 @@ 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