diff options
Diffstat (limited to 'packages/uclibc/uclibc.inc')
| -rw-r--r-- | packages/uclibc/uclibc.inc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index 40c08d97ba..910e633ccc 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -57,7 +57,9 @@ UCLIBC_LOCALE_URI = "http://www.uclibc.org/downloads/${UCLIBC_LOCALE_FILE}" UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCALE_FILE}" SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \ - file://uClibc.config" + file://uClibc.config \ + file://uClibc.machine \ + file://uClibc.distro" UCLIBC_PREFIX = "${CROSS_DIR}/${TARGET_SYS}" UCLIBC_STAGE_PREFIX = "${STAGING_DIR}/${HOST_SYS}" @@ -98,7 +100,11 @@ python do_patch () { } do_configure() { - cp ${WORKDIR}/uClibc.config ${S}/.config + rm -f ${S}/.config + # This stuff works like the standard OE OVERRIDES - keep the files + # in the same order as the default OVERRIDES (well, reverse order, + # because unlike overrides the last takes precedence) + cat ${WORKDIR}/uClibc.config ${WORKDIR}/uClibc.distro ${WORKDIR}/uClibc.machine >${S}/.config perl -i -p -e 's,^CROSS=.*,TARGET_ARCH=${TARGET_ARCH}\nCROSS=${TARGET_PREFIX},g' ${S}/Rules.mak perl -i -p -e '${configmangle}' ${S}/.config |