[oe-commits] org.oe.dev merge of 'c3ca473fa0f2691fd3779230e61273dde401f5a4'

[hrw commit]

merge of 'c3ca473fa0f2691fd3779230e61273dde401f5a4'
     and 'eae950ac7860db142942252d261d665e31150f2d'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: f32bd285f81d67ffe77c826a1f15be44ccefdc3b
ViewMTN: http://monotone.openembedded.org/revision/info/f32bd285f81d67ffe77c826a1f15be44ccefdc3b
Files:
1
conf/bitbake.conf
packages/libxml/files/no-testapi.patch
Diffs:

#
# mt diff -rc3ca473fa0f2691fd3779230e61273dde401f5a4 -rf32bd285f81d67ffe77c826a1f15be44ccefdc3b
#
# 
# 
# patch "conf/bitbake.conf"
#  from [b14f08a63b2e6c059abc0f50bbbb04c3b06c5cd5]
#    to [5044eed5572b1c9c12c31cf7952ccedc1648524c]
# 
============================================================
--- conf/bitbake.conf	b14f08a63b2e6c059abc0f50bbbb04c3b06c5cd5
+++ conf/bitbake.conf	5044eed5572b1c9c12c31cf7952ccedc1648524c
@@ -82,7 +82,7 @@ HOST_CC_ARCH = "${TARGET_CC_ARCH}"
 HOST_PREFIX = "${TARGET_PREFIX}"
 HOST_CC_ARCH = "${TARGET_CC_ARCH}"
 
-TARGET_ARCH = "INVALID"
+TARGET_ARCH ?= "INVALID"
 TARGET_OS = "INVALID"
 TARGET_VENDOR = "${BUILD_VENDOR}"
 TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}"


#
# mt diff -reae950ac7860db142942252d261d665e31150f2d -rf32bd285f81d67ffe77c826a1f15be44ccefdc3b
#
# 
# 
# delete "packages/libxml/files/no-testapi.patch"
#