Ugh, unbork the uclibc builds with USE_NLS=no... it would attempt to copy the locale...

BKrev: 419a7d72iP7a4vvByWcwwjEXVkn79A

diff --git a/uclibc/uclibc_0.9.26.oe b/uclibc/uclibc_0.9.26.oe
index d9f41ab..e1be6e9 100644 (file)
--- a/uclibc/uclibc_0.9.26.oe
+++ b/uclibc/uclibc_0.9.26.oe
@@ -86,7 +86,7 @@ uclibcbuild_do_patch() {
        ln -sf ${STAGING_INCDIR}/linux ${S}/include/linux
        ln -sf ${STAGING_INCDIR}/asm ${S}/include/asm
        
-       cp ${DL_DIR}/${UCLIBC_LOCALE_FILE} extra/locale
+       ${@['cp %s/%s extra/locale' % (oe.data.getVar('WORKDIR', d, 1) or '', oe.data.getVar('UCLIBC_LOCALE_FILE', d, 1) or ''), ''][oe.data.getVar('USE_NLS', d, 1) == 'no']}
 }
 
 python do_patch () {

diff --git a/uclibc/uclibc_cvs.oe b/uclibc/uclibc_cvs.oe
index 2e84583..306994b 100644 (file)
--- a/uclibc/uclibc_cvs.oe
+++ b/uclibc/uclibc_cvs.oe
@@ -89,7 +89,7 @@ uclibcbuild_do_patch() {
        ln -sf ${STAGING_INCDIR}/linux ${S}/include/linux
        ln -sf ${STAGING_INCDIR}/asm ${S}/include/asm
        
-       cp ${DL_DIR}/${UCLIBC_LOCALE_FILE} extra/locale
+       ${@['cp %s/%s extra/locale' % (oe.data.getVar('WORKDIR', d, 1) or '', oe.data.getVar('UCLIBC_LOCALE_FILE', d, 1) or ''), ''][oe.data.getVar('USE_NLS', d, 1) == 'no']}
 }
 
 python do_patch () {